mysql2 0.3.21 → 0.4.0

data/spec/mysql2/error_spec.rb

@@ -2,81 +2,82 @@
 
 require 'spec_helper'
 
-describe Mysql2::Error do
+RSpec.describe Mysql2::Error do
   let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
 
-  let :error do
+  let(:error) do
     begin
       client.query("HAHAHA")
     rescue Mysql2::Error => e
       error = e
-    ensure
-      client.close
     end
 
     error
   end
 
   it "responds to error_number and sql_state, with aliases" do
-    error.should respond_to(:error_number)
-    error.should respond_to(:sql_state)
+    expect(error).to respond_to(:error_number)
+    expect(error).to respond_to(:sql_state)
 
     # Mysql gem compatibility
-    error.should respond_to(:errno)
-    error.should respond_to(:error)
+    expect(error).to respond_to(:errno)
+    expect(error).to respond_to(:error)
   end
 
-  if "".respond_to? :encoding
-    let :error do
-      client = Mysql2::Client.new(DatabaseCredentials['root'])
+  context 'encoding' do
+    let(:valid_utf8) { '造字' }
+    let(:error) do
       begin
-        client.query("\xE9\x80\xA0\xE5\xAD\x97")
+        client.query(valid_utf8)
       rescue Mysql2::Error => e
-        error = e
-      ensure
-        client.close
+        e
       end
-
-      error
     end
 
-    let :bad_err do
-      client = Mysql2::Client.new(DatabaseCredentials['root'])
+    let(:invalid_utf8) { "\xE5\xC6\x7D\x1F" }
+    let(:bad_err) do
       begin
-        client.query("\xE5\xC6\x7D\x1F")
+        client.query(invalid_utf8)
       rescue Mysql2::Error => e
-        error = e
-      ensure
-        client.close
+        e
       end
+    end
+
+    before do
+      pending('String#encoding is not defined') unless String.public_method_defined?(:encoding)
+
+      # sanity check
+      expect(valid_utf8.encoding).to eql(Encoding::UTF_8)
+      expect(valid_utf8).to be_valid_encoding
 
-      error
+      expect(invalid_utf8.encoding).to eql(Encoding::UTF_8)
+      expect(invalid_utf8).to_not be_valid_encoding
     end
 
     it "returns error messages as UTF-8 by default" do
       with_internal_encoding nil do
-        error.message.encoding.should eql(Encoding::UTF_8)
-        error.message.valid_encoding?
+        expect(error.message.encoding).to eql(Encoding::UTF_8)
+        expect(error.message).to be_valid_encoding
 
-        bad_err.message.encoding.should eql(Encoding::UTF_8)
-        bad_err.message.valid_encoding?
+        expect(bad_err.message.encoding).to eql(Encoding::UTF_8)
+        expect(bad_err.message).to be_valid_encoding
 
-        bad_err.message.should include("??}\u001F")
+        expect(bad_err.message).to include("??}\u001F")
       end
     end
 
     it "returns sql state as ASCII" do
-      error.sql_state.encoding.should eql(Encoding::US_ASCII)
-      error.sql_state.valid_encoding?
+      expect(error.sql_state.encoding).to eql(Encoding::US_ASCII)
+      expect(error.sql_state).to be_valid_encoding
     end
 
     it "returns error messages and sql state in Encoding.default_internal if set" do
-      with_internal_encoding 'UTF-16LE' do
-        error.message.encoding.should eql(Encoding.default_internal)
-        error.message.valid_encoding?
+      with_internal_encoding Encoding::UTF_16LE do
+        expect(error.message.encoding).to eql(Encoding.default_internal)
+        expect(error.message).to be_valid_encoding
 
-        bad_err.message.encoding.should eql(Encoding.default_internal)
-        bad_err.message.valid_encoding?
+        expect(bad_err.message.encoding).to eql(Encoding.default_internal)
+        expect(bad_err.message).to be_valid_encoding
       end
     end
   end

data/spec/mysql2/result_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe Mysql2::Result do
+RSpec.describe Mysql2::Result do
   before(:each) do
     @result = @client.query "SELECT 1"
   end
@@ -15,33 +15,33 @@ describe Mysql2::Result do
   end
 
   it "should have included Enumerable" do
-    Mysql2::Result.ancestors.include?(Enumerable).should be_true
+    expect(Mysql2::Result.ancestors.include?(Enumerable)).to be true
   end
 
   it "should respond to #each" do
-    @result.should respond_to(:each)
+    expect(@result).to respond_to(:each)
   end
 
   it "should raise a Mysql2::Error exception upon a bad query" do
-    lambda {
+    expect {
       @client.query "bad sql"
-    }.should raise_error(Mysql2::Error)
+    }.to raise_error(Mysql2::Error)
 
-    lambda {
+    expect {
       @client.query "SELECT 1"
-    }.should_not raise_error(Mysql2::Error)
+    }.not_to raise_error
   end
 
   it "should respond to #count, which is aliased as #size" do
     r = @client.query "SELECT 1"
-    r.should respond_to :count
-    r.should respond_to :size
+    expect(r).to respond_to :count
+    expect(r).to respond_to :size
   end
 
   it "should be able to return the number of rows in the result set" do
     r = @client.query "SELECT 1"
-    r.count.should eql(1)
-    r.size.should eql(1)
+    expect(r.count).to eql(1)
+    expect(r.size).to eql(1)
   end
 
   context "metadata queries" do
@@ -53,44 +53,39 @@ describe Mysql2::Result do
   context "#each" do
     it "should yield rows as hash's" do
       @result.each do |row|
-        row.class.should eql(Hash)
+        expect(row.class).to eql(Hash)
       end
     end
 
     it "should yield rows as hash's with symbol keys if :symbolize_keys was set to true" do
       @result.each(:symbolize_keys => true) do |row|
-        row.keys.first.class.should eql(Symbol)
+        expect(row.keys.first.class).to eql(Symbol)
       end
     end
 
     it "should be able to return results as an array" do
       @result.each(:as => :array) do |row|
-        row.class.should eql(Array)
+        expect(row.class).to eql(Array)
       end
     end
 
     it "should cache previously yielded results by default" do
-      @result.first.object_id.should eql(@result.first.object_id)
+      expect(@result.first.object_id).to eql(@result.first.object_id)
     end
 
     it "should not cache previously yielded results if cache_rows is disabled" do
       result = @client.query "SELECT 1", :cache_rows => false
-      result.first.object_id.should_not eql(result.first.object_id)
-    end
-
-    it "should be able to iterate a second time even if cache_rows is disabled" do
-      result = @client.query "SELECT 1 UNION SELECT 2", :cache_rows => false
-      result.to_a.should eql(result.to_a)
+      expect(result.first.object_id).not_to eql(result.first.object_id)
     end
 
     it "should yield different value for #first if streaming" do
       result = @client.query "SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false
-      result.first.should_not eql(result.first)
+      expect(result.first).not_to eql(result.first)
     end
 
     it "should yield the same value for #first if streaming is disabled" do
       result = @client.query "SELECT 1 UNION SELECT 2", :stream => false
-      result.first.should eql(result.first)
+      expect(result.first).to eql(result.first)
     end
 
     it "should throw an exception if we try to iterate twice when streaming is enabled" do
@@ -109,42 +104,43 @@ describe Mysql2::Result do
     end
 
     it "method should exist" do
-      @test_result.should respond_to(:fields)
+      expect(@test_result).to respond_to(:fields)
     end
 
     it "should return an array of field names in proper order" do
       result = @client.query "SELECT 'a', 'b', 'c'"
-      result.fields.should eql(['a', 'b', 'c'])
+      expect(result.fields).to eql(['a', 'b', 'c'])
     end
   end
 
   context "streaming" do
     it "should maintain a count while streaming" do
       result = @client.query('SELECT 1', :stream => true, :cache_rows => false)
-      result.count.should eql(0)
+      expect(result.count).to eql(0)
       result.each.to_a
-      result.count.should eql(1)
+      expect(result.count).to eql(1)
     end
 
     it "should retain the count when mixing first and each" do
       result = @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
-      result.count.should eql(0)
+      expect(result.count).to eql(0)
       result.first
-      result.count.should eql(1)
+      expect(result.count).to eql(1)
       result.each.to_a
-      result.count.should eql(2)
+      expect(result.count).to eql(2)
     end
 
     it "should not yield nil at the end of streaming" do
       result = @client.query('SELECT * FROM mysql2_test', :stream => true, :cache_rows => false)
-      result.each { |r| r.should_not be_nil}
+      result.each { |r| expect(r).not_to be_nil}
     end
 
     it "#count should be zero for rows after streaming when there were no results" do
+      @client.query "USE test"
       result = @client.query("SELECT * FROM mysql2_test WHERE null_test IS NOT NULL", :stream => true, :cache_rows => false)
-      result.count.should eql(0)
+      expect(result.count).to eql(0)
       result.each.to_a
-      result.count.should eql(0)
+      expect(result.count).to eql(0)
     end
 
     it "should raise an exception if streaming ended due to a timeout" do
@@ -161,12 +157,12 @@ describe Mysql2::Result do
       client.query "SET net_write_timeout = 1"
       res = client.query "SELECT * FROM streamingTest", :stream => true, :cache_rows => false
 
-      lambda {
+      expect {
         res.each_with_index do |row, i|
           # Exhaust the first result packet then trigger a timeout
           sleep 2 if i > 0 && i % 1000 == 0
         end
-      }.should raise_error(Mysql2::Error, /Lost connection/)
+      }.to raise_error(Mysql2::Error, /Lost connection/)
     end
   end
 
@@ -177,32 +173,32 @@ describe Mysql2::Result do
 
     it "should return nil values for NULL and strings for everything else when :cast is false" do
       result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast => false).first
-      result["null_test"].should be_nil
-      result["tiny_int_test"].should  eql("1")
-      result["bool_cast_test"].should eql("1")
-      result["int_test"].should       eql("10")
-      result["date_test"].should      eql("2010-04-04")
-      result["enum_test"].should      eql("val1")
+      expect(result["null_test"]).to be_nil
+      expect(result["tiny_int_test"]).to  eql("1")
+      expect(result["bool_cast_test"]).to eql("1")
+      expect(result["int_test"]).to       eql("10")
+      expect(result["date_test"]).to      eql("2010-04-04")
+      expect(result["enum_test"]).to      eql("val1")
     end
 
     it "should return nil for a NULL value" do
-      @test_result['null_test'].class.should eql(NilClass)
-      @test_result['null_test'].should eql(nil)
+      expect(@test_result['null_test'].class).to eql(NilClass)
+      expect(@test_result['null_test']).to eql(nil)
     end
 
     it "should return String for a BIT(64) value" do
-      @test_result['bit_test'].class.should eql(String)
-      @test_result['bit_test'].should eql("\000\000\000\000\000\000\000\005")
+      expect(@test_result['bit_test'].class).to eql(String)
+      expect(@test_result['bit_test']).to eql("\000\000\000\000\000\000\000\005")
     end
 
     it "should return String for a BIT(1) value" do
-      @test_result['single_bit_test'].class.should eql(String)
-      @test_result['single_bit_test'].should eql("\001")
+      expect(@test_result['single_bit_test'].class).to eql(String)
+      expect(@test_result['single_bit_test']).to eql("\001")
     end
 
     it "should return Fixnum for a TINYINT value" do
-      [Fixnum, Bignum].should include(@test_result['tiny_int_test'].class)
-      @test_result['tiny_int_test'].should eql(1)
+      expect([Fixnum, Bignum]).to include(@test_result['tiny_int_test'].class)
+      expect(@test_result['tiny_int_test']).to eql(1)
     end
 
     it "should return TrueClass or FalseClass for a TINYINT value if :cast_booleans is enabled" do
@@ -216,9 +212,9 @@ describe Mysql2::Result do
       result1 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast_booleans => true
       result2 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = 0 LIMIT 1', :cast_booleans => true
       result3 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = -1 LIMIT 1', :cast_booleans => true
-      result1.first['bool_cast_test'].should be_true
-      result2.first['bool_cast_test'].should be_false
-      result3.first['bool_cast_test'].should be_true
+      expect(result1.first['bool_cast_test']).to be true
+      expect(result2.first['bool_cast_test']).to be false
+      expect(result3.first['bool_cast_test']).to be true
 
       @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
     end
@@ -231,55 +227,55 @@ describe Mysql2::Result do
 
       result1 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id1}", :cast_booleans => true
       result2 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id2}", :cast_booleans => true
-      result1.first['single_bit_test'].should be_true
-      result2.first['single_bit_test'].should be_false
+      expect(result1.first['single_bit_test']).to be true
+      expect(result2.first['single_bit_test']).to be false
 
       @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2})"
     end
 
     it "should return Fixnum for a SMALLINT value" do
-      [Fixnum, Bignum].should include(@test_result['small_int_test'].class)
-      @test_result['small_int_test'].should eql(10)
+      expect([Fixnum, Bignum]).to include(@test_result['small_int_test'].class)
+      expect(@test_result['small_int_test']).to eql(10)
     end
 
     it "should return Fixnum for a MEDIUMINT value" do
-      [Fixnum, Bignum].should include(@test_result['medium_int_test'].class)
-      @test_result['medium_int_test'].should eql(10)
+      expect([Fixnum, Bignum]).to include(@test_result['medium_int_test'].class)
+      expect(@test_result['medium_int_test']).to eql(10)
     end
 
     it "should return Fixnum for an INT value" do
-      [Fixnum, Bignum].should include(@test_result['int_test'].class)
-      @test_result['int_test'].should eql(10)
+      expect([Fixnum, Bignum]).to include(@test_result['int_test'].class)
+      expect(@test_result['int_test']).to eql(10)
     end
 
     it "should return Fixnum for a BIGINT value" do
-      [Fixnum, Bignum].should include(@test_result['big_int_test'].class)
-      @test_result['big_int_test'].should eql(10)
+      expect([Fixnum, Bignum]).to include(@test_result['big_int_test'].class)
+      expect(@test_result['big_int_test']).to eql(10)
     end
 
     it "should return Fixnum for a YEAR value" do
-      [Fixnum, Bignum].should include(@test_result['year_test'].class)
-      @test_result['year_test'].should eql(2009)
+      expect([Fixnum, Bignum]).to include(@test_result['year_test'].class)
+      expect(@test_result['year_test']).to eql(2009)
     end
 
     it "should return BigDecimal for a DECIMAL value" do
-      @test_result['decimal_test'].class.should eql(BigDecimal)
-      @test_result['decimal_test'].should eql(10.3)
+      expect(@test_result['decimal_test'].class).to eql(BigDecimal)
+      expect(@test_result['decimal_test']).to eql(10.3)
     end
 
     it "should return Float for a FLOAT value" do
-      @test_result['float_test'].class.should eql(Float)
-      @test_result['float_test'].should eql(10.3)
+      expect(@test_result['float_test'].class).to eql(Float)
+      expect(@test_result['float_test']).to eql(10.3)
     end
 
     it "should return Float for a DOUBLE value" do
-      @test_result['double_test'].class.should eql(Float)
-      @test_result['double_test'].should eql(10.3)
+      expect(@test_result['double_test'].class).to eql(Float)
+      expect(@test_result['double_test']).to eql(10.3)
     end
 
     it "should return Time for a DATETIME value when within the supported range" do
-      @test_result['date_time_test'].class.should eql(Time)
-      @test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S").should eql('2010-04-04 11:44:00')
+      expect(@test_result['date_time_test'].class).to eql(Time)
+      expect(@test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     if 1.size == 4 # 32bit
@@ -292,158 +288,153 @@ describe Mysql2::Result do
       it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
                                       # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-        r.first['test'].class.should eql(klass)
+        expect(r.first['test'].class).to eql(klass)
       end
 
       it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
                                       # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-        r.first['test'].class.should eql(klass)
+        expect(r.first['test'].class).to eql(klass)
       end
     elsif 1.size == 8 # 64bit
       unless RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is < 1901-12-13 20:45:52" do
           r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
-          r.first['test'].class.should eql(Time)
+          expect(r.first['test'].class).to eql(Time)
         end
 
         it "should return Time when timestamp is > 2038-01-19T03:14:07" do
           r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          r.first['test'].class.should eql(Time)
+          expect(r.first['test'].class).to eql(Time)
         end
       else
         it "should return Time when timestamp is > 0138-12-31 11:59:59" do
           r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
-          r.first['test'].class.should eql(Time)
+          expect(r.first['test'].class).to eql(Time)
         end
 
         it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
           r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
-          r.first['test'].class.should eql(DateTime)
+          expect(r.first['test'].class).to eql(DateTime)
         end
 
         it "should return Time when timestamp is > 2038-01-19T03:14:07" do
           r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-          r.first['test'].class.should eql(Time)
+          expect(r.first['test'].class).to eql(Time)
         end
       end
     end
 
     it "should return Time for a TIMESTAMP value when within the supported range" do
-      @test_result['timestamp_test'].class.should eql(Time)
-      @test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S").should eql('2010-04-04 11:44:00')
+      expect(@test_result['timestamp_test'].class).to eql(Time)
+      expect(@test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     it "should return Time for a TIME value" do
-      @test_result['time_test'].class.should eql(Time)
-      @test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S").should eql('2000-01-01 11:44:00')
+      expect(@test_result['time_test'].class).to eql(Time)
+      expect(@test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2000-01-01 11:44:00')
     end
 
     it "should return Date for a DATE value" do
-      @test_result['date_test'].class.should eql(Date)
-      @test_result['date_test'].strftime("%Y-%m-%d").should eql('2010-04-04')
+      expect(@test_result['date_test'].class).to eql(Date)
+      expect(@test_result['date_test'].strftime("%Y-%m-%d")).to eql('2010-04-04')
     end
 
     it "should return String for an ENUM value" do
-      @test_result['enum_test'].class.should eql(String)
-      @test_result['enum_test'].should eql('val1')
+      expect(@test_result['enum_test'].class).to eql(String)
+      expect(@test_result['enum_test']).to eql('val1')
     end
 
     it "should raise an error given an invalid DATETIME" do
-      begin
-        @client.query("SELECT CAST('1972-00-27 00:00:00' AS DATETIME) as bad_datetime").each
-      rescue Mysql2::Error => e
-        error = e
-      end
-
-      error.message.should eql("Invalid date in field 'bad_datetime': 1972-00-27 00:00:00")
+      expect { @client.query("SELECT CAST('1972-00-27 00:00:00' AS DATETIME) as bad_datetime").each }.to \
+        raise_error(Mysql2::Error, "Invalid date in field 'bad_datetime': 1972-00-27 00:00:00")
     end
 
-    if defined? Encoding
-      context "string encoding for ENUM values" do
-        it "should default to the connection's encoding if Encoding.default_internal is nil" do
-          with_internal_encoding nil do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['enum_test'].encoding.should eql(Encoding.find('utf-8'))
+    context "string encoding for ENUM values" do
+      before { pending('Encoding is undefined') unless defined?(Encoding) }
 
-            client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
-            result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['enum_test'].encoding.should eql(Encoding.find('us-ascii'))
-            client2.close
-          end
+      it "should default to the connection's encoding if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
+
+          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['enum_test'].encoding).to eql(Encoding::ASCII)
+          client2.close
         end
+      end
 
-        it "should use Encoding.default_internal" do
-          with_internal_encoding 'utf-8' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['enum_test'].encoding.should eql(Encoding.default_internal)
-          end
+      it "should use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
+        end
 
-          with_internal_encoding 'us-ascii' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['enum_test'].encoding.should eql(Encoding.default_internal)
-          end
+        with_internal_encoding Encoding::ASCII do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
         end
       end
     end
 
     it "should return String for a SET value" do
-      @test_result['set_test'].class.should eql(String)
-      @test_result['set_test'].should eql('val1,val2')
+      expect(@test_result['set_test'].class).to eql(String)
+      expect(@test_result['set_test']).to eql('val1,val2')
     end
 
-    if defined? Encoding
-      context "string encoding for SET values" do
-        it "should default to the connection's encoding if Encoding.default_internal is nil" do
-          with_internal_encoding nil do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['set_test'].encoding.should eql(Encoding.find('utf-8'))
+    context "string encoding for SET values" do
+      before { pending('Encoding is undefined') unless defined?(Encoding) }
 
-            client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
-            result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['set_test'].encoding.should eql(Encoding.find('us-ascii'))
-            client2.close
-          end
+      it "should default to the connection's encoding if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
+
+          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['set_test'].encoding).to eql(Encoding::ASCII)
+          client2.close
         end
+      end
 
-        it "should use Encoding.default_internal" do
-          with_internal_encoding 'utf-8' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['set_test'].encoding.should eql(Encoding.default_internal)
-          end
+      it "should use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['set_test'].encoding).to eql(Encoding.default_internal)
+        end
 
-          with_internal_encoding 'us-ascii' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['set_test'].encoding.should eql(Encoding.default_internal)
-          end
+        with_internal_encoding Encoding::ASCII do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['set_test'].encoding).to eql(Encoding.default_internal)
         end
       end
     end
 
     it "should return String for a BINARY value" do
-      @test_result['binary_test'].class.should eql(String)
-      @test_result['binary_test'].should eql("test#{"\000"*6}")
+      expect(@test_result['binary_test'].class).to eql(String)
+      expect(@test_result['binary_test']).to eql("test#{"\000"*6}")
     end
 
-    if defined? Encoding
-      context "string encoding for BINARY values" do
-        it "should default to binary if Encoding.default_internal is nil" do
-          with_internal_encoding nil do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['binary_test'].encoding.should eql(Encoding.find('binary'))
-          end
+    context "string encoding for BINARY values" do
+      before { pending('Encoding is undefined') unless defined?(Encoding) }
+
+      it "should default to binary if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
         end
+      end
 
-        it "should not use Encoding.default_internal" do
-          with_internal_encoding 'utf-8' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['binary_test'].encoding.should eql(Encoding.find('binary'))
-          end
+      it "should not use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
+        end
 
-          with_internal_encoding 'us-ascii' do
-            result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-            result['binary_test'].encoding.should eql(Encoding.find('binary'))
-          end
+        with_internal_encoding Encoding::ASCII do
+          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
         end
       end
     end
@@ -462,54 +453,54 @@ describe Mysql2::Result do
       'long_text_test' => 'LONGTEXT'
     }.each do |field, type|
       it "should return a String for #{type}" do
-        @test_result[field].class.should eql(String)
-        @test_result[field].should eql("test")
+        expect(@test_result[field].class).to eql(String)
+        expect(@test_result[field]).to eql("test")
       end
 
-      if defined? Encoding
-        context "string encoding for #{type} values" do
-          if ['VARBINARY', 'TINYBLOB', 'BLOB', 'MEDIUMBLOB', 'LONGBLOB'].include?(type)
-            it "should default to binary if Encoding.default_internal is nil" do
-              with_internal_encoding nil do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result['binary_test'].encoding.should eql(Encoding.find('binary'))
-              end
+      context "string encoding for #{type} values" do
+        before { pending('Encoding is undefined') unless defined?(Encoding) }
+
+        if ['VARBINARY', 'TINYBLOB', 'BLOB', 'MEDIUMBLOB', 'LONGBLOB'].include?(type)
+          it "should default to binary if Encoding.default_internal is nil" do
+            with_internal_encoding nil do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
             end
+          end
 
-            it "should not use Encoding.default_internal" do
-              with_internal_encoding 'utf-8' do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result['binary_test'].encoding.should eql(Encoding.find('binary'))
-              end
+          it "should not use Encoding.default_internal" do
+            with_internal_encoding Encoding::UTF_8 do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
+            end
 
-              with_internal_encoding 'us-ascii' do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result['binary_test'].encoding.should eql(Encoding.find('binary'))
-              end
+            with_internal_encoding Encoding::ASCII do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
             end
-          else
-            it "should default to utf-8 if Encoding.default_internal is nil" do
-              with_internal_encoding nil do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result[field].encoding.should eql(Encoding.find('utf-8'))
-
-                client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
-                result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result[field].encoding.should eql(Encoding.find('us-ascii'))
-                client2.close
-              end
+          end
+        else
+          it "should default to utf-8 if Encoding.default_internal is nil" do
+            with_internal_encoding nil do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result[field].encoding).to eql(Encoding::UTF_8)
+
+              client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+              result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result[field].encoding).to eql(Encoding::ASCII)
+              client2.close
             end
+          end
 
-            it "should use Encoding.default_internal" do
-              with_internal_encoding 'utf-8' do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result[field].encoding.should eql(Encoding.default_internal)
-              end
+          it "should use Encoding.default_internal" do
+            with_internal_encoding Encoding::UTF_8 do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result[field].encoding).to eql(Encoding.default_internal)
+            end
 
-              with_internal_encoding 'us-ascii' do
-                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-                result[field].encoding.should eql(Encoding.default_internal)
-              end
+            with_internal_encoding Encoding::ASCII do
+              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+              expect(result[field].encoding).to eql(Encoding.default_internal)
             end
           end
         end