Skip to content

Commit b439a89

Browse files
authored
Rename the before/after hooks's symbol on RSpec 2 to the one on RSpec 3. (#1177)
Rename :all to :context . Rename :each to :example . There is no used around hook. https://relishapp.com/rspec/rspec-core/v/2-99/docs/hooks/before-and-after-hooks https://relishapp.com/rspec/rspec-core/v/3-10/docs/hooks/before-and-after-hooks
1 parent 706a43b commit b439a89

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

spec/mysql2/client_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def run_gc
407407
end
408408

409409
context ":local_infile" do
410-
before(:all) do
410+
before(:context) do
411411
new_client(local_infile: true) do |client|
412412
local = client.query "SHOW VARIABLES LIKE 'local_infile'"
413413
local_enabled = local.any? { |x| x['Value'] == 'ON' }
@@ -423,7 +423,7 @@ def run_gc
423423
end
424424
end
425425

426-
after(:all) do
426+
after(:context) do
427427
new_client do |client|
428428
client.query "DROP TABLE IF EXISTS infileTest"
429429
end
@@ -730,7 +730,7 @@ def run_gc
730730
end
731731

732732
context "Multiple results sets" do
733-
before(:each) do
733+
before(:example) do
734734
@multi_client = new_client(flags: Mysql2::Client::MULTI_STATEMENTS)
735735
end
736736

@@ -974,12 +974,12 @@ def run_gc
974974
end
975975

976976
context 'write operations api' do
977-
before(:each) do
977+
before(:example) do
978978
@client.query "USE test"
979979
@client.query "CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
980980
end
981981

982-
after(:each) do
982+
after(:example) do
983983
@client.query "DROP TABLE lastIdTest"
984984
end
985985

@@ -1027,7 +1027,7 @@ def run_gc
10271027
end
10281028

10291029
context "session_track" do
1030-
before(:each) do
1030+
before(:example) do
10311031
unless Mysql2::Client.const_defined?(:SESSION_TRACK)
10321032
skip('Server versions must be MySQL 5.7 later.')
10331033
end
@@ -1070,15 +1070,15 @@ def run_gc
10701070
end
10711071

10721072
context "select_db" do
1073-
before(:each) do
1073+
before(:example) do
10741074
2.times do |i|
10751075
@client.query("CREATE DATABASE test_selectdb_#{i}")
10761076
@client.query("USE test_selectdb_#{i}")
10771077
@client.query("CREATE TABLE test#{i} (`id` int NOT NULL PRIMARY KEY)")
10781078
end
10791079
end
10801080

1081-
after(:each) do
1081+
after(:example) do
10821082
2.times do |i|
10831083
@client.query("DROP DATABASE test_selectdb_#{i}")
10841084
end

spec/mysql2/result_spec.rb

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

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

spec/mysql2/statement_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require './spec/spec_helper.rb'
22

33
RSpec.describe Mysql2::Statement do
4-
before :each do
4+
before(:example) do
55
@client = new_client(encoding: "utf8")
66
end
77

@@ -211,15 +211,15 @@ def stmt_count
211211
end
212212

213213
context "utf8_db" do
214-
before(:each) do
214+
before(:example) do
215215
@client.query("DROP DATABASE IF EXISTS test_mysql2_stmt_utf8")
216216
@client.query("CREATE DATABASE test_mysql2_stmt_utf8")
217217
@client.query("USE test_mysql2_stmt_utf8")
218218
@client.query("CREATE TABLE テーブル (整数 int, 文字列 varchar(32)) charset=utf8")
219219
@client.query("INSERT INTO テーブル (整数, 文字列) VALUES (1, 'イチ'), (2, '弐'), (3, 'さん')")
220220
end
221221

222-
after(:each) do
222+
after(:example) do
223223
@client.query("DROP DATABASE test_mysql2_stmt_utf8")
224224
end
225225

@@ -627,12 +627,12 @@ def stmt_count
627627
end
628628

629629
context 'last_id' do
630-
before(:each) do
630+
before(:example) do
631631
@client.query 'USE test'
632632
@client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
633633
end
634634

635-
after(:each) do
635+
after(:example) do
636636
@client.query 'DROP TABLE lastIdTest'
637637
end
638638

@@ -655,12 +655,12 @@ def stmt_count
655655
end
656656

657657
context 'affected_rows' do
658-
before :each do
658+
before(:example) do
659659
@client.query 'USE test'
660660
@client.query 'CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))'
661661
end
662662

663-
after :each do
663+
after(:example) do
664664
@client.query 'DROP TABLE lastIdTest'
665665
end
666666

spec/spec_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def clock_time
7474
end
7575
end
7676

77-
config.before(:all) do
77+
config.before(:context) do
7878
new_client do |client|
7979
client.query %[
8080
CREATE TABLE IF NOT EXISTS mysql2_test (
@@ -136,11 +136,11 @@ def clock_time
136136
end
137137
end
138138

139-
config.before(:each) do
139+
config.before(:example) do
140140
@client = new_client
141141
end
142142

143-
config.after(:each) do
143+
config.after(:example) do
144144
@clients.each(&:close)
145145
end
146146
end

0 commit comments

Comments
 (0)