aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-13 12:05:33 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-13 12:05:33 -0400
commit4a7cd700b43780adf4a0ffc10ec14c14635848fa (patch)
treef16da2107e8feb501ccf3da8bc729dce80871588 /activesupport
parente29eb9feb52f557513881c23e98eeee3ca49ddf6 (diff)
downloadrails-4a7cd700b43780adf4a0ffc10ec14c14635848fa.tar.gz
rails-4a7cd700b43780adf4a0ffc10ec14c14635848fa.tar.bz2
rails-4a7cd700b43780adf4a0ffc10ec14c14635848fa.zip
Remove deprecated arguments in assert_nothing_raised
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md4
-rw-r--r--activesupport/lib/active_support/test_case.rb7
2 files changed, 5 insertions, 6 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 2842b692e2..d9f23c55ba 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated arguments in `assert_nothing_raised`.
+
+ *Rafel Mendonça França*
+
* `Date.to_s` doesn't produce too many spaces. For example, `to_s(:short)`
will now produce `01 Feb` instead of ` 1 Feb`.
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index 1fc12d0bc1..221e1171e7 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -74,12 +74,7 @@ module ActiveSupport
# assert_nothing_raised do
# perform_service(param: 'no_exception')
# end
- def assert_nothing_raised(*args)
- if args.present?
- ActiveSupport::Deprecation.warn(
- "Passing arguments to assert_nothing_raised " \
- "is deprecated and will be removed in Rails 5.1.")
- end
+ def assert_nothing_raised
yield
end
end