diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-23 13:59:49 -0300 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-23 13:59:49 -0300 |
commit | 3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df (patch) | |
tree | 79520ac71677f154f91bbe29d11199ba5ab8de0f /activemodel | |
parent | 79887593c18919fed49f441d64236362cb755872 (diff) | |
parent | d96550b53ecf3816dff3cb0d68dc976028dc9351 (diff) | |
download | rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.gz rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.bz2 rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.zip |
Merge pull request #23789 from wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr
Wisetara/deprecate args active support test case#assert nothing raised for pr
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/test/cases/validations/format_validation_test.rb | 2 | ||||
-rw-r--r-- | activemodel/test/cases/validations/inclusion_validation_test.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb index 86bbbe6ebe..ea4c2ee7df 100644 --- a/activemodel/test/cases/validations/format_validation_test.rb +++ b/activemodel/test/cases/validations/format_validation_test.rb @@ -73,7 +73,7 @@ class PresenceValidationTest < ActiveModel::TestCase end def test_validate_format_of_with_multiline_regexp_and_option - assert_nothing_raised(ArgumentError) do + assert_nothing_raised do Topic.validates_format_of(:title, with: /^Valid Title$/, multiline: true) end end diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb index 55d1fb4dcb..6cb96343fa 100644 --- a/activemodel/test/cases/validations/inclusion_validation_test.rb +++ b/activemodel/test/cases/validations/inclusion_validation_test.rb @@ -58,9 +58,9 @@ class InclusionValidationTest < ActiveModel::TestCase assert_raise(ArgumentError) { Topic.validates_inclusion_of(:title, in: nil) } assert_raise(ArgumentError) { Topic.validates_inclusion_of(:title, in: 0) } - assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of(:title, in: "hi!") } - assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of(:title, in: {}) } - assert_nothing_raised(ArgumentError) { Topic.validates_inclusion_of(:title, in: []) } + assert_nothing_raised { Topic.validates_inclusion_of(:title, in: "hi!") } + assert_nothing_raised { Topic.validates_inclusion_of(:title, in: {}) } + assert_nothing_raised { Topic.validates_inclusion_of(:title, in: []) } end def test_validates_inclusion_of_with_allow_nil |