aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAlexey Muranov <alexey.muranov@gmail.com>2012-05-12 13:17:03 +0200
committerAlexey Muranov <alexey.muranov@gmail.com>2012-10-07 19:15:58 +0200
commita94220b66c9e4890007f66b092b25f8a64a19d31 (patch)
treeb436fe60abb6c4c20589d37b3f27be5d61609a80 /actionpack
parent918f7038b3d4d4180a4d1056bb4b7b3f3b85508f (diff)
downloadrails-a94220b66c9e4890007f66b092b25f8a64a19d31.tar.gz
rails-a94220b66c9e4890007f66b092b25f8a64a19d31.tar.bz2
rails-a94220b66c9e4890007f66b092b25f8a64a19d31.zip
Rename "Fixtures" class to "FixtureSet"
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.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/active_record_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 4f2b052720..4dd7406798 100644
--- a/actionpack/test/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -11,7 +11,7 @@ class ActiveRecordTestConnector
end
# Try to grab AR
-unless defined?(ActiveRecord) && defined?(Fixtures)
+unless defined?(ActiveRecord) && defined?(FixtureSet)
begin
PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)