"Use assert_nil if expecting nil. This will fail in minitest 6."

4 files changed, 16 insertions, 16 deletions

diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index 3bdab42f7a..07a6452cc1 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -630,7 +630,7 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   end
 
   def test_should_return_nothing_if_asset_host_isnt_configured
-    assert_equal nil, compute_asset_host("foo")
+    assert_nil compute_asset_host("foo")
   end
 
   def test_should_current_request_host_is_always_returned_for_request
diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb
index 54bf9b4c33..7f37523eeb 100644
--- a/actionview/test/template/capture_helper_test.rb
+++ b/actionview/test/template/capture_helper_test.rb
@@ -127,18 +127,18 @@ class CaptureHelperTest < ActionView::TestCase
 
   def test_content_for_returns_nil_when_writing
     assert ! content_for?(:title)
-    assert_equal nil, content_for(:title, "foo")
-    assert_equal nil, content_for(:title) { output_buffer << "bar"; nil }
-    assert_equal nil, content_for(:title) { output_buffer << "  \n  "; nil }
+    assert_nil content_for(:title, "foo")
+    assert_nil content_for(:title) { output_buffer << "bar"; nil }
+    assert_nil content_for(:title) { output_buffer << "  \n  "; nil }
     assert_equal "foobar", content_for(:title)
-    assert_equal nil, content_for(:title, "foo", flush: true)
-    assert_equal nil, content_for(:title, flush: true) { output_buffer << "bar"; nil }
-    assert_equal nil, content_for(:title, flush: true) { output_buffer << "  \n  "; nil }
+    assert_nil content_for(:title, "foo", flush: true)
+    assert_nil content_for(:title, flush: true) { output_buffer << "bar"; nil }
+    assert_nil content_for(:title, flush: true) { output_buffer << "  \n  "; nil }
     assert_equal "bar", content_for(:title)
   end
 
   def test_content_for_returns_nil_when_content_missing
-    assert_equal nil, content_for(:some_missing_key)
+    assert_nil content_for(:some_missing_key)
   end
 
   def test_content_for_question_mark
diff --git a/actionview/test/template/number_helper_test.rb b/actionview/test/template/number_helper_test.rb
index 2a2ada2b36..678120a9c9 100644
--- a/actionview/test/template/number_helper_test.rb
+++ b/actionview/test/template/number_helper_test.rb
@@ -4,7 +4,7 @@ class NumberHelperTest < ActionView::TestCase
   tests ActionView::Helpers::NumberHelper
 
   def test_number_to_phone
-    assert_equal nil, number_to_phone(nil)
+    assert_nil number_to_phone(nil)
     assert_equal "555-1234", number_to_phone(5551234)
     assert_equal "(800) 555-1212 x 123", number_to_phone(8005551212, area_code: true, extension: 123)
     assert_equal "+18005551212", number_to_phone(8005551212, country_code: 1, delimiter: "")
@@ -13,7 +13,7 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_to_currency
-    assert_equal nil, number_to_currency(nil)
+    assert_nil number_to_currency(nil)
     assert_equal "$1,234,567,890.50", number_to_currency(1234567890.50)
     assert_equal "$1,234,567,892", number_to_currency(1234567891.50, precision: 0)
     assert_equal "1,234,567,890.50 - K&#269;", number_to_currency("-1234567890.50", unit: raw("K&#269;"), format: "%n %u", negative_format: "%n - %u")
@@ -25,7 +25,7 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_to_percentage
-    assert_equal nil, number_to_percentage(nil)
+    assert_nil number_to_percentage(nil)
     assert_equal "100.000%", number_to_percentage(100)
     assert_equal "100.000 %", number_to_percentage(100, format: "%n %")
     assert_equal "&lt;b&gt;100.000&lt;/b&gt; %", number_to_percentage(100, format: "<b>%n</b> %")
@@ -43,13 +43,13 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_with_delimiter
-    assert_equal nil, number_with_delimiter(nil)
+    assert_nil number_with_delimiter(nil)
     assert_equal "12,345,678", number_with_delimiter(12345678)
     assert_equal "0", number_with_delimiter(0)
   end
 
   def test_number_with_precision
-    assert_equal nil, number_with_precision(nil)
+    assert_nil number_with_precision(nil)
     assert_equal "-111.235", number_with_precision(-111.2346)
     assert_equal "111.00", number_with_precision(111, precision: 2)
     assert_equal "0.00100", number_with_precision(0.001, precision: 5)
@@ -57,13 +57,13 @@ class NumberHelperTest < ActionView::TestCase
   end
 
   def test_number_to_human_size
-    assert_equal nil, number_to_human_size(nil)
+    assert_nil number_to_human_size(nil)
     assert_equal "3 Bytes", number_to_human_size(3.14159265)
     assert_equal "1.2 MB", number_to_human_size(1234567, precision: 2)
   end
 
   def test_number_to_human
-    assert_equal nil,   number_to_human(nil)
+    assert_nil number_to_human(nil)
     assert_equal "0",   number_to_human(0)
     assert_equal "1.23 Thousand", number_to_human(1234)
     assert_equal "489.0 Thousand", number_to_human(489000, precision: 4, strip_insignificant_zeros: false)
diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb
index 41225000f0..3deddd5706 100644
--- a/actionview/test/template/test_case_test.rb
+++ b/actionview/test/template/test_case_test.rb
@@ -50,7 +50,7 @@ module ActionView
     end
 
     test "retrieve non existing config values" do
-      assert_equal nil, ActionView::Base.new.config.something_odd
+      assert_nil ActionView::Base.new.config.something_odd
     end
 
     test "works without testing a helper module" do