Skip to content

Commit 3e8bf09

Browse files
committed
Use erb executable instead of irb
1 parent 48b6c60 commit 3e8bf09

File tree

1 file changed

+21
-35
lines changed

1 file changed

+21
-35
lines changed

spec/bundler/commands/exec_spec.rb

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -193,82 +193,74 @@
193193
end
194194

195195
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 }
205197

206198
context "when not specified in Gemfile" do
207199
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?
209201

210202
install_gemfile "source \"https://gem.repo1\""
211203
end
212204

213205
it "uses version provided by ruby" do
214-
bundle "exec irb --version"
206+
bundle "exec erb --version"
215207

216-
expect(out).to include(default_irb_version)
208+
expect(out).to include(default_erb_version)
217209
end
218210
end
219211

220212
context "when specified in Gemfile directly" do
221-
let(:specified_irb_version) { "0.9.6" }
213+
let(:specified_erb_version) { "2.2.3" }
222214

223215
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?
225217

226218
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"
229221
end
230222
end
231223

232224
install_gemfile <<-G
233225
source "https://gem.repo2"
234-
gem "irb", "#{specified_irb_version}"
226+
gem "erb", "#{specified_erb_version}"
235227
G
236228
end
237229

238230
it "uses version specified" do
239-
bundle "exec irb --version"
231+
bundle "exec erb --version"
240232

241-
expect(out).to eq(specified_irb_version)
233+
expect(out).to eq(specified_erb_version)
242234
expect(err).to be_empty
243235
end
244236
end
245237

246238
context "when specified in Gemfile indirectly" do
247-
let(:indirect_irb_version) { "0.9.6" }
239+
let(:indirect_erb_version) { "2.2.3" }
248240

249241
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?
251243

252244
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"
255247
end
256248

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
259251
end
260252
end
261253

262254
install_gemfile <<-G
263255
source "https://gem.repo2"
264-
gem "gem_depending_on_old_irb"
256+
gem "gem_depending_on_old_erb"
265257
G
266258

267-
bundle "exec irb --version"
259+
bundle "exec erb --version"
268260
end
269261

270262
it "uses resolved version" do
271-
expect(out).to eq(indirect_irb_version)
263+
expect(out).to eq(indirect_erb_version)
272264
expect(err).to be_empty
273265
end
274266
end
@@ -645,12 +637,6 @@
645637

646638
describe "with gems bundled via :path with invalid gemspecs" do
647639
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-
654640
build_lib "foo"
655641

656642
gemspec = lib_path("foo-1.0").join("foo.gemspec").to_s
@@ -671,7 +657,7 @@
671657
gem "foo", :path => "#{lib_path("foo-1.0")}"
672658
G
673659

674-
bundle "exec irb", raise_on_error: false
660+
bundle "exec erb", raise_on_error: false
675661

676662
expect(err).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid")
677663
expect(err).to match(/missing value for attribute rubygems_version|rubygems_version must not be nil/)

0 commit comments

Comments
 (0)