From 8937c722172595cfad007c686ed5c4a1b79397cc Mon Sep 17 00:00:00 2001
From: Chris Salzberg <chris@dejimata.com>
Date: Mon, 21 Oct 2019 10:41:07 +0900
Subject: [PATCH] Test clear_changes_information rather than reload

reload is an ActiveRecord method, not an ActiveModel one.
clear_changes_information is a public method so it should be tested
directly, not through a method defined for on the DirtyModel test class.
---
 activemodel/test/cases/attributes_dirty_test.rb | 8 ++------
 activemodel/test/cases/dirty_test.rb            | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/activemodel/test/cases/attributes_dirty_test.rb b/activemodel/test/cases/attributes_dirty_test.rb
index f9693a23cd..2d01a5e9a2 100644
--- a/activemodel/test/cases/attributes_dirty_test.rb
+++ b/activemodel/test/cases/attributes_dirty_test.rb
@@ -14,10 +14,6 @@ class AttributesDirtyTest < ActiveModel::TestCase
     def save
       changes_applied
     end
-
-    def reload
-      clear_changes_information
-    end
   end
 
   setup do
@@ -146,7 +142,7 @@ class AttributesDirtyTest < ActiveModel::TestCase
     assert_predicate @model, :size_changed?
   end
 
-  test "reload should reset all changes" do
+  test "clear_changes_information should reset all changes" do
     @model.name = "Dmitry"
     @model.name_changed?
     @model.save
@@ -155,7 +151,7 @@ class AttributesDirtyTest < ActiveModel::TestCase
     assert_equal [nil, "Dmitry"], @model.previous_changes["name"]
     assert_equal "Dmitry", @model.changed_attributes["name"]
 
-    @model.reload
+    @model.clear_changes_information
 
     assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.previous_changes
     assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.changed_attributes
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 0edbbffa86..96b3e0549d 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -39,10 +39,6 @@ class DirtyTest < ActiveModel::TestCase
     def save
       changes_applied
     end
-
-    def reload
-      clear_changes_information
-    end
   end
 
   setup do
@@ -184,7 +180,7 @@ class DirtyTest < ActiveModel::TestCase
     assert_predicate @model, :size_changed?
   end
 
-  test "reload should reset all changes" do
+  test "clear_changes_information should reset all changes" do
     @model.name = "Dmitry"
     @model.name_changed?
     @model.save
@@ -193,7 +189,7 @@ class DirtyTest < ActiveModel::TestCase
     assert_equal [nil, "Dmitry"], @model.previous_changes["name"]
     assert_equal "Dmitry", @model.changed_attributes["name"]
 
-    @model.reload
+    @model.clear_changes_information
 
     assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.previous_changes
     assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.changed_attributes