diff --git a/app/assets/javascripts/related_tag.js.erb b/app/assets/javascripts/related_tag.js.erb index b7aa78f52..88ea5ed71 100644 --- a/app/assets/javascripts/related_tag.js.erb +++ b/app/assets/javascripts/related_tag.js.erb @@ -327,7 +327,6 @@ Danbooru.RelatedTag.disable_artist_url = function(e) { var url = e.currentTarget.href; - console.log("clicked %o", url); $.each(Danbooru.RelatedTag.recent_artists[0].sorted_urls, function(k, v) { if (v["normalized_url"] === url || v["url"] === url) { if (!confirm("This will mark the URL as inactive. Continue?")) { diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb index f1203b8ac..ad3ba74e7 100644 --- a/test/functional/artists_controller_test.rb +++ b/test/functional/artists_controller_test.rb @@ -199,7 +199,7 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest should "undelete an artist" do @builder = create(:builder_user) - post_auth undelete_artist_path(@artist.id), @builder + put_auth artist_path(@artist.id), @builder, params: {artist: {is_active: true}} assert_redirected_to(artist_path(@artist.id)) assert_equal(true, @artist.reload.is_active) end diff --git a/test/unit/post_replacement_test.rb b/test/unit/post_replacement_test.rb index 03173cbd4..7d96a07c4 100644 --- a/test/unit/post_replacement_test.rb +++ b/test/unit/post_replacement_test.rb @@ -194,7 +194,7 @@ class PostReplacementTest < ActiveSupport::TestCase assert_equal("cad1da177ef309bf40a117c17b8eecf5", Digest::MD5.file(@post.file).hexdigest) assert_equal("https://i.pximg.net/img-zip-ugoira/img/2017/04/04/08/57/38/62247364_ugoira1920x1080.zip", @post.source) - assert_equal([{"delay_msec"=>125}, {"delay_msec"=>125}], @post.pixiv_ugoira_frame_data.data) + assert_equal([{"delay"=>125, "file"=>"000001.jpg"}, {"delay"=>125,"file"=>"000002.jpg"}], @post.pixiv_ugoira_frame_data.data) rescue Net::OpenTimeout skip "Remote connection to Pixiv failed" end