Skip to content

Commit acabc42

Browse files
committed
RSpec 3 and disable monkey patching
1 parent e95ed0e commit acabc42

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rake-compiler', '~> 0.9.5'
77

88
group :test do
99
gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
10-
gem 'rspec', '~> 2.99'
10+
gem 'rspec', '~> 3.2'
1111
end
1212

1313
group :benchmarks do

spec/em/em_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'eventmachine'
55
require 'mysql2/em'
66

7-
describe Mysql2::EM::Client do
7+
RSpec.describe Mysql2::EM::Client do
88
it "should support async queries" do
99
results = []
1010
EM.run do

spec/mysql2/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: UTF-8
22
require 'spec_helper'
33

4-
describe Mysql2::Client do
4+
RSpec.describe Mysql2::Client do
55
context "using defaults file" do
66
let(:cnf_file) { File.expand_path('../../my.cnf', __FILE__) }
77

spec/mysql2/error_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper'
44

5-
describe Mysql2::Error do
5+
RSpec.describe Mysql2::Error do
66
let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
77

88
let :error do

spec/mysql2/result_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: UTF-8
22
require 'spec_helper'
33

4-
describe Mysql2::Result do
4+
RSpec.describe Mysql2::Result do
55
before(:each) do
66
@result = @client.query "SELECT 1"
77
end

spec/mysql2/statement_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: UTF-8
22
require './spec/spec_helper.rb'
33

4-
describe Mysql2::Statement do
4+
RSpec.describe Mysql2::Statement do
55
before :each do
66
@client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
77
end

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
DatabaseCredentials = YAML.load_file('spec/configuration.yml')
88

99
RSpec.configure do |config|
10+
config.disable_monkey_patching!
11+
1012
def with_internal_encoding(encoding)
1113
old_enc = Encoding.default_internal
1214
Encoding.default_internal = encoding

0 commit comments

Comments
 (0)