From d1e9f9c3cefc90102104554c5192dd4d94b43b18 Mon Sep 17 00:00:00 2001 From: evazion Date: Wed, 26 Sep 2018 00:42:47 -0500 Subject: [PATCH] Fix broken test artist controller tests, tag alias test. --- app/models/tag_alias.rb | 7 ++----- test/functional/artists_controller_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index c7dcc2a9a..f226147ba 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -203,12 +203,9 @@ class TagAlias < TagRelationship end if antecedent_tag.category == Tag.categories.artist - antecedent_artist = Artist.name_matches(antecedent_name).first - if antecedent_artist.present? && Artist.name_matches(consequent_name).blank? + if antecedent_tag.artist.present? && consequent_tag.artist.blank? CurrentUser.scoped(creator, creator_ip_addr) do - antecedent_artist.update_attributes( - :name => consequent_name - ) + antecedent_tag.artist.update!(name: consequent_name) end end end diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb index 99ba4e9dd..de0dc0dc8 100644 --- a/test/functional/artists_controller_test.rb +++ b/test/functional/artists_controller_test.rb @@ -106,13 +106,13 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest end should "find artists by image URL" do - get artists_path(name: "http://i2.pixiv.net/img04/img/syounen_no_uta/46170939_m.jpg", format: "json") + get artists_path(search: { url_matches: "http://i2.pixiv.net/img04/img/syounen_no_uta/46170939_m.jpg" }, format: "json") assert_artist_found("masao") end should "find artists by page URL" do url = "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=46170939" - get artists_path(name: url, format: "json") + get artists_path(search: { url_matches: url }, format: "json") assert_artist_found("masao") end end