Merge pull request #6282 from alexeymuranov/rename-fixtures-class

Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"

12 files changed, 80 insertions, 60 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index ba292e7f0e..9abfe2e6fd 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`.
+    Instances of this class normally hold a collection of fixtures (records)
+    loaded either from a single YAML file, or from a file and a folder
+    with the same name.  This change make the class name singular and makes
+    the class easier to distinguish from the modules like
+    `ActiveRecord::TestFixtures`, which operates on multiple fixture sets,
+    or `DelegatingFixtures`, `::Fixtures`, etc.,
+    and from the class `ActiveRecord::Fixture`, which corresponds to a single
+    fixture.
+
+    *Alexey Muranov*
+
 *   The postgres adapter now supports tables with capital letters.
     Fix #5920
 
@@ -635,7 +647,7 @@
     *Michael Pearson*
 
 *   Added default order to `first` to assure consistent results among
-    diferent database engines. Introduced `take` as a replacement to
+    different database engines. Introduced `take` as a replacement to
     the old behavior of `first`.
 
     *Marcelo Silveira*
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixture_set/file.rb
index 0f6ab3e396..11b53275e1 100644
--- a/activerecord/lib/active_record/fixtures/file.rb
+++ b/activerecord/lib/active_record/fixture_set/file.rb
@@ -2,7 +2,7 @@ require 'erb'
 require 'yaml'
 
 module ActiveRecord
-  class Fixtures
+  class FixtureSet
     class File # :nodoc:
       include Enumerable
 
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 60fc653735..899e89a6f5 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -2,9 +2,11 @@ require 'erb'
 require 'yaml'
 require 'zlib'
 require 'active_support/dependencies'
-require 'active_record/fixtures/file'
+require 'active_record/fixture_set/file'
 require 'active_record/errors'
 
+require 'active_support/deprecation' # temporary
+
 module ActiveRecord
   class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
   end
@@ -350,8 +352,8 @@ module ActiveRecord
   # to the rescue:
   #
   #   george_reginald:
-  #     monkey_id: <%= ActiveRecord::Fixtures.identify(:reginald) %>
-  #     pirate_id: <%= ActiveRecord::Fixtures.identify(:george) %>
+  #     monkey_id: <%= ActiveRecord::FixtureSet.identify(:reginald) %>
+  #     pirate_id: <%= ActiveRecord::FixtureSet.identify(:george) %>
   #
   # == Support for YAML defaults
   #
@@ -370,10 +372,11 @@ module ActiveRecord
   #     *DEFAULTS
   #
   # Any fixture labeled "DEFAULTS" is safely ignored.
-  class Fixtures
+  class FixtureSet
     #--
-    # NOTE: an instance of Fixtures can be called fixture_set, it is normally stored in a single YAML file and possibly in a folder with the same name.
+    # An instance of FixtureSet is normally stored in a single YAML file and possibly in a folder with the same name.
     #++
+
     MAX_ID = 2 ** 30 - 1
 
     @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
@@ -451,7 +454,7 @@ module ActiveRecord
           fixtures_map = {}
 
           fixture_sets = files_to_read.map do |fs_name|
-            fixtures_map[fs_name] = new( # ActiveRecord::Fixtures.new
+            fixtures_map[fs_name] = new( # ActiveRecord::FixtureSet.new
               connection,
               fs_name,
               class_names[fs_name] || default_fixture_model_name(fs_name),
@@ -565,7 +568,7 @@ module ActiveRecord
 
           # generate a primary key if necessary
           if has_primary_key_column? && !row.include?(primary_key_name)
-            row[primary_key_name] = ActiveRecord::Fixtures.identify(label)
+            row[primary_key_name] = ActiveRecord::FixtureSet.identify(label)
           end
 
           # If STI is used, find the correct subclass for association reflection
@@ -588,7 +591,7 @@ module ActiveRecord
                   row[association.foreign_type] = $1
                 end
 
-                row[fk_name] = ActiveRecord::Fixtures.identify(value)
+                row[fk_name] = ActiveRecord::FixtureSet.identify(value)
               end
             when :has_and_belongs_to_many
               if (targets = row.delete(association.name.to_s))
@@ -596,7 +599,7 @@ module ActiveRecord
                 table_name = association.join_table
                 rows[table_name].concat targets.map { |target|
                   { association.foreign_key             => row[primary_key_name],
-                    association.association_foreign_key => ActiveRecord::Fixtures.identify(target) }
+                    association.association_foreign_key => ActiveRecord::FixtureSet.identify(target) }
                 }
               end
             end
@@ -637,7 +640,7 @@ module ActiveRecord
         } + [yaml_file_path]
 
         yaml_files.each do |file|
-          Fixtures::File.open(file) do |fh|
+          FixtureSet::File.open(file) do |fh|
             fh.each do |fixture_name, row|
               fixtures[fixture_name] = ActiveRecord::Fixture.new(row, model_class)
             end
@@ -651,6 +654,11 @@ module ActiveRecord
 
   end
 
+  #--
+  # Deprecate 'Fixtures' in favor of 'FixtureSet'.
+  #++
+  Fixtures = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveRecord::Fixtures', '::ActiveRecord::FixtureSet')
+
   class Fixture #:nodoc:
     include Enumerable
 
@@ -712,7 +720,7 @@ module ActiveRecord
       self.pre_loaded_fixtures = false
 
       self.fixture_class_names = Hash.new do |h, fixture_set_name|
-        h[fixture_set_name] = ActiveRecord::Fixtures.default_fixture_model_name(fixture_set_name)
+        h[fixture_set_name] = ActiveRecord::FixtureSet.default_fixture_model_name(fixture_set_name)
       end
     end
 
@@ -847,7 +855,7 @@ module ActiveRecord
         end
       # Load fixtures for every test.
       else
-        ActiveRecord::Fixtures.reset_cache
+        ActiveRecord::FixtureSet.reset_cache
         @@already_loaded_fixtures[self.class] = nil
         @loaded_fixtures = load_fixtures
       end
@@ -860,7 +868,7 @@ module ActiveRecord
       return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
 
       unless run_in_transaction?
-        ActiveRecord::Fixtures.reset_cache
+        ActiveRecord::FixtureSet.reset_cache
       end
 
       # Rollback changes if a transaction is active.
@@ -879,7 +887,7 @@ module ActiveRecord
 
     private
       def load_fixtures
-        fixtures = ActiveRecord::Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
+        fixtures = ActiveRecord::FixtureSet.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
         Hash[fixtures.map { |f| [f.name, f] }]
       end
 
@@ -888,16 +896,16 @@ module ActiveRecord
 
       def instantiate_fixtures
         if pre_loaded_fixtures
-          raise RuntimeError, 'Load fixtures before instantiating them.' if ActiveRecord::Fixtures.all_loaded_fixtures.empty?
+          raise RuntimeError, 'Load fixtures before instantiating them.' if ActiveRecord::FixtureSet.all_loaded_fixtures.empty?
           unless @@required_fixture_classes
-            self.class.require_fixture_classes ActiveRecord::Fixtures.all_loaded_fixtures.keys
+            self.class.require_fixture_classes ActiveRecord::FixtureSet.all_loaded_fixtures.keys
             @@required_fixture_classes = true
           end
-          ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
+          ActiveRecord::FixtureSet.instantiate_all_loaded_fixtures(self, load_instances?)
         else
           raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
           @loaded_fixtures.each_value do |fixture_set|
-            ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_set, load_instances?)
+            ActiveRecord::FixtureSet.instantiate_fixtures(self, fixture_set, load_instances?)
           end
         end
       end
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index d134978128..69a9526fcc 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -196,7 +196,7 @@ db_namespace = namespace :db do
       fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact
 
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file|
-        ActiveRecord::Fixtures.create_fixtures(fixtures_dir, fixture_file)
+        ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_file)
       end
     end
 
@@ -207,13 +207,13 @@ db_namespace = namespace :db do
       label, id = ENV['LABEL'], ENV['ID']
       raise 'LABEL or ID required' if label.blank? && id.blank?
 
-      puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::Fixtures.identify(label)}.) if label
+      puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::FixtureSet.identify(label)}.) if label
 
       base_dir = ENV['FIXTURES_PATH'] ? File.join(Rails.root, ENV['FIXTURES_PATH']) : File.join(Rails.root, 'test', 'fixtures')
       Dir["#{base_dir}/**/*.yml"].each do |file|
         if data = YAML::load(ERB.new(IO.read(file)).result)
           data.keys.each do |key|
-            key_id = ActiveRecord::Fixtures.identify(key)
+            key_id = ActiveRecord::FixtureSet.identify(key)
 
             if key == label || key_id == id.to_i
               puts "#{file}: #{key} (#{key_id})"
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index aff971a955..5164acf77f 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -136,9 +136,9 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
   #the following functions were added to DRY test cases
 
   private
-  # custom fixture loader, uses Fixtures#create_fixtures and appends base_path to the current file's path
+  # custom fixture loader, uses FixtureSet#create_fixtures and appends base_path to the current file's path
   def create_test_fixtures(*fixture_names)
-    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
+    ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
   end
 
   # custom drop table, uses execute on connection to drop a table if it exists. note: escapes table_name
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 9fd07f014e..1017b0758d 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -136,9 +136,9 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
   #the following functions were added to DRY test cases
 
   private
-  # custom fixture loader, uses Fixtures#create_fixtures and appends base_path to the current file's path
+  # custom fixture loader, uses FixtureSet#create_fixtures and appends base_path to the current file's path
   def create_test_fixtures(*fixture_names)
-    ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
+    ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
   end
 
   # custom drop table, uses execute on connection to drop a table if it exists. note: escapes table_name
diff --git a/activerecord/test/cases/fixtures/file_test.rb b/activerecord/test/cases/fixture_set/file_test.rb
index e623fbe4d1..a029fedbd3 100644
--- a/activerecord/test/cases/fixtures/file_test.rb
+++ b/activerecord/test/cases/fixture_set/file_test.rb
@@ -2,7 +2,7 @@ require 'cases/helper'
 require 'tempfile'
 
 module ActiveRecord
-  class Fixtures
+  class FixtureSet
     class FileTest < ActiveRecord::TestCase
       def test_open
         fh = File.open(::File.join(FIXTURES_ROOT, "accounts.yml"))
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index c28f8de682..b0b29f5f42 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -40,7 +40,7 @@ class FixturesTest < ActiveRecord::TestCase
     FIXTURES.each do |name|
       fixtures = nil
       assert_nothing_raised { fixtures = create_fixtures(name).first }
-      assert_kind_of(ActiveRecord::Fixtures, fixtures)
+      assert_kind_of(ActiveRecord::FixtureSet, fixtures)
       fixtures.each { |_name, fixture|
         fixture.each { |key, value|
           assert_match(MATCH_ATTRIBUTE_NAME, key)
@@ -57,7 +57,7 @@ class FixturesTest < ActiveRecord::TestCase
     dir  = File.dirname badyaml.path
     name = File.basename badyaml.path, '.yml'
     assert_raises(ActiveRecord::Fixture::FormatError) do
-      ActiveRecord::Fixtures.create_fixtures(dir, name)
+      ActiveRecord::FixtureSet.create_fixtures(dir, name)
     end
   ensure
     badyaml.close
@@ -65,7 +65,7 @@ class FixturesTest < ActiveRecord::TestCase
   end
 
   def test_create_fixtures
-    fixtures = ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, "parrots")
+    fixtures = ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, "parrots")
     assert Parrot.find_by_name('Curious George'), 'George is not in the database'
     assert fixtures.detect { |f| f.name == 'parrots' }, "no fixtures named 'parrots' in #{fixtures.map(&:name).inspect}"
   end
@@ -74,11 +74,11 @@ class FixturesTest < ActiveRecord::TestCase
     fixtures_array = nil
     assert_nothing_raised { fixtures_array = create_fixtures(*FIXTURES) }
     assert_kind_of(Array, fixtures_array)
-    fixtures_array.each { |fixtures| assert_kind_of(ActiveRecord::Fixtures, fixtures) }
+    fixtures_array.each { |fixtures| assert_kind_of(ActiveRecord::FixtureSet, fixtures) }
   end
 
   def test_create_symbol_fixtures
-    fixtures = ActiveRecord::Fixtures.create_fixtures(FIXTURES_ROOT, :collections, :collections => Course) { Course.connection }
+    fixtures = ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, :collections, :collections => Course) { Course.connection }
 
     assert Course.find_by_name('Collection'), 'course is not in the database'
     assert fixtures.detect { |f| f.name == 'collections' }, "no fixtures named 'collections' in #{fixtures.map(&:name).inspect}"
@@ -102,7 +102,7 @@ class FixturesTest < ActiveRecord::TestCase
   if ActiveRecord::Base.connection.supports_migrations?
     def test_inserts_with_pre_and_suffix
       # Reset cache to make finds on the new table work
-      ActiveRecord::Fixtures.reset_cache
+      ActiveRecord::FixtureSet.reset_cache
 
       ActiveRecord::Base.connection.create_table :prefix_other_topics_suffix do |t|
         t.column :title, :string
@@ -190,11 +190,11 @@ class FixturesTest < ActiveRecord::TestCase
   end
 
   def test_empty_yaml_fixture
-    assert_not_nil ActiveRecord::Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
+    assert_not_nil ActiveRecord::FixtureSet.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
   end
 
   def test_empty_yaml_fixture_with_a_comment_in_it
-    assert_not_nil ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
+    assert_not_nil ActiveRecord::FixtureSet.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
   end
 
   def test_nonexistent_fixture_file
@@ -204,19 +204,19 @@ class FixturesTest < ActiveRecord::TestCase
     assert Dir[nonexistent_fixture_path+"*"].empty?
 
     assert_raise(Errno::ENOENT) do
-      ActiveRecord::Fixtures.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
+      ActiveRecord::FixtureSet.new( Account.connection, "companies", 'Company', nonexistent_fixture_path)
     end
   end
 
   def test_dirty_dirty_yaml_file
     assert_raise(ActiveRecord::Fixture::FormatError) do
-      ActiveRecord::Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
+      ActiveRecord::FixtureSet.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
     end
   end
 
   def test_omap_fixtures
     assert_nothing_raised do
-      fixtures = ActiveRecord::Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
+      fixtures = ActiveRecord::FixtureSet.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
 
       fixtures.each.with_index do |(name, fixture), i|
         assert_equal "fixture_no_#{i}", name
@@ -254,7 +254,7 @@ if Account.connection.respond_to?(:reset_pk_sequence!)
 
     def setup
       @instances = [Account.new(:credit_limit => 50), Company.new(:name => 'RoR Consulting')]
-      ActiveRecord::Fixtures.reset_cache # make sure tables get reinitialized
+      ActiveRecord::FixtureSet.reset_cache # make sure tables get reinitialized
     end
 
     def test_resets_to_min_pk_with_specified_pk_and_sequence
@@ -582,13 +582,13 @@ class FasterFixturesTest < ActiveRecord::TestCase
 
   def load_extra_fixture(name)
     fixture = create_fixtures(name).first
-    assert fixture.is_a?(ActiveRecord::Fixtures)
+    assert fixture.is_a?(ActiveRecord::FixtureSet)
     @loaded_fixtures[fixture.table_name] = fixture
   end
 
   def test_cache
-    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'categories')
-    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'authors')
+    assert ActiveRecord::FixtureSet.fixture_is_cached?(ActiveRecord::Base.connection, 'categories')
+    assert ActiveRecord::FixtureSet.fixture_is_cached?(ActiveRecord::Base.connection, 'authors')
 
     assert_no_queries do
       create_fixtures('categories')
@@ -596,7 +596,7 @@ class FasterFixturesTest < ActiveRecord::TestCase
     end
 
     load_extra_fixture('posts')
-    assert ActiveRecord::Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
+    assert ActiveRecord::FixtureSet.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
     self.class.setup_fixture_accessors :posts
     assert_equal 'Welcome to the weblog', posts(:welcome).title
   end
@@ -606,17 +606,17 @@ class FoxyFixturesTest < ActiveRecord::TestCase
   fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers, :developers, :"admin/accounts", :"admin/users"
 
   def test_identifies_strings
-    assert_equal(ActiveRecord::Fixtures.identify("foo"), ActiveRecord::Fixtures.identify("foo"))
-    assert_not_equal(ActiveRecord::Fixtures.identify("foo"), ActiveRecord::Fixtures.identify("FOO"))
+    assert_equal(ActiveRecord::FixtureSet.identify("foo"), ActiveRecord::FixtureSet.identify("foo"))
+    assert_not_equal(ActiveRecord::FixtureSet.identify("foo"), ActiveRecord::FixtureSet.identify("FOO"))
   end
 
   def test_identifies_symbols
-    assert_equal(ActiveRecord::Fixtures.identify(:foo), ActiveRecord::Fixtures.identify(:foo))
+    assert_equal(ActiveRecord::FixtureSet.identify(:foo), ActiveRecord::FixtureSet.identify(:foo))
   end
 
   def test_identifies_consistently
-    assert_equal 207281424, ActiveRecord::Fixtures.identify(:ruby)
-    assert_equal 1066363776, ActiveRecord::Fixtures.identify(:sapphire_2)
+    assert_equal 207281424, ActiveRecord::FixtureSet.identify(:ruby)
+    assert_equal 1066363776, ActiveRecord::FixtureSet.identify(:sapphire_2)
   end
 
   TIMESTAMP_COLUMNS = %w(created_at created_on updated_at updated_on)
@@ -757,7 +757,7 @@ class FixtureLoadingTest < ActiveRecord::TestCase
 end
 
 class CustomNameForFixtureOrModelTest < ActiveRecord::TestCase
-  ActiveRecord::Fixtures.reset_cache
+  ActiveRecord::FixtureSet.reset_cache
 
   set_fixture_class :randomly_named_a9         =>
                         ClassNameThatDoesNotFollowCONVENTIONS,
@@ -782,7 +782,7 @@ class CustomNameForFixtureOrModelTest < ActiveRecord::TestCase
   end
 
   def test_table_name_is_defined_in_the_model
-    assert_equal 'randomly_named_table', ActiveRecord::Fixtures::all_loaded_fixtures["admin/randomly_named_a9"].table_name
+    assert_equal 'randomly_named_table', ActiveRecord::FixtureSet::all_loaded_fixtures["admin/randomly_named_a9"].table_name
     assert_equal 'randomly_named_table', Admin::ClassNameThatDoesNotFollowCONVENTIONS.table_name
   end
 end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index f39111ba77..cff6689c15 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -80,7 +80,7 @@ class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
 
   def create_fixtures(*fixture_set_names, &block)
-    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, fixture_class_names, &block)
+    ActiveRecord::FixtureSet.create_fixtures(ActiveSupport::TestCase.fixture_path, fixture_set_names, fixture_class_names, &block)
   end
 end
 
diff --git a/activerecord/test/fixtures/mateys.yml b/activerecord/test/fixtures/mateys.yml
index d3690955fc..3f0405aaf8 100644
--- a/activerecord/test/fixtures/mateys.yml
+++ b/activerecord/test/fixtures/mateys.yml
@@ -1,4 +1,4 @@
 blackbeard_to_redbeard:
-  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>
-  target_id: <%= ActiveRecord::Fixtures.identify(:redbeard) %>
+  pirate_id: <%= ActiveRecord::FixtureSet.identify(:blackbeard) %>
+  target_id: <%= ActiveRecord::FixtureSet.identify(:redbeard) %>
   weight: 10
diff --git a/activerecord/test/fixtures/parrots_pirates.yml b/activerecord/test/fixtures/parrots_pirates.yml
index 66472243c7..e1a301b91a 100644
--- a/activerecord/test/fixtures/parrots_pirates.yml
+++ b/activerecord/test/fixtures/parrots_pirates.yml
@@ -1,7 +1,7 @@
 george_blackbeard:
-  parrot_id: <%= ActiveRecord::Fixtures.identify(:george) %>
-  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>
+  parrot_id: <%= ActiveRecord::FixtureSet.identify(:george) %>
+  pirate_id: <%= ActiveRecord::FixtureSet.identify(:blackbeard) %>
 
 louis_blackbeard:
-  parrot_id: <%= ActiveRecord::Fixtures.identify(:louis) %>
-  pirate_id: <%= ActiveRecord::Fixtures.identify(:blackbeard) %>
+  parrot_id: <%= ActiveRecord::FixtureSet.identify(:louis) %>
+  pirate_id: <%= ActiveRecord::FixtureSet.identify(:blackbeard) %>
diff --git a/activerecord/test/fixtures/peoples_treasures.yml b/activerecord/test/fixtures/peoples_treasures.yml
index a72b190d0c..46abe50e6c 100644
--- a/activerecord/test/fixtures/peoples_treasures.yml
+++ b/activerecord/test/fixtures/peoples_treasures.yml
@@ -1,3 +1,3 @@
 michael_diamond:
-  rich_person_id: <%= ActiveRecord::Fixtures.identify(:michael) %>
-  treasure_id: <%= ActiveRecord::Fixtures.identify(:diamond) %>
+  rich_person_id: <%= ActiveRecord::FixtureSet.identify(:michael) %>
+  treasure_id: <%= ActiveRecord::FixtureSet.identify(:diamond) %>