Better regression test for Fixtures with fk as a symbol

2 files changed, 2 insertions, 11 deletions

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index e96f6cb67a..1050047a43 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -675,7 +675,7 @@ class FoxyFixturesTest < ActiveRecord::TestCase
   if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
     require 'models/uuid_parent'
     require 'models/uuid_child'
-    fixtures :uuid_parents, :uuid_children 
+    fixtures :uuid_parents, :uuid_children
   end
 
   def test_identifies_strings
@@ -810,15 +810,6 @@ class FoxyFixturesTest < ActiveRecord::TestCase
     assert admin_accounts(:signals37).users.include?(admin_users(:david))
     assert_equal 2, admin_accounts(:signals37).users.size
   end
-
-  class Nemesis < ActiveRecord::Base
-    self.table_name = "mateys"
-    belongs_to :mortal_enemy, :class_name => 'Pirate', :foreign_key => :target_id
-  end
-
-  def test_symbol_foreign_key_id
-    ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, "nemeses", "nemeses" => Nemesis)
-  end
 end
 
 class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
diff --git a/activerecord/test/models/parrot.rb b/activerecord/test/models/parrot.rb
index e76e83f314..8c83de573f 100644
--- a/activerecord/test/models/parrot.rb
+++ b/activerecord/test/models/parrot.rb
@@ -19,7 +19,7 @@ class LiveParrot < Parrot
 end
 
 class DeadParrot < Parrot
-  belongs_to :killer, :class_name => 'Pirate'
+  belongs_to :killer, :class_name => 'Pirate', foreign_key: :killer_id
 end
 
 class FunkyParrot < Parrot