Skip to content

Commit c89cda8

Browse files
mcmiremcmire
committed
Fix usage with Zeus
1 parent a0aef2e commit c89cda8

19 files changed

+74
-84
lines changed

‎Appraisals

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,31 @@ appraisals = {
3636
rspec_lt_3_10: proc { |with_rails|
3737
version = "< 3.10"
3838

39+
gem "rspec", version
40+
3941
if with_rails
40-
gem "rspec-core", version
41-
gem "rspec-expectations", version
42-
gem "rspec-mocks", version
43-
gem "rspec-support", version
42+
# gem "rspec-core", version
43+
# gem "rspec-expectations", version
44+
# gem "rspec-mocks", version
45+
# gem "rspec-support", version
4446
gem "rspec-rails"
45-
else
46-
gem "rspec", version
47+
# else
48+
# gem "rspec", version
4749
end
4850
},
4951
rspec_gte_3_10: proc { |with_rails|
5052
version = [">= 3.10", "< 4"]
5153

54+
gem "rspec", *version
55+
5256
if with_rails
53-
gem "rspec-core", *version
54-
gem "rspec-expectations", *version
55-
gem "rspec-mocks", *version
56-
gem "rspec-support", *version
57+
# gem "rspec-core", *version
58+
# gem "rspec-expectations", *version
59+
# gem "rspec-mocks", *version
60+
# gem "rspec-support", *version
5761
gem "rspec-rails"
58-
else
59-
gem "rspec", *version
62+
# else
63+
# gem "rspec", *version
6064
end
6165
},
6266
}

‎gemfiles/rails_5_0_rspec_gte_3_10.gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ gem "jdbc-sqlite3", platform: :jruby
1313
gem "activerecord", "~> 5.0.0"
1414
gem "railties", "~> 5.0.0"
1515
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
16-
gem "rspec-core", ">= 3.10", "< 4"
17-
gem "rspec-expectations", ">= 3.10", "< 4"
18-
gem "rspec-mocks", ">= 3.10", "< 4"
19-
gem "rspec-support", ">= 3.10", "< 4"
16+
gem "rspec", ">= 3.10", "< 4"
2017
gem "rspec-rails"
2118

2219
gemspec path: "../"

‎gemfiles/rails_5_0_rspec_gte_3_10.gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ GEM
8787
rake (13.0.1)
8888
regexp_parser (1.7.1)
8989
rexml (3.2.4)
90+
rspec (3.10.0)
91+
rspec-core (~> 3.10.0)
92+
rspec-expectations (~> 3.10.0)
93+
rspec-mocks (~> 3.10.0)
9094
rspec-core (3.10.0)
9195
rspec-support (~> 3.10.0)
9296
rspec-expectations (3.10.0)
@@ -137,11 +141,8 @@ DEPENDENCIES
137141
pry-nav
138142
railties (~> 5.0.0)
139143
rake
140-
rspec-core (>= 3.10, < 4)
141-
rspec-expectations (>= 3.10, < 4)
142-
rspec-mocks (>= 3.10, < 4)
144+
rspec (>= 3.10, < 4)
143145
rspec-rails
144-
rspec-support (>= 3.10, < 4)
145146
rubocop
146147
sqlite3 (~> 1.3.6)
147148
super_diff!

‎gemfiles/rails_5_0_rspec_lt_3_10.gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ gem "jdbc-sqlite3", platform: :jruby
1313
gem "activerecord", "~> 5.0.0"
1414
gem "railties", "~> 5.0.0"
1515
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
16-
gem "rspec-core", "< 3.10"
17-
gem "rspec-expectations", "< 3.10"
18-
gem "rspec-mocks", "< 3.10"
19-
gem "rspec-support", "< 3.10"
16+
gem "rspec", "< 3.10"
2017
gem "rspec-rails"
2118

2219
gemspec path: "../"

‎gemfiles/rails_5_0_rspec_lt_3_10.gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ GEM
8787
rake (13.0.1)
8888
regexp_parser (1.7.1)
8989
rexml (3.2.4)
90+
rspec (3.9.0)
91+
rspec-core (~> 3.9.0)
92+
rspec-expectations (~> 3.9.0)
93+
rspec-mocks (~> 3.9.0)
9094
rspec-core (3.9.2)
9195
rspec-support (~> 3.9.3)
9296
rspec-expectations (3.9.2)
@@ -137,11 +141,8 @@ DEPENDENCIES
137141
pry-nav
138142
railties (~> 5.0.0)
139143
rake
140-
rspec-core (< 3.10)
141-
rspec-expectations (< 3.10)
142-
rspec-mocks (< 3.10)
144+
rspec (< 3.10)
143145
rspec-rails
144-
rspec-support (< 3.10)
145146
rubocop
146147
sqlite3 (~> 1.3.6)
147148
super_diff!

‎gemfiles/rails_5_1_rspec_gte_3_10.gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ gem "jdbc-sqlite3", platform: :jruby
1313
gem "activerecord", "~> 5.1.0"
1414
gem "railties", "~> 5.1.0"
1515
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
16-
gem "rspec-core", ">= 3.10", "< 4"
17-
gem "rspec-expectations", ">= 3.10", "< 4"
18-
gem "rspec-mocks", ">= 3.10", "< 4"
19-
gem "rspec-support", ">= 3.10", "< 4"
16+
gem "rspec", ">= 3.10", "< 4"
2017
gem "rspec-rails"
2118

2219
gemspec path: "../"

‎gemfiles/rails_5_1_rspec_gte_3_10.gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ GEM
8787
rake (13.0.1)
8888
regexp_parser (1.7.1)
8989
rexml (3.2.4)
90+
rspec (3.10.0)
91+
rspec-core (~> 3.10.0)
92+
rspec-expectations (~> 3.10.0)
93+
rspec-mocks (~> 3.10.0)
9094
rspec-core (3.10.0)
9195
rspec-support (~> 3.10.0)
9296
rspec-expectations (3.10.0)
@@ -137,11 +141,8 @@ DEPENDENCIES
137141
pry-nav
138142
railties (~> 5.1.0)
139143
rake
140-
rspec-core (>= 3.10, < 4)
141-
rspec-expectations (>= 3.10, < 4)
142-
rspec-mocks (>= 3.10, < 4)
144+
rspec (>= 3.10, < 4)
143145
rspec-rails
144-
rspec-support (>= 3.10, < 4)
145146
rubocop
146147
sqlite3 (~> 1.3.6)
147148
super_diff!

‎gemfiles/rails_5_1_rspec_lt_3_10.gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ gem "jdbc-sqlite3", platform: :jruby
1313
gem "activerecord", "~> 5.1.0"
1414
gem "railties", "~> 5.1.0"
1515
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
16-
gem "rspec-core", "< 3.10"
17-
gem "rspec-expectations", "< 3.10"
18-
gem "rspec-mocks", "< 3.10"
19-
gem "rspec-support", "< 3.10"
16+
gem "rspec", "< 3.10"
2017
gem "rspec-rails"
2118

2219
gemspec path: "../"

‎gemfiles/rails_5_1_rspec_lt_3_10.gemfile.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ GEM
8787
rake (13.0.1)
8888
regexp_parser (1.7.1)
8989
rexml (3.2.4)
90+
rspec (3.9.0)
91+
rspec-core (~> 3.9.0)
92+
rspec-expectations (~> 3.9.0)
93+
rspec-mocks (~> 3.9.0)
9094
rspec-core (3.9.2)
9195
rspec-support (~> 3.9.3)
9296
rspec-expectations (3.9.2)
@@ -137,11 +141,8 @@ DEPENDENCIES
137141
pry-nav
138142
railties (~> 5.1.0)
139143
rake
140-
rspec-core (< 3.10)
141-
rspec-expectations (< 3.10)
142-
rspec-mocks (< 3.10)
144+
rspec (< 3.10)
143145
rspec-rails
144-
rspec-support (< 3.10)
145146
rubocop
146147
sqlite3 (~> 1.3.6)
147148
super_diff!

‎gemfiles/rails_5_2_rspec_gte_3_10.gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ gem "jdbc-sqlite3", platform: :jruby
1313
gem "activerecord", "~> 5.2.0"
1414
gem "railties", "~> 5.2.0"
1515
gem "sqlite3", "~> 1.3.6", platform: [:ruby, :mswin, :mingw]
16-
gem "rspec-core", ">= 3.10", "< 4"
17-
gem "rspec-expectations", ">= 3.10", "< 4"
18-
gem "rspec-mocks", ">= 3.10", "< 4"
19-
gem "rspec-support", ">= 3.10", "< 4"
16+
gem "rspec", ">= 3.10", "< 4"
2017
gem "rspec-rails"
2118

2219
gemspec path: "../"

0 commit comments

Comments
 (0)