1 files changed, 56 insertions, 1 deletions
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 54427a1513..66ed8a350a 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -41,6 +41,10 @@ class DirtyTest < ActiveModel::TestCase
     def save
       changes_applied
     end
+
+    def reload
+      clear_changes_information
+    end
   end
 
   setup do
@@ -83,6 +87,14 @@ class DirtyTest < ActiveModel::TestCase
     assert_not_nil @model.changes['name']
   end
 
+  test "be consistent with symbols arguments after the changes are applied" do
+    @model.name = "David"
+    assert @model.attribute_changed?(:name)
+    @model.save
+    @model.name = 'Rafael'
+    assert @model.attribute_changed?(:name)
+  end
+
   test "attribute mutation" do
     @model.instance_variable_set("@name", "Yam")
     assert !@model.name_changed?
@@ -95,7 +107,7 @@ class DirtyTest < ActiveModel::TestCase
 
   test "resetting attribute" do
     @model.name = "Bob"
-    @model.reset_name!
+    @model.restore_name!
     assert_nil @model.name
     assert !@model.name_changed?
   end
@@ -149,4 +161,47 @@ class DirtyTest < ActiveModel::TestCase
     @model.size = 1
     assert @model.size_changed?
   end
+
+  test "reload should reset all changes" do
+    @model.name = 'Dmitry'
+    @model.name_changed?
+    @model.save
+    @model.name = 'Bob'
+
+    assert_equal [nil, 'Dmitry'], @model.previous_changes['name']
+    assert_equal 'Dmitry', @model.changed_attributes['name']
+
+    @model.reload
+
+    assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.previous_changes
+    assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.changed_attributes
+  end
+
+  test "restore_attributes should restore all previous data" do
+    @model.name = 'Dmitry'
+    @model.color = 'Red'
+    @model.save
+    @model.name = 'Bob'
+    @model.color = 'White'
+
+    @model.restore_attributes
+
+    assert_not @model.changed?
+    assert_equal 'Dmitry', @model.name
+    assert_equal 'Red', @model.color
+  end
+
+  test "restore_attributes can restore only some attributes" do
+    @model.name = 'Dmitry'
+    @model.color = 'Red'
+    @model.save
+    @model.name = 'Bob'
+    @model.color = 'White'
+
+    @model.restore_attributes(['name'])
+
+    assert @model.changed?
+    assert_equal 'Dmitry', @model.name
+    assert_equal 'White', @model.color
+  end
 end