diff --git a/test/functional/post_regenerations_controller_test.rb b/test/functional/post_regenerations_controller_test.rb index 1b546d186..6f54e47af 100644 --- a/test/functional/post_regenerations_controller_test.rb +++ b/test/functional/post_regenerations_controller_test.rb @@ -36,7 +36,7 @@ class PostRegenerationsControllerTest < ActionDispatch::IntegrationTest assert_equal(@mod, ModAction.last.creator) assert_equal("post_regenerate_iqdb", ModAction.last.category) - assert_equal("@#{@mod.name} regenerated IQDB for post ##{@post.id}", ModAction.last.description) + assert_equal("<@#{@mod.name}> regenerated IQDB for post ##{@post.id}", ModAction.last.description) end end @@ -58,7 +58,7 @@ class PostRegenerationsControllerTest < ActionDispatch::IntegrationTest assert_equal(@mod, ModAction.last.creator) assert_equal("post_regenerate", ModAction.last.category) - assert_equal("@#{@mod.name} regenerated image samples for post ##{@post.id}", ModAction.last.description) + assert_equal("<@#{@mod.name}> regenerated image samples for post ##{@post.id}", ModAction.last.description) end end end diff --git a/test/unit/sources/newgrounds_test.rb b/test/unit/sources/newgrounds_test.rb index d8a20e9d1..59d379c06 100644 --- a/test/unit/sources/newgrounds_test.rb +++ b/test/unit/sources/newgrounds_test.rb @@ -4,72 +4,59 @@ module Sources class NewGroundsTest < ActiveSupport::TestCase context "The source for a newgrounds picture" do setup do - @url = "https://www.newgrounds.com/art/view/natthelich/d-d-light-domain-cleric-nathaniel-8" - @image_url = "https://art.ngfiles.com/images/1138000/1138016_natthelich_d-d-light-domain-cleric-nathaniel-8.png?f1578591058" - @comment = "https://art.ngfiles.com/comments/84000/iu_84427_7115981.jpg" + @url = "https://www.newgrounds.com/art/view/hcnone/sephiroth" + @image_url = "https://art.ngfiles.com/images/1539000/1539538_hcnone_sephiroth.png?f1607668234" @image_1 = Sources::Strategies.find(@url) @image_2 = Sources::Strategies.find(@image_url) - @image_3 = Sources::Strategies.find(@comment, @url) end should "get the artist name" do - assert_equal("natthelich", @image_1.artist_name) - assert_equal("natthelich", @image_2.artist_name) - assert_equal("natthelich", @image_3.artist_name) + assert_equal("hcnone", @image_1.artist_name) + assert_equal("hcnone", @image_2.artist_name) end should "get the artist commentary title" do - assert_equal("D&D - Light Domain Cleric, Nathaniel", @image_1.artist_commentary_title) - assert_equal("D&D - Light Domain Cleric, Nathaniel", @image_2.artist_commentary_title) - assert_equal("D&D - Light Domain Cleric, Nathaniel", @image_3.artist_commentary_title) + assert_equal("Sephiroth", @image_1.artist_commentary_title) + assert_equal("Sephiroth", @image_2.artist_commentary_title) end should "get profile url" do - assert_equal("https://natthelich.newgrounds.com", @image_1.profile_url) - assert_equal("https://natthelich.newgrounds.com", @image_2.profile_url) - assert_equal("https://natthelich.newgrounds.com", @image_3.profile_url) + assert_equal("https://hcnone.newgrounds.com", @image_1.profile_url) + assert_equal("https://hcnone.newgrounds.com", @image_2.profile_url) end should "get the image urls" do - assert_match(%r{https://art.ngfiles.com/images/1138000/1138016_natthelich_d-d-light-domain-cleric-nathaniel-8.png}i, @image_1.image_url) - assert_includes(@image_1.image_urls, @comment) - - assert_match(%r{https://art.ngfiles.com/images/1138000/1138016_natthelich_d-d-light-domain-cleric-nathaniel-8.png}i, @image_2.image_url) - assert_equal(@comment, @image_3.image_url) + assert_match(@image_url, @image_1.image_url) + assert_equal(@image_url, @image_2.image_url) end should "get the canonical url" do assert_equal(@url, @image_1.canonical_url) assert_equal(@url, @image_2.canonical_url) - assert_equal(@url, @image_3.canonical_url) end should "download an image" do - assert_downloaded(1195723, @image_1.image_url) - assert_downloaded(1195723, @image_2.image_url) - assert_downloaded(158058, @image_3.image_url) + assert_downloaded(4224, @image_1.image_url) + assert_downloaded(4224, @image_2.image_url) end should "get the tags" do tags = [ - %w[cleric https://www.newgrounds.com/search/conduct/art?match=tags&tags=cleric], - %w[nathaniel https://www.newgrounds.com/search/conduct/art?match=tags&tags=nathaniel], - %w[oc https://www.newgrounds.com/search/conduct/art?match=tags&tags=oc] + %w[sephiroth https://www.newgrounds.com/search/conduct/art?match=tags&tags=sephiroth], + %w[supersmashbros https://www.newgrounds.com/search/conduct/art?match=tags&tags=supersmashbros], ] assert_equal(tags, @image_1.tags) assert_equal(tags, @image_2.tags) - assert_equal(tags, @image_3.tags) end should "find the right artist" do - artist_1 = create(:artist, name: "natthelich1", url_string: "https://natthelich.newgrounds.com/art") - artist_2 = create(:artist, name: "natthelich2", url_string: "https://www.newgrounds.com/art/view/natthelich/fire-emblem-marth-plus-progress-pic") + artist_1 = create(:artist, name: "hcnone1", url_string: "https://hcnone.newgrounds.com/art") + artist_2 = create(:artist, name: "hcnone2", url_string: "https://www.newgrounds.com/art/view/hcnone/sephiroth") artist_3 = create(:artist, name: "bad_artist", url_string: "https://www.newgrounds.com/art") assert_equal([artist_1, artist_2], @image_1.artists) assert_equal([artist_1, artist_2], @image_2.artists) - assert_equal([artist_1, artist_2], @image_3.artists) assert_not_equal([artist_3], @image_1.artists) end