Skip to content

Commit 16dcb71

Browse files
committed
went a little overzealous in my cleanup heh
1 parent 0917ff5 commit 16dcb71

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

spec/mysql2/error_spec.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
describe Mysql2::Error do
55
before(:each) do
66
begin
7-
client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
8-
client.query("HAHAHA")
7+
@err_client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
8+
@err_client.query("HAHAHA")
99
rescue Mysql2::Error => e
1010
@error = e
1111
ensure
12-
client.close
12+
@err_client.close
1313
end
1414

1515
begin
16-
client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
17-
client.query("HAHAHA")
16+
@err_client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
17+
@err_client2.query("HAHAHA")
1818
rescue Mysql2::Error => e
1919
@error2 = e
2020
ensure
21-
client.close
21+
@err_client2.close
2222
end
2323
end
2424

@@ -42,8 +42,8 @@
4242
unless RUBY_VERSION =~ /1.8/
4343
it "#message encoding should match the connection's encoding, or Encoding.default_internal if set" do
4444
if Encoding.default_internal.nil?
45-
@error.message.encoding.should eql(@client.encoding)
46-
@error2.message.encoding.should eql(@client2.encoding)
45+
@error.message.encoding.should eql(@err_client.encoding)
46+
@error2.message.encoding.should eql(@err_client2.encoding)
4747
else
4848
@error.message.encoding.should eql(Encoding.default_internal)
4949
@error2.message.encoding.should eql(Encoding.default_internal)
@@ -52,8 +52,8 @@
5252

5353
it "#error encoding should match the connection's encoding, or Encoding.default_internal if set" do
5454
if Encoding.default_internal.nil?
55-
@error.error.encoding.should eql(@client.encoding)
56-
@error2.error.encoding.should eql(@client2.encoding)
55+
@error.error.encoding.should eql(@err_client.encoding)
56+
@error2.error.encoding.should eql(@err_client2.encoding)
5757
else
5858
@error.error.encoding.should eql(Encoding.default_internal)
5959
@error2.error.encoding.should eql(Encoding.default_internal)
@@ -62,8 +62,8 @@
6262

6363
it "#sql_state encoding should match the connection's encoding, or Encoding.default_internal if set" do
6464
if Encoding.default_internal.nil?
65-
@error.sql_state.encoding.should eql(@client.encoding)
66-
@error2.sql_state.encoding.should eql(@client2.encoding)
65+
@error.sql_state.encoding.should eql(@err_client.encoding)
66+
@error2.sql_state.encoding.should eql(@err_client2.encoding)
6767
else
6868
@error.sql_state.encoding.should eql(Encoding.default_internal)
6969
@error2.sql_state.encoding.should eql(Encoding.default_internal)

0 commit comments

Comments
 (0)