diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-07 14:48:00 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-07 14:48:00 -0700 |
| commit | 800604e4452dcc39849cbab087d96c3b7ca44e47 (patch) | |
| tree | b9ae87c12d67ace4db7c77fe9762aee6ec4bca3f /actionpack/test | |
| parent | 221211088bc2a0421dc641355017d3ba78b25cc5 (diff) | |
| parent | bf4d6a235367a4704fd341711806c170aa234f80 (diff) | |
| download | rails-800604e4452dcc39849cbab087d96c3b7ca44e47.tar.gz rails-800604e4452dcc39849cbab087d96c3b7ca44e47.tar.bz2 rails-800604e4452dcc39849cbab087d96c3b7ca44e47.zip | |
Merge pull request #6282 from alexeymuranov/rename-fixtures-class
Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/active_record_unit.rb | 2 |
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) |