diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-04-12 14:54:31 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-04-12 14:54:31 -0600 |
| commit | ba194d4230c97197567e5c0f71fca47e40035783 (patch) | |
| tree | 0dd508146a83958e9eaafc8ec9482d1f44a09d57 | |
| parent | ecd53667fa814023d3434fca0629e19bad46b092 (diff) | |
| parent | 051d859880dde2896cc5417844e566569466b28c (diff) | |
| download | rails-ba194d4230c97197567e5c0f71fca47e40035783.tar.gz rails-ba194d4230c97197567e5c0f71fca47e40035783.tar.bz2 rails-ba194d4230c97197567e5c0f71fca47e40035783.zip | |
Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nil
prevent 'attribute_changed?' from returning nil
| -rw-r--r-- | activemodel/lib/active_model/dirty.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/dirty_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index fad4de9df5..9aca5f2c90 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -180,7 +180,7 @@ module ActiveModel result &&= options[:to] == __send__(attr) if options.key?(:to) result &&= options[:from] == changed_attributes[attr] if options.key?(:from) end - result + !!result end # Handles <tt>*_was</tt> for +method_missing+. diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index cd1967c373..a3f8d26100 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -37,8 +37,8 @@ class DirtyTest < ActiveRecord::TestCase def test_attribute_changes # New record - no changes. pirate = Pirate.new - assert !pirate.catchphrase_changed? - assert_nil pirate.catchphrase_change + assert_equal false, pirate.catchphrase_changed? + assert_equal false, pirate.non_validated_parrot_id_changed? # Change catchphrase. pirate.catchphrase = 'arrr' |