1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/test/fixtures_test.rb b/activerecord/test/fixtures_test.rb
index 6f11a337b1..de0321fbf4 100755
--- a/activerecord/test/fixtures_test.rb
+++ b/activerecord/test/fixtures_test.rb
@@ -10,6 +10,7 @@ require 'fixtures/category'
 require 'fixtures/parrot'
 require 'fixtures/pirate'
 require 'fixtures/treasure'
+require 'fixtures/matey'
 
 class FixturesTest < Test::Unit::TestCase
   self.use_instantiated_fixtures = true
@@ -451,7 +452,7 @@ class FasterFixturesTest < Test::Unit::TestCase
 end
 
 class FoxyFixturesTest < Test::Unit::TestCase
-  fixtures :parrots, :parrots_pirates, :pirates, :treasures
+  fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys
 
   def test_identifies_strings
     assert_equal(Fixtures.identify("foo"), Fixtures.identify("foo"))
@@ -533,6 +534,12 @@ class FoxyFixturesTest < Test::Unit::TestCase
     assert_equal(pirates(:redbeard), treasures(:sapphire).looter)
     assert_equal(parrots(:louis), treasures(:ruby).looter)
   end
+  
+  def test_only_generates_a_pk_if_necessary
+    m = Matey.find(:first)
+    m.pirate = pirates(:blackbeard)
+    m.target = pirates(:redbeard)
+  end
 end
 
 class ActiveSupportSubclassWithFixturesTest < ActiveSupport::TestCase