aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/static_test.rb
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-04-14 08:54:13 -0400
committereileencodes <eileencodes@gmail.com>2015-04-14 08:54:13 -0400
commitdb8897c2de254f542a108144951bcc6a142236f7 (patch)
treea7900c50defb003b72a98afbe589a1b74a4c9af8 /actionpack/test/dispatch/static_test.rb
parent4fb3a55528d9e73c3dc49a838703408a8a33485b (diff)
downloadrails-db8897c2de254f542a108144951bcc6a142236f7.tar.gz
rails-db8897c2de254f542a108144951bcc6a142236f7.tar.bz2
rails-db8897c2de254f542a108144951bcc6a142236f7.zip
Use `silence_warnings` on `StaticTests`
When 7e504927 was merged setting `Encoding.default_internal` and `Encoding.default_external` would throw a warning when the ActionPack tests were run. Example warning: `actionpack/test/dispatch/static_test.rb:12: warning: setting Encoding.default_external` This patch silences the warnings as other similar tests do for setting default_internal and default_external.
Diffstat (limited to 'actionpack/test/dispatch/static_test.rb')
-rw-r--r--actionpack/test/dispatch/static_test.rb18
1 files changed, 12 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index f153030675..93e5c85a97 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -3,13 +3,17 @@ require 'zlib'
module StaticTests
def setup
- @default_internal_encoding = Encoding.default_internal
- @default_external_encoding = Encoding.default_external
+ silence_warnings do
+ @default_internal_encoding = Encoding.default_internal
+ @default_external_encoding = Encoding.default_external
+ end
end
def teardown
- Encoding.default_internal = @default_internal_encoding
- Encoding.default_external = @default_external_encoding
+ silence_warnings do
+ Encoding.default_internal = @default_internal_encoding
+ Encoding.default_external = @default_external_encoding
+ end
end
def test_serves_dynamic_content
@@ -25,8 +29,10 @@ module StaticTests
end
def test_handles_urls_with_ascii_8bit_on_win_31j
- Encoding.default_internal = "Windows-31J"
- Encoding.default_external = "Windows-31J"
+ silence_warnings do
+ Encoding.default_internal = "Windows-31J"
+ Encoding.default_external = "Windows-31J"
+ end
assert_equal "Hello, World!", get("/doorkeeper%E3E4".force_encoding('ASCII-8BIT')).body
end