Skip to content

Commit de9ce8c

Browse files
Use erb executable again
Co-authored-by: David Rodríguez <[email protected]>
1 parent 63dbb2f commit de9ce8c

File tree

1 file changed

+17
-25
lines changed

1 file changed

+17
-25
lines changed

spec/bundler/commands/exec_spec.rb

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -193,76 +193,68 @@
193193
end
194194

195195
context "with default gems" do
196-
let(:default_ss_version) { ruby "gem 'syntax_suggest', '< 999999'; require 'syntax_suggest/version'; puts SyntaxSuggest::VERSION", raise_on_error: false }
196+
let(:default_erb_version) { ruby "gem 'erb', '< 999999'; require 'erb/version'; puts Erb::VERSION", raise_on_error: false }
197197

198198
context "when not specified in Gemfile" do
199199
before do
200-
skip "syntax_suggest executable is not provided on Windows" if Gem.win_platform?
201-
skip "syntax_suggest isn't a default gem" if default_ss_version.empty?
202-
skip "syntax_suggest executable is broken" if default_ss_version <= "2.0.1"
203-
204200
install_gemfile "source \"https://gem.repo1\""
205201
end
206202

207203
it "uses version provided by ruby" do
208-
bundle "exec ruby --disable-syntax-suggest -S syntax_suggest --version"
204+
bundle "exec erb --version"
209205

210-
expect(out).to include(default_ss_version)
206+
expect(out).to include(default_erb_version)
211207
end
212208
end
213209

214210
context "when specified in Gemfile directly" do
215-
let(:specified_ss_version) { "2.0.0" }
211+
let(:specified_erb_version) { "2.0.0" }
216212

217213
before do
218-
skip "syntax_suggest isn't a default gem" if default_ss_version.empty?
219-
220214
build_repo2 do
221-
build_gem "syntax_suggest", specified_ss_version do |s|
222-
s.executables = "syntax_suggest"
215+
build_gem "erb", specified_erb_version do |s|
216+
s.executables = "erb"
223217
end
224218
end
225219

226220
install_gemfile <<-G
227221
source "https://gem.repo2"
228-
gem "syntax_suggest", "#{specified_ss_version}"
222+
gem "erb", "#{specified_erb_version}"
229223
G
230224
end
231225

232226
it "uses version specified" do
233-
bundle "exec ruby --disable-syntax-suggest -S syntax_suggest --version"
227+
bundle "exec erb --version", artifice: nil
234228

235-
expect(out).to eq(specified_ss_version)
229+
expect(out).to eq(specified_erb_version)
236230
expect(err).to be_empty
237231
end
238232
end
239233

240234
context "when specified in Gemfile indirectly" do
241-
let(:indirect_ss_version) { "2.0.0" }
235+
let(:indirect_erb_version) { "2.0.0" }
242236

243237
before do
244-
skip "syntax_suggest isn't a default gem" if default_ss_version.empty?
245-
246238
build_repo2 do
247-
build_gem "syntax_suggest", indirect_ss_version do |s|
248-
s.executables = "syntax_suggest"
239+
build_gem "erb", indirect_erb_version do |s|
240+
s.executables = "erb"
249241
end
250242

251-
build_gem "gem_depending_on_old_ss" do |s|
252-
s.add_dependency "syntax_suggest", indirect_ss_version
243+
build_gem "gem_depending_on_old_erb" do |s|
244+
s.add_dependency "erb", indirect_erb_version
253245
end
254246
end
255247

256248
install_gemfile <<-G
257249
source "https://gem.repo2"
258-
gem "gem_depending_on_old_ss"
250+
gem "gem_depending_on_old_erb"
259251
G
260252

261-
bundle "exec ruby --disable-syntax-suggest -S syntax_suggest --version"
253+
bundle "exec erb --version", artifice: nil
262254
end
263255

264256
it "uses resolved version" do
265-
expect(out).to eq(indirect_ss_version)
257+
expect(out).to eq(indirect_erb_version)
266258
expect(err).to be_empty
267259
end
268260
end

0 commit comments

Comments
 (0)