|
193 | 193 | end |
194 | 194 |
|
195 | 195 | context "with default gems" do |
196 | | - before do |
197 | | - begin |
198 | | - require "irb" |
199 | | - rescue LoadError |
200 | | - skip "This spec requires IRB to be available" |
201 | | - end |
202 | | - end |
203 | | - |
204 | | - let(:default_irb_version) { ruby "gem 'irb', '< 999999'; require 'irb'; puts IRB::VERSION", raise_on_error: false } |
| 196 | + let(:default_erb_version) { ruby "gem 'erb', '< 999999'; require 'erb'; puts ERB.const_get(:VERSION)", raise_on_error: false } |
205 | 197 |
|
206 | 198 | context "when not specified in Gemfile" do |
207 | 199 | before do |
208 | | - skip "irb isn't a default gem" if default_irb_version.empty? |
| 200 | + skip "erb isn't a default gem" if default_erb_version.empty? |
209 | 201 |
|
210 | 202 | install_gemfile "source \"https://gem.repo1\"" |
211 | 203 | end |
212 | 204 |
|
213 | 205 | it "uses version provided by ruby" do |
214 | | - bundle "exec irb --version" |
| 206 | + bundle "exec erb --version" |
215 | 207 |
|
216 | | - expect(out).to include(default_irb_version) |
| 208 | + expect(out).to include(default_erb_version) |
217 | 209 | end |
218 | 210 | end |
219 | 211 |
|
220 | 212 | context "when specified in Gemfile directly" do |
221 | | - let(:specified_irb_version) { "0.9.6" } |
| 213 | + let(:specified_erb_version) { "2.2.3" } |
222 | 214 |
|
223 | 215 | before do |
224 | | - skip "irb isn't a default gem" if default_irb_version.empty? |
| 216 | + skip "erb isn't a default gem" if default_erb_version.empty? |
225 | 217 |
|
226 | 218 | build_repo2 do |
227 | | - build_gem "irb", specified_irb_version do |s| |
228 | | - s.executables = "irb" |
| 219 | + build_gem "erb", specified_erb_version do |s| |
| 220 | + s.executables = "erb" |
229 | 221 | end |
230 | 222 | end |
231 | 223 |
|
232 | 224 | install_gemfile <<-G |
233 | 225 | source "https://gem.repo2" |
234 | | - gem "irb", "#{specified_irb_version}" |
| 226 | + gem "erb", "#{specified_erb_version}" |
235 | 227 | G |
236 | 228 | end |
237 | 229 |
|
238 | 230 | it "uses version specified" do |
239 | | - bundle "exec irb --version" |
| 231 | + bundle "exec erb --version" |
240 | 232 |
|
241 | | - expect(out).to eq(specified_irb_version) |
| 233 | + expect(out).to eq(specified_erb_version) |
242 | 234 | expect(err).to be_empty |
243 | 235 | end |
244 | 236 | end |
245 | 237 |
|
246 | 238 | context "when specified in Gemfile indirectly" do |
247 | | - let(:indirect_irb_version) { "0.9.6" } |
| 239 | + let(:indirect_erb_version) { "2.2.3" } |
248 | 240 |
|
249 | 241 | before do |
250 | | - skip "irb isn't a default gem" if default_irb_version.empty? |
| 242 | + skip "erb isn't a default gem" if default_erb_version.empty? |
251 | 243 |
|
252 | 244 | build_repo2 do |
253 | | - build_gem "irb", indirect_irb_version do |s| |
254 | | - s.executables = "irb" |
| 245 | + build_gem "erb", indirect_erb_version do |s| |
| 246 | + s.executables = "erb" |
255 | 247 | end |
256 | 248 |
|
257 | | - build_gem "gem_depending_on_old_irb" do |s| |
258 | | - s.add_dependency "irb", indirect_irb_version |
| 249 | + build_gem "gem_depending_on_old_erb" do |s| |
| 250 | + s.add_dependency "erb", indirect_erb_version |
259 | 251 | end |
260 | 252 | end |
261 | 253 |
|
262 | 254 | install_gemfile <<-G |
263 | 255 | source "https://gem.repo2" |
264 | | - gem "gem_depending_on_old_irb" |
| 256 | + gem "gem_depending_on_old_erb" |
265 | 257 | G |
266 | 258 |
|
267 | | - bundle "exec irb --version" |
| 259 | + bundle "exec erb --version" |
268 | 260 | end |
269 | 261 |
|
270 | 262 | it "uses resolved version" do |
271 | | - expect(out).to eq(indirect_irb_version) |
| 263 | + expect(out).to eq(indirect_erb_version) |
272 | 264 | expect(err).to be_empty |
273 | 265 | end |
274 | 266 | end |
|
645 | 637 |
|
646 | 638 | describe "with gems bundled via :path with invalid gemspecs" do |
647 | 639 | it "outputs the gemspec validation errors" do |
648 | | - begin |
649 | | - require "irb" |
650 | | - rescue LoadError |
651 | | - skip "This spec requires IRB to be available" |
652 | | - end |
653 | | - |
654 | 640 | build_lib "foo" |
655 | 641 |
|
656 | 642 | gemspec = lib_path("foo-1.0").join("foo.gemspec").to_s |
|
671 | 657 | gem "foo", :path => "#{lib_path("foo-1.0")}" |
672 | 658 | G |
673 | 659 |
|
674 | | - bundle "exec irb", raise_on_error: false |
| 660 | + bundle "exec erb", raise_on_error: false |
675 | 661 |
|
676 | 662 | expect(err).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid") |
677 | 663 | expect(err).to match(/missing value for attribute rubygems_version|rubygems_version must not be nil/) |
|
0 commit comments