From 0d50cae996c51630361e8514e1f168b0c48957e1 Mon Sep 17 00:00:00 2001
From: Daniel Colson <danieljamescolson@gmail.com>
Date: Wed, 24 Jan 2018 21:14:10 -0500
Subject: Use respond_to test helpers

---
 actionmailer/test/base_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionmailer')

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index ac90809518..4124aa00bd 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -506,8 +506,8 @@ class BaseTest < ActiveSupport::TestCase
   test "should respond to action methods" do
     assert_respond_to BaseMailer, :welcome
     assert_respond_to BaseMailer, :implicit_multipart
-    assert !BaseMailer.respond_to?(:mail)
-    assert !BaseMailer.respond_to?(:headers)
+    assert_not_respond_to BaseMailer, :mail
+    assert_not_respond_to BaseMailer, :headers
   end
 
   test "calling just the action should return the generated mail object" do
-- 
cgit v1.2.3


From 94333a4c31bd10c1f358c538a167e6a4589bae2d Mon Sep 17 00:00:00 2001
From: Daniel Colson <danieljamescolson@gmail.com>
Date: Thu, 25 Jan 2018 18:14:09 -0500
Subject: Use assert_predicate and assert_not_predicate

---
 actionmailer/test/caching_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionmailer')

diff --git a/actionmailer/test/caching_test.rb b/actionmailer/test/caching_test.rb
index ae4e7bf57e..3258544ffd 100644
--- a/actionmailer/test/caching_test.rb
+++ b/actionmailer/test/caching_test.rb
@@ -105,7 +105,7 @@ class FragmentCachingTest < BaseCachingTest
 
     html_safe = @mailer.read_fragment("name")
     assert_equal content, html_safe
-    assert html_safe.html_safe?
+    assert_predicate html_safe, :html_safe?
   end
 end
 
@@ -262,7 +262,7 @@ class ViewCacheDependencyTest < BaseCachingTest
   end
 
   def test_view_cache_dependencies_are_empty_by_default
-    assert NoDependenciesMailer.new.view_cache_dependencies.empty?
+    assert_predicate NoDependenciesMailer.new.view_cache_dependencies, :empty?
   end
 
   def test_view_cache_dependencies_are_listed_in_declaration_order
-- 
cgit v1.2.3


From 82c39e1a0b5114e2d89a80883a41090567a83196 Mon Sep 17 00:00:00 2001
From: Daniel Colson <danieljamescolson@gmail.com>
Date: Thu, 25 Jan 2018 18:16:57 -0500
Subject: Use assert_empty and assert_not_empty

---
 actionmailer/test/caching_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionmailer')

diff --git a/actionmailer/test/caching_test.rb b/actionmailer/test/caching_test.rb
index 3258544ffd..574840c30e 100644
--- a/actionmailer/test/caching_test.rb
+++ b/actionmailer/test/caching_test.rb
@@ -262,7 +262,7 @@ class ViewCacheDependencyTest < BaseCachingTest
   end
 
   def test_view_cache_dependencies_are_empty_by_default
-    assert_predicate NoDependenciesMailer.new.view_cache_dependencies, :empty?
+    assert_empty NoDependenciesMailer.new.view_cache_dependencies
   end
 
   def test_view_cache_dependencies_are_listed_in_declaration_order
-- 
cgit v1.2.3