remove checks for encodings availability

4 files changed, 10 insertions, 20 deletions

diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 146b77a95c..7fe2c02c04 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -17,11 +17,7 @@ module ActiveRecord
       end
 
       def test_client_encoding
-        if "<3".respond_to?(:encoding)
-          assert_equal Encoding::UTF_8, @conn.client_encoding
-        else
-          assert_equal 'utf8', @conn.client_encoding
-        end
+        assert_equal Encoding::UTF_8, @conn.client_encoding
       end
 
       def test_exec_insert_number
@@ -41,13 +37,11 @@ module ActiveRecord
 
         value = result.rows.last.last
 
-        if "<3".respond_to?(:encoding)
-          # FIXME: this should probably be inside the mysql AR adapter?
-          value.force_encoding(@conn.client_encoding)
+        # FIXME: this should probably be inside the mysql AR adapter?
+        value.force_encoding(@conn.client_encoding)
 
-          # The strings in this file are utf-8, so transcode to utf-8
-          value.encode!(Encoding::UTF_8)
-        end
+        # The strings in this file are utf-8, so transcode to utf-8
+        value.encode!(Encoding::UTF_8)
 
         assert_equal str, value
       end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 328b2adfab..17bde6cb62 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -142,8 +142,6 @@ module ActiveRecord
       end
 
       def test_quote_binary_column_escapes_it
-        return unless "<3".respond_to?(:encode)
-
         DualEncoding.connection.execute(<<-eosql)
           CREATE TABLE dual_encodings (
             id integer PRIMARY KEY AUTOINCREMENT,
@@ -157,9 +155,7 @@ module ActiveRecord
         assert_equal str, binary.data
 
       ensure
-        if "<3".respond_to?(:encode)
-          DualEncoding.connection.drop_table('dual_encodings')
-        end
+        DualEncoding.connection.drop_table('dual_encodings')
       end
 
       def test_execute
diff --git a/activerecord/test/cases/binary_test.rb b/activerecord/test/cases/binary_test.rb
index 06c14cb108..f97aade311 100644
--- a/activerecord/test/cases/binary_test.rb
+++ b/activerecord/test/cases/binary_test.rb
@@ -12,7 +12,7 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
 
     def test_mixed_encoding
       str = "\x80"
-      str.force_encoding('ASCII-8BIT') if str.respond_to?(:force_encoding)
+      str.force_encoding('ASCII-8BIT')
 
       binary = Binary.new :name => 'いただきます！', :data => str
       binary.save!
@@ -23,7 +23,7 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
 
       # Mysql adapter doesn't properly encode things, so we have to do it
       if current_adapter?(:MysqlAdapter)
-        name.force_encoding('UTF-8') if name.respond_to?(:force_encoding)
+        name.force_encoding('UTF-8')
       end
       assert_equal 'いただきます！', name
     end
@@ -33,7 +33,7 @@ unless current_adapter?(:SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
 
       FIXTURES.each do |filename|
         data = File.read(ASSETS_ROOT + "/#{filename}")
-        data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+        data.force_encoding('ASCII-8BIT')
         data.freeze
 
         bin = Binary.new(:data => data)
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 99dd74c561..7295d3c6f1 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -213,7 +213,7 @@ class FixturesTest < ActiveRecord::TestCase
 
   def test_binary_in_fixtures
     data = File.open(ASSETS_ROOT + "/flowers.jpg", 'rb') { |f| f.read }
-    data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
+    data.force_encoding('ASCII-8BIT')
     data.freeze
     assert_equal data, @flowers.data
   end