aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-09-23 14:49:14 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:04:16 +0200
commit68e08fe8c955d5b4a6839d4587e2f32b77f4fe44 (patch)
treee13d6c50a3bb3e5ddfa12473c189cec0554a188f /actionview/test
parent9ef95a7019fc531ff74a91f0ca0871e6639990b7 (diff)
downloadrails-68e08fe8c955d5b4a6839d4587e2f32b77f4fe44.tar.gz
rails-68e08fe8c955d5b4a6839d4587e2f32b77f4fe44.tar.bz2
rails-68e08fe8c955d5b4a6839d4587e2f32b77f4fe44.zip
Silenced deprecation warnings in the tests. Documentation uses present tense. Changed deprecation message to not use you. Also returning from rescue block in catch_invalid_selector to abort reraising the exception.
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/assert_select_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionview/test/template/assert_select_test.rb b/actionview/test/template/assert_select_test.rb
index af1ddb5c12..e53b9635e5 100644
--- a/actionview/test/template/assert_select_test.rb
+++ b/actionview/test/template/assert_select_test.rb
@@ -269,12 +269,16 @@ class AssertSelectTest < ActionController::TestCase
# testing invalid selectors
def test_assert_select_with_invalid_selector
render_html '<a href="http://example.com">hello</a>'
- assert_nil assert_select("[href=http://example.com]")
+ ActiveSupport::Deprecation.silence do
+ assert_nil assert_select("[href=http://example.com]")
+ end
end
def test_css_select_with_invalid_selector
render_html '<a href="http://example.com">hello</a>'
- assert_nil css_select("[href=http://example.com]")
+ ActiveSupport::Deprecation.silence do
+ assert_nil css_select("[href=http://example.com]")
+ end
end
def test_feed_item_encoded