From b6a3a0542223a2654ac0b1ed388a70fb95c25db5 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 26 Dec 2019 15:13:14 -0600 Subject: [PATCH] aliases: fix bug when trying to move wiki pages. --- app/models/tag_alias.rb | 2 +- test/unit/tag_alias_test.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index c4c33699c..7981c968b 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -150,7 +150,7 @@ class TagAlias < TagRelationship antecedent_wiki = WikiPage.titled(antecedent_name).first if antecedent_wiki.present? if WikiPage.titled(consequent_name).blank? - antecedent_wiki.update!(title: consequent_name, skip_secondary_validations: true) + antecedent_wiki.update!(title: consequent_name) else forum_updater.update(conflict_message) end diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb index fb6b161fe..114b6bff9 100644 --- a/test/unit/tag_alias_test.rb +++ b/test/unit/tag_alias_test.rb @@ -160,6 +160,16 @@ class TagAliasTest < ActiveSupport::TestCase end end + should "move existing wikis" do + wiki = create(:wiki_page, title: "aaa") + ta = create(:tag_alias, antecedent_name: "aaa", consequent_name: "bbb", status: "pending") + + ta.approve!(approver: @admin) + perform_enqueued_jobs + + assert_equal("bbb", wiki.reload.title) + end + should "move existing aliases" do ta1 = FactoryBot.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb", :status => "pending") ta2 = FactoryBot.create(:tag_alias, :antecedent_name => "bbb", :consequent_name => "ccc", :status => "pending")