some more spec cleanup

Author: brianmario

spec/mysql2/client_spec.rb

@@ -109,20 +109,16 @@ def connect *args
 
   context "#warning_count" do
     context "when no warnings" do
-      before(:each) do
-        @client.query('select 1')
-      end
       it "should 0" do
+        @client.query('select 1')
         @client.warning_count.should == 0
       end
     end
     context "when has a warnings" do
-      before(:each) do
+      it "should > 0" do
         # "the statement produces extra information that can be viewed by issuing a SHOW WARNINGS"
         # http://dev.mysql.com/doc/refman/5.0/en/explain-extended.html
         @client.query("explain extended select 1")
-      end
-      it "should > 0" do
         @client.warning_count.should > 0
       end
     end
@@ -134,32 +130,25 @@ def connect *args
 
   context "#query_info" do
     context "when no info present" do
-      before(:each) do
-        @client.query('select 1')
-      end
       it "should 0" do
+        @client.query('select 1')
         @client.query_info.should be_empty
         @client.query_info_string.should be_nil
       end
     end
     context "when has some info" do
-      before(:each) do
+      it "should retrieve it" do
         @client.query "USE test"
         @client.query "CREATE TABLE IF NOT EXISTS infoTest (`id` int(11) NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
-      end
-
-      after(:each) do
-        @client.query "DROP TABLE infoTest"
-      end
 
-      before(:each) do
         # http://dev.mysql.com/doc/refman/5.0/en/mysql-info.html says
         # # Note that mysql_info() returns a non-NULL value for INSERT ... VALUES only for the multiple-row form of the statement (that is, only if multiple value lists are specified).
         @client.query("INSERT INTO infoTest (blah) VALUES (1234),(4535)")
-      end
-      it "should retrieve it" do
+
         @client.query_info.should  eql({:records => 2, :duplicates => 0, :warnings => 0})
         @client.query_info_string.should eq('Records: 2  Duplicates: 0  Warnings: 0')
+
+        @client.query "DROP TABLE infoTest"
       end
     end
   end
@@ -184,7 +173,7 @@ def connect *args
 
   context "#query" do
     it "should let you query again if iterating is finished when streaming" do
-      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each {}
+      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each.to_a
 
       expect {
         @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)

spec/mysql2/result_spec.rb

@@ -10,7 +10,7 @@
     result = @client.query('SELECT 1')
 
     result.count.should eql(1)
-    result.each { |r| }
+    result.each.to_a
     result.count.should eql(1)
   end
 
@@ -31,7 +31,7 @@
       @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)
-      result.each {|r|  }
+      result.each.to_a
       result.count.should eql(0)
   end
 
@@ -113,8 +113,8 @@
       result = @client.query "SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false
 
       expect {
-        result.each {}
-        result.each {}
+        result.each.to_a
+        result.each.to_a
       }.to raise_exception(Mysql2::Error)
     end
   end