diff --git a/test/unit/sources/bilibili_test.rb b/test/unit/sources/bilibili_test.rb index a46e4fa36..8b779d79d 100644 --- a/test/unit/sources/bilibili_test.rb +++ b/test/unit/sources/bilibili_test.rb @@ -22,7 +22,7 @@ module Sources profile_url: "https://space.bilibili.com/11742550", tags: [], artist_commentary_title: nil, - dtext_artist_commentary_desc: "\"【崩坏3】少女，泳装，夏日时光！\":[https://www.bilibili.com/video/BV1fB4y1Y7zt] 新视频的图片分享！大家记得来康 http://i0.hdslb.com/bfs/emote/d8c665db9fdc69b3b90c71de3fe05536ac795409.png " + dtext_artist_commentary_desc: "\"【崩坏3】少女，泳装，夏日时光！\":[https://www.bilibili.com/video/BV1fB4y1Y7zt/] 新视频的图片分享！大家记得来康 http://i0.hdslb.com/bfs/emote/d8c665db9fdc69b3b90c71de3fe05536ac795409.png " ) end @@ -113,8 +113,8 @@ module Sources "https://i0.hdslb.com/bfs/activity-plat/static/2cf2b9af5d3c5781d611d6e36f405144/E738vcDvd3.png", image_urls: ["https://i0.hdslb.com/bfs/activity-plat/static/2cf2b9af5d3c5781d611d6e36f405144/E738vcDvd3.png"], profile_url: "", - artist_id: "", - page_url: "" + artist_id: nil, + page_url: nil, ) end diff --git a/test/unit/sources/deviant_art_test.rb b/test/unit/sources/deviant_art_test.rb index adbd46fc0..34bb319e4 100644 --- a/test/unit/sources/deviant_art_test.rb +++ b/test/unit/sources/deviant_art_test.rb @@ -23,7 +23,7 @@ module Sources strategy_should_work( "https://pre00.deviantart.net/423b/th/pre/i/2017/281/e/0/mindflayer_girl01_by_nickbeja-dbpxdt8.png", image_urls: ["https://pre00.deviantart.net/423b/th/pre/i/2017/281/e/0/mindflayer_girl01_by_nickbeja-dbpxdt8.png"], - download_size: 840_296, + download_size: 833_251, page_url: "https://www.deviantart.com/nickbeja/art/Mindflayer-Girl01-708675884", artist_name: "nickbeja", profile_url: "https://www.deviantart.com/nickbeja" diff --git a/test/unit/sources/gelbooru_test.rb b/test/unit/sources/gelbooru_test.rb index 3d7503018..cde233f8c 100644 --- a/test/unit/sources/gelbooru_test.rb +++ b/test/unit/sources/gelbooru_test.rb @@ -180,7 +180,13 @@ module Sources image_urls: ["https://safebooru.org//images/4016/64779fbfc87020ed5fd94854fe973bc0.jpeg"], artist_name: nil, profile_url: nil, - tags: %w[brown_eyes d4dj dress long_hair pink_hair sword yano_hiiro yorha_no._2_type_b rating:s], + tags: %w[ + black_blindfold black_dress black_footwear black_hairband black_legwear blindfold boots breasts brown_eyes + cleavage_cutout d4dj dress gloves hairband high_heel_boots high_heels holding juliet_sleeves leotard + long_hair long_sleeves medium_breasts mole mole_under_mouth pink_hair puffy_sleeves rating:s short_hair + silver_hair sword tassel thigh_boots thighhighs thighhighs_under_boots vambraces weapon yano_hiiro + yorha_no._2_type_b + ], artist_commentary_title: nil, artist_commentary_desc: nil, ) @@ -298,6 +304,11 @@ module Sources download_size: 201_643, ) end + + should "normalize rule34.xxx links" do + source = "https://us.rule34.xxx//images/1802/0adc8fa0604dc445b4b47e6f4c436a08.jpeg?1949807" + assert_equal("https://rule34.xxx/index.php?page=post&s=view&id=1949807", Source::URL.page_url(source)) + end end end end diff --git a/test/unit/sources/null_test.rb b/test/unit/sources/null_test.rb index 87a426c64..ab431ecf1 100644 --- a/test/unit/sources/null_test.rb +++ b/test/unit/sources/null_test.rb @@ -97,11 +97,6 @@ module Sources assert_equal("https://shimmie.katawa-shoujo.com/post/view/2740", Source::URL.page_url(source)) end - should "normalize rule34.xxx links" do - source = "https://us.rule34.xxx//images/1802/0adc8fa0604dc445b4b47e6f4c436a08.jpeg?1949807" - assert_equal("https://rule34.xxx/index.php?page=post&s=list&md5=0adc8fa0604dc445b4b47e6f4c436a08", Source::URL.page_url(source)) - end - should "normalize diarypro links" do source1 = "http://nekomataya.net/diarypro/data/upfile/216-1.jpg" source2 = "http://akimbo.sakura.ne.jp/diarypro/diary.cgi?mode=image&upfile=716-3.jpg" diff --git a/test/unit/sources/pixiv_test.rb b/test/unit/sources/pixiv_test.rb index 1bea8d2a4..3ccf0325e 100644 --- a/test/unit/sources/pixiv_test.rb +++ b/test/unit/sources/pixiv_test.rb @@ -165,7 +165,7 @@ module Sources artist_name: "影おじ (隠れエリア)", profile_url: "https://www.pixiv.net/users/6570768", profile_urls: %w[https://www.pixiv.net/stacc/haku3490 https://www.pixiv.net/users/6570768], - tags: %w[r-18 shylily シャイリリー バーチャルyoutuber 両手に茎 乱交], + tags: %w[r-18 shylily シャイリリー バーチャルyoutuber バーチャルyoutuber10000users入り 両手に茎 乱交], ) end @@ -181,7 +181,7 @@ module Sources artist_name: "影おじ (隠れエリア)", profile_url: "https://www.pixiv.net/users/6570768", profile_urls: %w[https://www.pixiv.net/stacc/haku3490 https://www.pixiv.net/users/6570768], - tags: %w[r-18 shylily シャイリリー バーチャルyoutuber 両手に茎 乱交], + tags: %w[r-18 shylily シャイリリー バーチャルyoutuber バーチャルyoutuber10000users入り 両手に茎 乱交], ) end diff --git a/test/unit/sources/stash_test.rb b/test/unit/sources/stash_test.rb index 3614d2b40..69993e3b7 100644 --- a/test/unit/sources/stash_test.rb +++ b/test/unit/sources/stash_test.rb @@ -10,7 +10,7 @@ module Sources context "A https://sta.sh/:id url" do strategy_should_work( "https://sta.sh/0wxs31o7nn2", - image_urls: ["https://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png"], + image_urls: [%r{\Ahttps://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png}], page_url: "https://sta.sh/0wxs31o7nn2", artist_name: "noizave", profile_url: "https://www.deviantart.com/noizave", @@ -22,7 +22,7 @@ module Sources context "A https://orig00.deviantart.net/* image url with a https://sta.sh/:id referer" do strategy_should_work( "https://orig00.deviantart.net/0fd2/f/2018/252/9/c/a_pepe_by_noizave-dcmga0s.png", - image_urls: [" https://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png"], + image_urls: [%r{\Ahttps://wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/83d3eb4d-13e5-4aea-a08f-8d4331d033c4/dcmga0s-a345a815-2436-4ab5-8941-492011e1bff6.png}], referer: "https://sta.sh/0wxs31o7nn2", page_url: "https://sta.sh/0wxs31o7nn2", artist_name: "noizave",