remove checks for encodings availability

1 files changed, 19 insertions, 21 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 5488070d8c..aa6fb14e7b 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -398,22 +398,9 @@ end
 # The error is caused by charcter encodings that can't be compared with ASCII-8BIT regular expressions and by special
 # characters like the umlaut in UTF-8.
 module EncodedKeyCacheBehavior
-  if defined?(Encoding)
-    Encoding.list.each do |encoding|
-      define_method "test_#{encoding.name.underscore}_encoded_values" do
-        key = "foo".force_encoding(encoding)
-        assert @cache.write(key, "1", :raw => true)
-        assert_equal "1", @cache.read(key)
-        assert_equal "1", @cache.fetch(key)
-        assert @cache.delete(key)
-        assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
-        assert_equal 3, @cache.increment(key)
-        assert_equal 2, @cache.decrement(key)
-      end
-    end
-
-    def test_common_utf8_values
-      key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
+  Encoding.list.each do |encoding|
+    define_method "test_#{encoding.name.underscore}_encoded_values" do
+      key = "foo".force_encoding(encoding)
       assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
@@ -422,12 +409,23 @@ module EncodedKeyCacheBehavior
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
     end
+  end
 
-    def test_retains_encoding
-      key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert @cache.write(key, "1", :raw => true)
-      assert_equal Encoding::UTF_8, key.encoding
-    end
+  def test_common_utf8_values
+    key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
+    assert @cache.write(key, "1", :raw => true)
+    assert_equal "1", @cache.read(key)
+    assert_equal "1", @cache.fetch(key)
+    assert @cache.delete(key)
+    assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
+    assert_equal 3, @cache.increment(key)
+    assert_equal 2, @cache.decrement(key)
+  end
+
+  def test_retains_encoding
+    key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
+    assert @cache.write(key, "1", :raw => true)
+    assert_equal Encoding::UTF_8, key.encoding
   end
 end