diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 10:49:47 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 10:49:47 -0800 |
commit | c71df74fb1084c9204233ecb37fe54be243cfdc2 (patch) | |
tree | a1fbc29109c5228526b440218bcb785c2e72d423 /activerecord/lib/active_record/fixtures.rb | |
parent | e7f5317ff9696e7e38c56d403ec822ee94aa8e24 (diff) | |
parent | 486db21f919c39cef76b487be45290b7561307e8 (diff) | |
download | rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.tar.gz rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.tar.bz2 rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.zip |
Merge branch 'master' into adequaterecord
* master:
Fix eager load of Serializers on Active Model
Consistence in the block style
Remove warnings on Ruby 2.1
Only some dynamic finders are deprecated.
clean up security guide: his => their [ci skip]
Remove warning
Extract a method to simplify setup code
Use minitest's skip rather than conditionals + early returns
Move AR test classes inside the test case
Do not set up a variable used only in two tests
No need for instance vars on single tests
Cleanup duplicated setup of callbacks in transactions tests
No need to use #send with public methods
Update deprecation warning to give more information about caller
Update changelog
Avoid scanning multiple render calls as a single match.
Improve ERB dependency detection.
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index fee3f51d9e..297792aeec 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -462,7 +462,7 @@ module ActiveRecord @class_names.delete_if { |k,klass| unless klass.is_a? Class klass = klass.safe_constantize - ActiveSupport::Deprecation.warn("The ability to pass in strings as a class name will be removed in Rails 4.2, consider using the class itself instead.") + ActiveSupport::Deprecation.warn("The ability to pass in strings as a class name to `set_fixture_class` will be removed in Rails 4.2. Use the class itself instead.") end !insert_class(@class_names, k, klass) } @@ -568,7 +568,7 @@ module ActiveRecord @model_class = nil if class_name.is_a?(String) - ActiveSupport::Deprecation.warn("The ability to pass in strings as a class name will be removed in Rails 4.2, consider using the class itself instead.") + ActiveSupport::Deprecation.warn("The ability to pass in strings as a class name to `FixtureSet.new` will be removed in Rails 4.2. Use the class itself instead.") end if class_name.is_a?(Class) # TODO: Should be an AR::Base type class, or any? |