Use assert_predicate and assert_not_predicate

1 files changed, 80 insertions, 80 deletions

diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb
index 5cb4aa3287..14c4e3cbd4 100644
--- a/activerecord/test/cases/dirty_test.rb
+++ b/activerecord/test/cases/dirty_test.rb
@@ -24,18 +24,18 @@ class DirtyTest < ActiveRecord::TestCase
 
     # Change catchphrase.
     pirate.catchphrase = "arrr"
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
     assert_nil pirate.catchphrase_was
     assert_equal [nil, "arrr"], pirate.catchphrase_change
 
     # Saved - no changes.
     pirate.save!
-    assert !pirate.catchphrase_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
     assert_nil pirate.catchphrase_change
 
     # Same value - no changes.
     pirate.catchphrase = "arrr"
-    assert !pirate.catchphrase_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
     assert_nil pirate.catchphrase_change
   end
 
@@ -46,23 +46,23 @@ class DirtyTest < ActiveRecord::TestCase
 
       # New record - no changes.
       pirate = target.new
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Saved - no changes.
       pirate.catchphrase = "arrrr, time zone!!"
       pirate.save!
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Change created_on.
       old_created_on = pirate.created_on
       pirate.created_on = Time.now - 1.day
-      assert pirate.created_on_changed?
+      assert_predicate pirate, :created_on_changed?
       assert_kind_of ActiveSupport::TimeWithZone, pirate.created_on_was
       assert_equal old_created_on, pirate.created_on_was
       pirate.created_on = old_created_on
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
     end
   end
 
@@ -73,7 +73,7 @@ class DirtyTest < ActiveRecord::TestCase
 
       pirate = target.create!
       pirate.created_on = pirate.created_on
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
     end
   end
 
@@ -86,19 +86,19 @@ class DirtyTest < ActiveRecord::TestCase
 
       # New record - no changes.
       pirate = target.new
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Saved - no changes.
       pirate.catchphrase = "arrrr, time zone!!"
       pirate.save!
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Change created_on.
       old_created_on = pirate.created_on
       pirate.created_on = Time.now + 1.day
-      assert pirate.created_on_changed?
+      assert_predicate pirate, :created_on_changed?
       # kind_of does not work because
       # ActiveSupport::TimeWithZone.name == 'Time'
       assert_instance_of Time, pirate.created_on_was
@@ -113,19 +113,19 @@ class DirtyTest < ActiveRecord::TestCase
 
       # New record - no changes.
       pirate = target.new
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Saved - no changes.
       pirate.catchphrase = "arrrr, time zone!!"
       pirate.save!
-      assert !pirate.created_on_changed?
+      assert_not_predicate pirate, :created_on_changed?
       assert_nil pirate.created_on_change
 
       # Change created_on.
       old_created_on = pirate.created_on
       pirate.created_on = Time.now + 1.day
-      assert pirate.created_on_changed?
+      assert_predicate pirate, :created_on_changed?
       # kind_of does not work because
       # ActiveSupport::TimeWithZone.name == 'Time'
       assert_instance_of Time, pirate.created_on_was
@@ -137,11 +137,11 @@ class DirtyTest < ActiveRecord::TestCase
     # the actual attribute here is name, title is an
     # alias setup via alias_attribute
     parrot = Parrot.new
-    assert !parrot.title_changed?
+    assert_not_predicate parrot, :title_changed?
     assert_nil parrot.title_change
 
     parrot.name = "Sam"
-    assert parrot.title_changed?
+    assert_predicate parrot, :title_changed?
     assert_nil parrot.title_was
     assert_equal parrot.name_change, parrot.title_change
   end
@@ -153,7 +153,7 @@ class DirtyTest < ActiveRecord::TestCase
     pirate.restore_catchphrase!
     assert_equal "Yar!", pirate.catchphrase
     assert_equal Hash.new, pirate.changes
-    assert !pirate.catchphrase_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
   end
 
   def test_nullable_number_not_marked_as_changed_if_new_value_is_blank
@@ -161,7 +161,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     ["", nil].each do |value|
       pirate.parrot_id = value
-      assert !pirate.parrot_id_changed?
+      assert_not_predicate pirate, :parrot_id_changed?
       assert_nil pirate.parrot_id_change
     end
   end
@@ -171,7 +171,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     ["", nil].each do |value|
       numeric_data.bank_balance = value
-      assert !numeric_data.bank_balance_changed?
+      assert_not_predicate numeric_data, :bank_balance_changed?
       assert_nil numeric_data.bank_balance_change
     end
   end
@@ -181,7 +181,7 @@ class DirtyTest < ActiveRecord::TestCase
 
     ["", nil].each do |value|
       numeric_data.temperature = value
-      assert !numeric_data.temperature_changed?
+      assert_not_predicate numeric_data, :temperature_changed?
       assert_nil numeric_data.temperature_change
     end
   end
@@ -197,7 +197,7 @@ class DirtyTest < ActiveRecord::TestCase
       ["", nil].each do |value|
         topic.written_on = value
         assert_nil topic.written_on
-        assert !topic.written_on_changed?
+        assert_not_predicate topic, :written_on_changed?
       end
     end
   end
@@ -208,10 +208,10 @@ class DirtyTest < ActiveRecord::TestCase
     pirate.catchphrase = "arrr"
     assert pirate.save!
 
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
 
     pirate.parrot_id = "0"
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   def test_integer_zero_to_integer_zero_not_marked_as_changed
@@ -220,17 +220,17 @@ class DirtyTest < ActiveRecord::TestCase
     pirate.catchphrase = "arrr"
     assert pirate.save!
 
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
 
     pirate.parrot_id = 0
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   def test_float_zero_to_string_zero_not_marked_as_changed
     data = NumericData.new temperature: 0.0
     data.save!
 
-    assert_not data.changed?
+    assert_not_predicate data, :changed?
 
     data.temperature = "0"
     assert_empty data.changes
@@ -251,38 +251,38 @@ class DirtyTest < ActiveRecord::TestCase
     # check the change from 1 to ''
     pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
     pirate.parrot_id = ""
-    assert pirate.parrot_id_changed?
+    assert_predicate pirate, :parrot_id_changed?
     assert_equal([1, nil], pirate.parrot_id_change)
     pirate.save
 
     # check the change from nil to 0
     pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
     pirate.parrot_id = 0
-    assert pirate.parrot_id_changed?
+    assert_predicate pirate, :parrot_id_changed?
     assert_equal([nil, 0], pirate.parrot_id_change)
     pirate.save
 
     # check the change from 0 to ''
     pirate = Pirate.find_by_catchphrase("Yarrrr, me hearties")
     pirate.parrot_id = ""
-    assert pirate.parrot_id_changed?
+    assert_predicate pirate, :parrot_id_changed?
     assert_equal([0, nil], pirate.parrot_id_change)
   end
 
   def test_object_should_be_changed_if_any_attribute_is_changed
     pirate = Pirate.new
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
     assert_equal [], pirate.changed
     assert_equal Hash.new, pirate.changes
 
     pirate.catchphrase = "arrr"
-    assert pirate.changed?
+    assert_predicate pirate, :changed?
     assert_nil pirate.catchphrase_was
     assert_equal %w(catchphrase), pirate.changed
     assert_equal({ "catchphrase" => [nil, "arrr"] }, pirate.changes)
 
     pirate.save
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
     assert_equal [], pirate.changed
     assert_equal Hash.new, pirate.changes
   end
@@ -290,40 +290,40 @@ class DirtyTest < ActiveRecord::TestCase
   def test_attribute_will_change!
     pirate = Pirate.create!(catchphrase: "arr")
 
-    assert !pirate.catchphrase_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
     assert pirate.catchphrase_will_change!
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
     assert_equal ["arr", "arr"], pirate.catchphrase_change
 
     pirate.catchphrase << " matey!"
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
     assert_equal ["arr", "arr matey!"], pirate.catchphrase_change
   end
 
   def test_virtual_attribute_will_change
     parrot = Parrot.create!(name: "Ruby")
     parrot.send(:attribute_will_change!, :cancel_save_from_callback)
-    assert parrot.has_changes_to_save?
+    assert_predicate parrot, :has_changes_to_save?
   end
 
   def test_association_assignment_changes_foreign_key
     pirate = Pirate.create!(catchphrase: "jarl")
     pirate.parrot = Parrot.create!(name: "Lorre")
-    assert pirate.changed?
+    assert_predicate pirate, :changed?
     assert_equal %w(parrot_id), pirate.changed
   end
 
   def test_attribute_should_be_compared_with_type_cast
     topic = Topic.new
-    assert topic.approved?
-    assert !topic.approved_changed?
+    assert_predicate topic, :approved?
+    assert_not_predicate topic, :approved_changed?
 
     # Coming from web form.
     params = { topic: { approved: 1 } }
     # In the controller.
     topic.attributes = params[:topic]
-    assert topic.approved?
-    assert !topic.approved_changed?
+    assert_predicate topic, :approved?
+    assert_not_predicate topic, :approved_changed?
   end
 
   def test_partial_update
@@ -378,9 +378,9 @@ class DirtyTest < ActiveRecord::TestCase
   def test_reload_should_clear_changed_attributes
     pirate = Pirate.create!(catchphrase: "shiver me timbers")
     pirate.catchphrase = "*hic*"
-    assert pirate.changed?
+    assert_predicate pirate, :changed?
     pirate.reload
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   def test_dup_objects_should_not_copy_dirty_flag_from_creator
@@ -388,17 +388,17 @@ class DirtyTest < ActiveRecord::TestCase
     pirate_dup = pirate.dup
     pirate_dup.restore_catchphrase!
     pirate.catchphrase = "I love Rum"
-    assert pirate.catchphrase_changed?
-    assert !pirate_dup.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
+    assert_not_predicate pirate_dup, :catchphrase_changed?
   end
 
   def test_reverted_changes_are_not_dirty
     phrase = "shiver me timbers"
     pirate = Pirate.create!(catchphrase: phrase)
     pirate.catchphrase = "*hic*"
-    assert pirate.changed?
+    assert_predicate pirate, :changed?
     pirate.catchphrase = phrase
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   def test_reverted_changes_are_not_dirty_after_multiple_changes
@@ -406,40 +406,40 @@ class DirtyTest < ActiveRecord::TestCase
     pirate = Pirate.create!(catchphrase: phrase)
     10.times do |i|
       pirate.catchphrase = "*hic*" * i
-      assert pirate.changed?
+      assert_predicate pirate, :changed?
     end
-    assert pirate.changed?
+    assert_predicate pirate, :changed?
     pirate.catchphrase = phrase
-    assert !pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   def test_reverted_changes_are_not_dirty_going_from_nil_to_value_and_back
     pirate = Pirate.create!(catchphrase: "Yar!")
 
     pirate.parrot_id = 1
-    assert pirate.changed?
-    assert pirate.parrot_id_changed?
-    assert !pirate.catchphrase_changed?
+    assert_predicate pirate, :changed?
+    assert_predicate pirate, :parrot_id_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
 
     pirate.parrot_id = nil
-    assert !pirate.changed?
-    assert !pirate.parrot_id_changed?
-    assert !pirate.catchphrase_changed?
+    assert_not_predicate pirate, :changed?
+    assert_not_predicate pirate, :parrot_id_changed?
+    assert_not_predicate pirate, :catchphrase_changed?
   end
 
   def test_save_should_store_serialized_attributes_even_with_partial_writes
     with_partial_writes(Topic) do
       topic = Topic.create!(content: { a: "a" })
 
-      assert_not topic.changed?
+      assert_not_predicate topic, :changed?
 
       topic.content[:b] = "b"
 
-      assert topic.changed?
+      assert_predicate topic, :changed?
 
       topic.save!
 
-      assert_not topic.changed?
+      assert_not_predicate topic, :changed?
       assert_equal "b", topic.content[:b]
 
       topic.reload
@@ -596,7 +596,7 @@ class DirtyTest < ActiveRecord::TestCase
     pirate = Pirate.create!(catchphrase: "rrrr", created_on: time_in_paris)
 
     pirate.created_on = pirate.created_on.in_time_zone("Tokyo").to_s
-    assert !pirate.created_on_changed?
+    assert_not_predicate pirate, :created_on_changed?
   end
 
   test "partial insert" do
@@ -627,7 +627,7 @@ class DirtyTest < ActiveRecord::TestCase
     pirate = Pirate.create!(catchphrase: "arrrr")
     pirate.catchphrase << " matey!"
 
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
     expected_changes = {
       "catchphrase" => ["arrrr", "arrrr matey!"]
     }
@@ -641,7 +641,7 @@ class DirtyTest < ActiveRecord::TestCase
     pirate.reload
 
     assert_equal "arrrr matey!", pirate.catchphrase
-    assert_not pirate.changed?
+    assert_not_predicate pirate, :changed?
   end
 
   test "in place mutation for binary" do
@@ -652,19 +652,19 @@ class DirtyTest < ActiveRecord::TestCase
 
     binary = klass.create!(data: "\\\\foo")
 
-    assert_not binary.changed?
+    assert_not_predicate binary, :changed?
 
     binary.data = binary.data.dup
 
-    assert_not binary.changed?
+    assert_not_predicate binary, :changed?
 
     binary = klass.last
 
-    assert_not binary.changed?
+    assert_not_predicate binary, :changed?
 
     binary.data << "bar"
 
-    assert binary.changed?
+    assert_predicate binary, :changed?
   end
 
   test "changes is correct for subclass" do
@@ -679,7 +679,7 @@ class DirtyTest < ActiveRecord::TestCase
     new_catchphrase = "arrrr matey!"
 
     pirate.catchphrase = new_catchphrase
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
 
     expected_changes = {
       "catchphrase" => ["arrrr", new_catchphrase]
@@ -698,7 +698,7 @@ class DirtyTest < ActiveRecord::TestCase
     new_catchphrase = "arrrr matey!"
 
     pirate.catchphrase = new_catchphrase
-    assert pirate.catchphrase_changed?
+    assert_predicate pirate, :catchphrase_changed?
 
     expected_changes = {
       "catchphrase" => ["arrrr", new_catchphrase]
@@ -720,7 +720,7 @@ class DirtyTest < ActiveRecord::TestCase
     end
 
     model = klass.new(first_name: "Jim")
-    assert model.first_name_changed?
+    assert_predicate model, :first_name_changed?
   end
 
   test "attribute_will_change! doesn't try to save non-persistable attributes" do
@@ -732,7 +732,7 @@ class DirtyTest < ActiveRecord::TestCase
     record = klass.new(first_name: "Sean")
     record.non_persisted_attribute_will_change!
 
-    assert record.non_persisted_attribute_changed?
+    assert_predicate record, :non_persisted_attribute_changed?
     assert record.save
   end
 
@@ -762,13 +762,13 @@ class DirtyTest < ActiveRecord::TestCase
 
   test "attributes assigned but not selected are dirty" do
     person = Person.select(:id).first
-    assert_not person.changed?
+    assert_not_predicate person, :changed?
 
     person.first_name = "Sean"
-    assert person.changed?
+    assert_predicate person, :changed?
 
     person.first_name = nil
-    assert person.changed?
+    assert_predicate person, :changed?
   end
 
   test "attributes not selected are still missing after save" do
@@ -781,8 +781,8 @@ class DirtyTest < ActiveRecord::TestCase
   test "saved_change_to_attribute? returns whether a change occurred in the last save" do
     person = Person.create!(first_name: "Sean")
 
-    assert person.saved_change_to_first_name?
-    assert_not person.saved_change_to_gender?
+    assert_predicate person, :saved_change_to_first_name?
+    assert_not_predicate person, :saved_change_to_gender?
     assert person.saved_change_to_first_name?(from: nil, to: "Sean")
     assert person.saved_change_to_first_name?(from: nil)
     assert person.saved_change_to_first_name?(to: "Sean")
@@ -823,11 +823,11 @@ class DirtyTest < ActiveRecord::TestCase
   test "saved_changes? returns whether the last call to save changed anything" do
     person = Person.create!(first_name: "Sean")
 
-    assert person.saved_changes?
+    assert_predicate person, :saved_changes?
 
     person.save
 
-    assert_not person.saved_changes?
+    assert_not_predicate person, :saved_changes?
   end
 
   test "saved_changes returns a hash of all the changes that occurred" do
@@ -857,7 +857,7 @@ class DirtyTest < ActiveRecord::TestCase
     end
 
     person = klass.create!(first_name: "Sean")
-    assert_not person.changed?
+    assert_not_predicate person, :changed?
   end
 
   private
@@ -870,8 +870,8 @@ class DirtyTest < ActiveRecord::TestCase
     end
 
     def check_pirate_after_save_failure(pirate)
-      assert pirate.changed?
-      assert pirate.parrot_id_changed?
+      assert_predicate pirate, :changed?
+      assert_predicate pirate, :parrot_id_changed?
       assert_equal %w(parrot_id), pirate.changed
       assert_nil pirate.parrot_id_was
     end