test/uri/unescape_test.rb in escape_utils-1.2.1 vs test/uri/unescape_test.rb in escape_utils-1.2.2

@@ -39,28 +39,26 @@
       char = index.chr
       assert_equal char, EscapeUtils.unescape_uri(EscapeUtils.escape_uri(char))
     end
   end
 
-  if RUBY_VERSION =~ /^1.9/
-    def test_input_must_be_valid_utf8_or_ascii
-      escaped = EscapeUtils.escape_uri("fo<o>bar")
+  def test_input_must_be_valid_utf8_or_ascii
+    escaped = EscapeUtils.escape_uri("fo<o>bar")
 
-      escaped.force_encoding 'ISO-8859-1'
-      assert_raises Encoding::CompatibilityError do
-        EscapeUtils.unescape_uri(escaped)
-      end
-
-      escaped.force_encoding 'UTF-8'
-      begin
-        EscapeUtils.unescape_uri(escaped)
-      rescue Encoding::CompatibilityError => e
-        assert_nil e, "#{e.class.name} raised, expected not to"
-      end
+    escaped.force_encoding 'ISO-8859-1'
+    assert_raises Encoding::CompatibilityError do
+      EscapeUtils.unescape_uri(escaped)
     end
 
-    def test_return_value_is_tagged_as_utf8
-      escaped = EscapeUtils.escape_uri("a space")
-      assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri(escaped).encoding
+    escaped.force_encoding 'UTF-8'
+    begin
+      EscapeUtils.unescape_uri(escaped)
+    rescue Encoding::CompatibilityError => e
+      assert_nil e, "#{e.class.name} raised, expected not to"
     end
+  end
+
+  def test_return_value_is_tagged_as_utf8
+    escaped = EscapeUtils.escape_uri("a space")
+    assert_equal Encoding.find('UTF-8'), EscapeUtils.unescape_uri(escaped).encoding
   end
 end