Merge pull request rails#8391 from rmascarenhas/reset-attribute-doesn…

…t-change-it

Reset attributes should not report changes.

activemodel/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   `[attribute]_changed?` now returns `false` after a call to `reset_[attribute]!`
+
+    *Renato Mascarenhas*
+
 *   Observers was extracted from Active Model as `rails-observers` gem.
 
     *Rafael Mendonça França*

activemodel/lib/active_model/dirty.rb

@@ -174,7 +174,10 @@ def attribute_will_change!(attr)
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
       def reset_attribute!(attr)
-        __send__("#{attr}=", changed_attributes[attr]) if attribute_changed?(attr)
+        if attribute_changed?(attr)
+          __send__("#{attr}=", changed_attributes[attr])
+          changed_attributes.delete(attr)
+        end
       end
   end
 end

activemodel/test/cases/dirty_test.rb

@@ -78,7 +78,7 @@ def save
     @model.name = "Bob"
     @model.reset_name!
     assert_nil @model.name
-    #assert !@model.name_changed #Doesn't work yet
+    assert !@model.name_changed?
   end
 
   test "setting color to same value should not result in change being recorded" do
@@ -114,5 +114,4 @@ def save
     assert_equal ["Otto", "Mr. Manfredgensonton"], @model.name_change
     assert_equal @model.name_was, "Otto"
   end
-
 end