From fefa6036fbf14813dd9e0a58f45a75e28f9d6e2d Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 15 Feb 2022 20:15:42 -0600 Subject: [PATCH] tests: fix broken upload tests. * Fix broken Skeb test caused by 404'd image. * Fix broken Sta.sh tests caused by DeviantArt URL changes. * Fix broken Nijie tests caused by Nijie URL changes. --- test/jobs/process_upload_job_test.rb | 13 --------- test/unit/sources/nijie_test.rb | 41 +++++++++++++--------------- test/unit/sources/skeb_test.rb | 12 ++++---- test/unit/sources/stash_test.rb | 4 +-- 4 files changed, 27 insertions(+), 43 deletions(-) delete mode 100644 test/jobs/process_upload_job_test.rb diff --git a/test/jobs/process_upload_job_test.rb b/test/jobs/process_upload_job_test.rb deleted file mode 100644 index 70b663f8f..000000000 --- a/test/jobs/process_upload_job_test.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'test_helper' - -class ProcessUploadJobTest < ActiveJob::TestCase - context "ProcessUploadJob" do - should "process a pending upload" do - upload = create(:upload, status: "pending", source: "https://cdn.donmai.us/original/d3/4e/d34e4cf0a437a5d65f8e82b7bcd02606.jpg") - ProcessUploadJob.perform_now(upload) - - assert_equal("completed", upload.status) - assert_equal("d34e4cf0a437a5d65f8e82b7bcd02606", upload.media_assets.first.md5) - end - end -end diff --git a/test/unit/sources/nijie_test.rb b/test/unit/sources/nijie_test.rb index 54295c256..132a97717 100644 --- a/test/unit/sources/nijie_test.rb +++ b/test/unit/sources/nijie_test.rb @@ -10,7 +10,7 @@ module Sources context "downloading a 'http://nijie.info/view.php?id=:id' url" do should "download the original file" do @source = "http://nijie.info/view.php?id=213043" - @rewrite = "https://pic.nijie.net/03/nijie_picture/728995_20170505014820_0.jpg" + @rewrite = "https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg" assert_rewritten(@rewrite, @source) assert_downloaded(132_555, @source) end @@ -18,7 +18,7 @@ module Sources context "downloading a 'https://pic*.nijie.info/nijie_picture/:id.jpg' url" do should "download the original file" do - @source = "https://pic.nijie.net/03/nijie_picture/728995_20170505014820_0.jpg" + @source = "https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg" assert_not_rewritten(@source) assert_downloaded(132_555, @source) end @@ -47,7 +47,7 @@ module Sources end should "get the image url" do - assert_equal("https://pic.nijie.net/03/nijie_picture/728995_20170505014820_0.jpg", @site.image_url) + assert_equal("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg", @site.image_url) assert_downloaded(132_555, @site.image_url) end @@ -56,7 +56,7 @@ module Sources end should "get the preview url" do - assert_equal("https://pic.nijie.net/03/__rs_l170x170/nijie_picture/728995_20170505014820_0.jpg", @site.preview_url) + assert_equal("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg", @site.preview_url) assert_equal([@site.preview_url], @site.preview_urls) assert_downloaded(132_555, @site.preview_url) end @@ -128,7 +128,7 @@ module Sources should "get the preview urls" do assert_equal("https://pic.nijie.net/03/__rs_l170x170/nijie_picture/728995_20170505014820_0.jpg", @site.preview_url) - assert_equal([@site.preview_url], @site.preview_urls) + assert_equal(["https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg"], @site.preview_urls) end should "get the canonical url" do @@ -150,11 +150,11 @@ module Sources end should "get the image url" do - assert_equal("https://pic.nijie.net/03/nijie_picture/728995_20170505014820_0.jpg", @site.image_url) + assert_equal("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg", @site.image_url) end should "get the preview urls" do - assert_equal("https://pic.nijie.net/03/__rs_l170x170/nijie_picture/728995_20170505014820_0.jpg", @site.preview_url) + assert_equal("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg", @site.preview_url) assert_equal([@site.preview_url], @site.preview_urls) end @@ -178,12 +178,12 @@ module Sources should "get the image urls" do urls = %w[ - https://pic.nijie.net/03/nijie_picture/236014_20170620101426_0.png - https://pic.nijie.net/01/nijie_picture/diff/main/218856_0_236014_20170620101329.png - https://pic.nijie.net/01/nijie_picture/diff/main/218856_1_236014_20170620101330.png - https://pic.nijie.net/01/nijie_picture/diff/main/218856_2_236014_20170620101331.png - https://pic.nijie.net/03/nijie_picture/diff/main/218856_3_236014_20170620101331.png - https://pic.nijie.net/03/nijie_picture/diff/main/218856_4_236014_20170620101333.png + https://pic.nijie.net/02/nijie/17/14/236014/illust/0_0_5a51fc32aa2e13a5_1d8d06.png + https://pic.nijie.net/06/nijie/17/14/236014/illust/218856_0_d1c29eff823097a1_2449d1.png + https://pic.nijie.net/06/nijie/17/14/236014/illust/218856_1_7646cf57f6f1c695_f2ed81.png + https://pic.nijie.net/07/nijie/17/14/236014/illust/218856_2_fba142a9dfda41e3_1c0259.png + https://pic.nijie.net/08/nijie/17/14/236014/illust/218856_3_2074431327728df6_6ae716.png + https://pic.nijie.net/05/nijie/17/14/236014/illust/218856_4_6233f9240df78826_14bec9.png ] assert_equal(urls, @site.image_urls) @@ -210,9 +210,6 @@ module Sources assert_equal(image_url, site.canonical_url) assert_equal("https://nijie.info/members.php?id=236014", site.profile_url) assert_nothing_raised { site.to_h } - - assert_downloaded(3619, site.image_url) - assert_downloaded(3619, site.preview_url) end end @@ -247,7 +244,7 @@ module Sources should "find the mp4 file" do site = Sources::Strategies.find("http://nijie.info/view.php?id=324604") - assert_equal("https://pic.nijie.net/01/nijie_picture/1349569_20190727172205_0.mp4", site.image_urls[0]) + assert_equal("https://pic.nijie.net/01/nijie/19/69/1349569/illust/0_0_a20b709587eb7713_30b409.mp4", site.image_urls[0]) end end @@ -303,8 +300,8 @@ module Sources site = Sources::Strategies.find("https://nijie.info/view.php?id=203688") urls = %w[ - https://pic.nijie.net/01/nijie_picture/676327_20170216212803_0.jpg - https://pic.nijie.net/04/nijie_picture/diff/main/676327_20170216212806_0.jpg + https://pic.nijie.net/07/nijie/17/27/676327/illust/0_0_2e46f254324c90c8_dbfc1a.jpg + https://pic.nijie.net/01/nijie/17/27/676327/illust/203688_0_6f7baf9290a2b1d9_3badf7.jpg ] assert_equal(urls, site.image_urls) end @@ -329,9 +326,9 @@ module Sources site = Sources::Strategies.find(image, page) images = %w[ - https://pic.nijie.net/01/dojin_main/20120213044700表紙サンプル.jpg - https://pic.nijie.net/01/dojin_main/dojin_sam/20120213044700コピー\ ～\ 0006のコピー.jpg - https://pic.nijie.net/01/dojin_main/dojin_sam/20120213044700コピー\ ～\ 0011のコピー.jpg + https://pic.nijie.net/06/nijie/12/34/334/illust/0_0_f16b3c9eac5b1c03_bbe7a0.jpg + https://pic.nijie.net/06/nijie/12/34/334/illust/53023_1_76769657f10e5d57_3e00d7.jpg + https://pic.nijie.net/06/nijie/12/34/334/illust/53023_2_9cb4d9bdf9cc75a6_872020.jpg ] tags = [%w[中出し https://nijie.info/search_dojin.php?word=%E4%B8%AD%E5%87%BA%E3%81%97], %w[フェラ https://nijie.info/search_dojin.php?word=%E3%83%95%E3%82%A7%E3%83%A9], diff --git a/test/unit/sources/skeb_test.rb b/test/unit/sources/skeb_test.rb index 83856bde9..e6aa0abbf 100644 --- a/test/unit/sources/skeb_test.rb +++ b/test/unit/sources/skeb_test.rb @@ -4,27 +4,27 @@ module Sources class SkebTest < ActiveSupport::TestCase context "The source for a skeb picture" do setup do - @site = Sources::Strategies.find("https://skeb.jp/@kai_chiisame/works/6") + @site = Sources::Strategies.find("https://skeb.jp/@kokuzou593/works/45") end should "get the artist name" do - assert_equal("kai_chiisame", @site.artist_name) + assert_equal("kokuzou593", @site.artist_name) end should "get profile url" do - assert_equal("https://skeb.jp/@kai_chiisame", @site.profile_url) + assert_equal("https://skeb.jp/@kokuzou593", @site.profile_url) end should "get the image url" do - assert_equal("https://skeb.imgix.net/requests/229088_2?bg=%23fff&auto=format&txtfont=bold&txtshad=70&txtclr=BFFFFFFF&txtalign=middle%2Ccenter&txtsize=150&txt=SAMPLE&w=800&s=32a275893cf5362d51e5744ff5d8f88b", @site.image_url) + assert_equal(["https://skeb.imgix.net/uploads/origins/307941e9-dbe0-4e4b-93d4-94accdaff9a0?bg=%23fff&auto=format&w=800&s=e0ddfb1fa0d9f23797b338598aae78fa"], @site.image_urls) end should "get the canonical url" do - assert_equal("https://skeb.jp/@kai_chiisame/works/6", @site.canonical_url) + assert_equal("https://skeb.jp/@kokuzou593/works/45", @site.canonical_url) end should "find the correct artist" do - artist = FactoryBot.create(:artist, name: "kai_chiisame", url_string: @site.url) + artist = create(:artist, name: "kokuzou593", url_string: @site.url) assert_equal([artist], @site.artists) end diff --git a/test/unit/sources/stash_test.rb b/test/unit/sources/stash_test.rb index 4889869c0..97133f9db 100644 --- a/test/unit/sources/stash_test.rb +++ b/test/unit/sources/stash_test.rb @@ -19,7 +19,7 @@ module Sources assert_equal("https://sta.sh/0wxs31o7nn2", @site.page_url) assert_equal("https://sta.sh/0wxs31o7nn2", @site.canonical_url) - assert_match(%r!\Ahttps://api-da\.wixmp\.com/_api/download/file\?downloadToken=!, @site.image_url) + assert_match("https://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png", @site.image_url) end end @@ -36,7 +36,7 @@ module Sources assert_equal("https://sta.sh/0wxs31o7nn2", @site.page_url) assert_equal("https://sta.sh/0wxs31o7nn2", @site.canonical_url) - assert_match(%r!\Ahttps://api-da\.wixmp\.com/_api/download/file\?downloadToken=!, @site.image_url) + assert_match("https://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png", @site.image_url) end end