Merge pull request #2739 from evazion/fix-tag-alias

Fix "conflicting wikis" message; fix alias/implication approvers in BURs (#2715)

test/factories/tag_alias.rb

@@ -7,7 +7,8 @@ FactoryGirl.define do
 
     after(:create) do |tag_alias|
       unless tag_alias.status == "pending"
-        tag_alias.process!
+        approver = FactoryGirl.create(:admin_user) unless approver.present?
+        tag_alias.approve!(approver)
       end
     end
   end

test/factories/tag_implication.rb

@@ -7,7 +7,8 @@ FactoryGirl.define do
     
     after(:create) do |tag_implication|
       unless tag_implication.status == "pending"
-        tag_implication.process!
+        approver = FactoryGirl.create(:admin_user) unless approver.present?
+        tag_implication.approve!(approver)
       end
     end
   end