summaryrefslogtreecommitdiff
blob: cdd72f2db3fbb8cb1bdc324e8757b003550b1f12 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
Index: fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
===================================================================
--- fast_xs-0.8.0.orig/test/test_erb_util_module_overrides.rb
+++ fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
@@ -35,11 +35,13 @@ class TestErbUtilModuleOverrides < Test:
 
   def test_preserve_encoding
     foo = "foo"
-    foo.force_encoding Encoding::US_ASCII
-    assert_equal Encoding::US_ASCII, url_encode(foo).encoding
-    assert_equal Encoding::US_ASCII, html_escape(foo).encoding
-    assert_equal Encoding::US_ASCII, u(foo).encoding
-    assert_equal Encoding::US_ASCII, h(foo).encoding
+    ascii_encoding = (RUBY_VERSION =~ /1\.9/) ? Encoding::ASCII_8BIT : Encoding::US_ASCII
+
+    foo.force_encoding ascii_encoding
+    assert_equal ascii_encoding, url_encode(foo).encoding
+    assert_equal ascii_encoding, html_escape(foo).encoding
+    assert_equal ascii_encoding, u(foo).encoding
+    assert_equal ascii_encoding, h(foo).encoding
 
     foo.force_encoding Encoding::BINARY
     assert_equal Encoding::BINARY, url_encode(foo).encoding