Skip to content

Commit d57a0a5

Browse files
yahondayahonda
authored
Merge pull request rsim#287 from yahonda/check-rspec4-compatibility
Validate RSpec 4 compatibility via disable_monkey_patching!
2 parents 1a22735 + 53e0165 commit d57a0a5

12 files changed

Lines changed: 30 additions & 29 deletions

‎spec/plsql/connection_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 "Connection" do
5+
RSpec.describe "Connection" do
66

77
before(:all) do
88
@raw_conn = get_connection

‎spec/plsql/package_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "spec_helper"
22

3-
describe "Package" do
3+
RSpec.describe "Package" do
44
before(:all) do
55
plsql.connection = get_connection
66
plsql.execute <<-SQL
@@ -113,7 +113,7 @@
113113

114114
end
115115

116-
describe "Synonym to package" do
116+
RSpec.describe "Synonym to package" do
117117

118118
before(:all) do
119119
plsql.connection = get_connection
@@ -151,7 +151,7 @@
151151

152152
end
153153

154-
describe "Public synonym to package" do
154+
RSpec.describe "Public synonym to package" do
155155

156156
before(:all) do
157157
plsql.connection = get_connection

‎spec/plsql/procedure_spec.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require "spec_helper"
44

5-
describe "Parameter type mapping /" do
5+
RSpec.describe "Parameter type mapping /" do
66

77
shared_examples "Function with string parameters" do |datatype|
88
before(:all) do
@@ -1997,7 +1997,7 @@ def new_candidate(status)
19971997

19981998
end
19991999

2000-
describe "Synonyms /" do
2000+
RSpec.describe "Synonyms /" do
20012001
before(:all) do
20022002
plsql.connect! CONNECTION_PARAMS
20032003
end
@@ -2177,7 +2177,7 @@ def new_candidate(status)
21772177

21782178
end
21792179

2180-
describe "SYS.STANDARD procedures /" do
2180+
RSpec.describe "SYS.STANDARD procedures /" do
21812181

21822182
before(:all) do
21832183
plsql.connect! CONNECTION_PARAMS
@@ -2210,7 +2210,7 @@ def new_candidate(status)
22102210

22112211
end
22122212

2213-
describe "PLS_INTEGER/SIMPLE_INTEGER should be nullable" do
2213+
RSpec.describe "PLS_INTEGER/SIMPLE_INTEGER should be nullable" do
22142214

22152215
before(:all) do
22162216
plsql.connect! CONNECTION_PARAMS
@@ -2309,7 +2309,7 @@ def new_candidate(status)
23092309

23102310
end
23112311

2312-
describe "#get_argument_metadata" do
2312+
RSpec.describe "#get_argument_metadata" do
23132313
before(:all) do
23142314
plsql.connect! CONNECTION_PARAMS
23152315
end
@@ -2363,7 +2363,7 @@ def new_candidate(status)
23632363
end
23642364
end
23652365

2366-
describe "case-insensitive params" do
2366+
RSpec.describe "case-insensitive params" do
23672367
before(:all) do
23682368
plsql.connect! CONNECTION_PARAMS
23692369
plsql.execute <<-SQL
@@ -2387,7 +2387,7 @@ def new_candidate(status)
23872387
end
23882388
end
23892389

2390-
describe "Procedure with %ROWTYPE parameter on table that has hidden columns" do
2390+
RSpec.describe "Procedure with %ROWTYPE parameter on table that has hidden columns" do
23912391
before(:all) do
23922392
plsql.connect! CONNECTION_PARAMS
23932393
plsql.execute "DROP PACKAGE test_hidden_cols_pkg" rescue nil
@@ -2428,7 +2428,7 @@ def new_candidate(status)
24282428
end
24292429
end
24302430

2431-
describe "Function with TIMESTAMP columns in %ROWTYPE" do
2431+
RSpec.describe "Function with TIMESTAMP columns in %ROWTYPE" do
24322432
before(:all) do
24332433
plsql.connect! CONNECTION_PARAMS
24342434
plsql.execute "DROP FUNCTION test_timestamp_fn" rescue nil
@@ -2466,7 +2466,7 @@ def new_candidate(status)
24662466
end
24672467
end
24682468

2469-
describe "Function with TABLE OF %ROWTYPE parameter defined in package" do
2469+
RSpec.describe "Function with TABLE OF %ROWTYPE parameter defined in package" do
24702470
before(:all) do
24712471
plsql.connect! CONNECTION_PARAMS
24722472
plsql.execute "DROP PACKAGE test_rowtype_pkg" rescue nil
@@ -2500,7 +2500,7 @@ def new_candidate(status)
25002500
end
25012501
end
25022502

2503-
describe "Function with TABLE OF RECORD parameter defined in package (workaround for %ROWTYPE)" do
2503+
RSpec.describe "Function with TABLE OF RECORD parameter defined in package (workaround for %ROWTYPE)" do
25042504
before(:all) do
25052505
plsql.connect! CONNECTION_PARAMS
25062506
plsql.execute "DROP PACKAGE test_record_pkg" rescue nil
@@ -2532,7 +2532,7 @@ def new_candidate(status)
25322532
end
25332533
end
25342534

2535-
describe "Function with cross-schema type reference" do
2535+
RSpec.describe "Function with cross-schema type reference" do
25362536
before(:all) do
25372537
primary_user, _ = DATABASE_USERS_AND_PASSWORDS[0]
25382538
second_user, second_password = DATABASE_USERS_AND_PASSWORDS[1]

‎spec/plsql/schema_spec.rb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
require "spec_helper"
22

3-
describe "Schema" do
3+
RSpec.describe "Schema" do
44

55
it "should create Schema object" do
66
expect(plsql.class).to eq(PLSQL::Schema)
77
end
88

99
end
1010

11-
describe "Schema connection" do
11+
RSpec.describe "Schema connection" do
1212

1313
before(:each) do
1414
@conn = get_connection
@@ -57,7 +57,7 @@
5757

5858
end
5959

60-
describe "Connection with connect!" do
60+
RSpec.describe "Connection with connect!" do
6161

6262
before(:all) do
6363
@username, @password = DATABASE_USERS_AND_PASSWORDS[0]
@@ -114,7 +114,7 @@
114114

115115
end
116116

117-
describe "Named Schema" do
117+
RSpec.describe "Named Schema" do
118118
before(:all) do
119119
plsql.connection = @conn = get_connection
120120
end
@@ -141,7 +141,7 @@
141141

142142
end
143143

144-
describe "Schema commit and rollback" do
144+
RSpec.describe "Schema commit and rollback" do
145145
before(:all) do
146146
plsql.connection = @conn = get_connection
147147
plsql.connection.autocommit = false
@@ -183,7 +183,7 @@
183183

184184
end
185185

186-
describe "ActiveRecord connection" do
186+
RSpec.describe "ActiveRecord connection" do
187187
before(:all) do
188188
ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
189189
class TestBaseModel < ActiveRecord::Base
@@ -274,7 +274,7 @@ class TestModel < TestBaseModel
274274

275275
end if defined?(ActiveRecord)
276276

277-
describe "DBMS_OUTPUT logging" do
277+
RSpec.describe "DBMS_OUTPUT logging" do
278278

279279
before(:all) do
280280
plsql.connection = get_connection

‎spec/plsql/sequence_spec.rb‎

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

3-
describe "Table" do
3+
RSpec.describe "Table" do
44
before(:all) do
55
plsql.connection = get_connection
66
plsql.connection.autocommit = false

‎spec/plsql/sql_statements_spec.rb‎

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

3-
describe "SQL statements /" do
3+
RSpec.describe "SQL statements /" do
44
before(:all) do
55
plsql.connect! CONNECTION_PARAMS
66
plsql.connection.autocommit = false

‎spec/plsql/table_spec.rb‎

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

3-
describe "Table" do
3+
RSpec.describe "Table" do
44
before(:all) do
55
plsql.connect! CONNECTION_PARAMS
66
plsql.connection.autocommit = false

‎spec/plsql/type_spec.rb‎

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

3-
describe "Type" do
3+
RSpec.describe "Type" do
44
before(:all) do
55
plsql.connection = get_connection
66
plsql.execute "DROP TYPE t_employee" rescue nil

‎spec/plsql/variable_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 "Package variables /" do
5+
RSpec.describe "Package variables /" do
66

77
describe "String" do
88
before(:all) do

‎spec/plsql/version_spec.rb‎

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

3-
describe "Version" do
3+
RSpec.describe "Version" do
44
it "should return ruby-plsql version" do
55
expect(PLSQL::VERSION).to eq(File.read(File.dirname(__FILE__) + "/../../VERSION").chomp)
66
end

0 commit comments

Comments
 (0)