diff options
| author | utilum <oz@utilum.com> | 2017-06-20 06:49:49 +0200 |
|---|---|---|
| committer | utilum <oz@utilum.com> | 2017-06-20 10:33:17 +0200 |
| commit | 6631bc569f3f5cd5bef764a167ba1c9587d80fb7 (patch) | |
| tree | 17d170ba56523d241d1fbb4e30223b160d6d9609 | |
| parent | 09cb26bc1e653999827cf3eb955d42a2c932b3f5 (diff) | |
| download | rails-6631bc569f3f5cd5bef764a167ba1c9587d80fb7.tar.gz rails-6631bc569f3f5cd5bef764a167ba1c9587d80fb7.tar.bz2 rails-6631bc569f3f5cd5bef764a167ba1c9587d80fb7.zip | |
prepare for Minitest 6
| -rw-r--r-- | actionpack/test/controller/parameters/mutators_test.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/parameters/mutators_test.rb b/actionpack/test/controller/parameters/mutators_test.rb index 2c36f488c6..3fe7340782 100644 --- a/actionpack/test/controller/parameters/mutators_test.rb +++ b/actionpack/test/controller/parameters/mutators_test.rb @@ -35,7 +35,7 @@ class ParametersMutatorsTest < ActiveSupport::TestCase end test "delete returns nil when the key is not present" do - assert_equal nil, @params[:person].delete(:first_name) + assert_nil @params[:person].delete(:first_name) end test "delete returns the value of the given block when the key is not present" do diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 3108f24f21..cd1b505c34 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -315,7 +315,7 @@ class DurationTest < ActiveSupport::TestCase assert_equal(1, scalar <=> 5) assert_equal(0, scalar <=> 10) assert_equal(-1, scalar <=> 15) - assert_equal(nil, scalar <=> "foo") + assert_nil(scalar <=> "foo") end def test_scalar_plus |