aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 09:46:49 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 09:46:49 -0500
commit32f3f8f1e24174f01bbca2db5b5d3ad4d1848cea (patch)
tree965f4a0a6fffa2dfb31f65ec8031c7ab39e44111 /activesupport/test/core_ext
parentd68e1ba2f7a698eb143418d9423db2f31c2ea660 (diff)
parent996658e65551f575571a98f8b6a10bd2da07a90f (diff)
downloadrails-32f3f8f1e24174f01bbca2db5b5d3ad4d1848cea.tar.gz
rails-32f3f8f1e24174f01bbca2db5b5d3ad4d1848cea.tar.bz2
rails-32f3f8f1e24174f01bbca2db5b5d3ad4d1848cea.zip
Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test_case
Active support instead of ActiveSupport::Deprecation.silence we can use assert_deprecated
Diffstat (limited to 'activesupport/test/core_ext')
-rw-r--r--activesupport/test/core_ext/class/delegating_attributes_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb
index 86193c2b07..447b1d10ad 100644
--- a/activesupport/test/core_ext/class/delegating_attributes_test.rb
+++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb
@@ -33,7 +33,7 @@ class DelegatingAttributesTest < ActiveSupport::TestCase
end
def test_simple_accessor_declaration
- ActiveSupport::Deprecation.silence do
+ assert_deprecated do
single_class.superclass_delegating_accessor :both
end
@@ -48,7 +48,7 @@ class DelegatingAttributesTest < ActiveSupport::TestCase
def test_simple_accessor_declaration_with_instance_reader_false
_instance_methods = single_class.public_instance_methods
- ActiveSupport::Deprecation.silence do
+ assert_deprecated do
single_class.superclass_delegating_accessor :no_instance_reader, :instance_reader => false
end
@@ -60,7 +60,7 @@ class DelegatingAttributesTest < ActiveSupport::TestCase
end
def test_working_with_simple_attributes
- ActiveSupport::Deprecation.silence do
+ assert_deprecated do
single_class.superclass_delegating_accessor :both
end
@@ -79,7 +79,7 @@ class DelegatingAttributesTest < ActiveSupport::TestCase
def test_child_class_delegates_to_parent_but_can_be_overridden
parent = Class.new
- ActiveSupport::Deprecation.silence do
+ assert_deprecated do
parent.superclass_delegating_accessor :both
end