diff options
author | The Bundler Bot <bot@bundler.io> | 2018-04-16 15:15:02 +0000 |
---|---|---|
committer | The Bundler Bot <bot@bundler.io> | 2018-04-16 15:15:02 +0000 |
commit | b7684c7bf91c448b8ee6bf60d39353385a51e23b (patch) | |
tree | 1843b340e3df1ad64fb7a826fc9de6e5289ea453 | |
parent | 6ce1eea14bc2d9917ea67d0103e0a7f15a0b62ec (diff) | |
parent | 6c3f358159af19dac592b661de92303c4f4a6cae (diff) | |
download | bundler-b7684c7bf91c448b8ee6bf60d39353385a51e23b.tar.gz |
Auto merge of #6488 - bundler:colby/fix-exec-spec, r=segiddins
Fix failing exec spec that is blocking 1.16.2
### Overview
There is a test that is [failing in travis](https://travis-ci.org/bundler/bundler/builds/365371973) which is preventing v1.16.2 from being released. The spec in question is checking the `BUNDLER_SPEC_SUB_VERSION` env var and changes the assertion of the test depending on the stubbed version. The issue is that the 1-16-stable branch does not really use `BUNDLER_SPEC_SUB_VERSION` and the spec is assuming it's testing Bundler 2.
### What is your fix for the problem, implemented in this PR?
Checking for `BUNDLER_SPEC_SUB_VERSION` is not really necessary in the first place because the test is already scoped for Bundler 1 & 2 (using rspec tags). This PR removes the checking for `BUNDLER_SPEC_SUB_VERSION`.
-rw-r--r-- | spec/commands/exec_spec.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 30972b5e46..2fe2667363 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -610,13 +610,7 @@ RSpec.describe "bundle exec" do let(:executable) { super() << "\nclass Err < Exception\ndef backtrace; end;\nend\nraise Err" } let(:exit_code) { 1 } let(:expected) { super() << "\nbundler: failed to load command: #{path} (#{path})" } - let(:expected_err) do - if ENV["BUNDLER_SPEC_SUB_VERSION"] == "1.98" - "Err: Err" - else - "bundler: failed to load command: #{path} (#{path})\nErr: Err" - end - end + let(:expected_err) { "Err: Err" } it_behaves_like "it runs" end @@ -625,13 +619,7 @@ RSpec.describe "bundle exec" do let(:executable) { super() << "\nclass Err < Exception\ndef backtrace; end;\nend\nraise Err" } let(:exit_code) { 1 } let(:expected_err) { "bundler: failed to load command: #{path} (#{path})\nErr: Err" } - let(:expected) do - if ENV["BUNDLER_SPEC_SUB_VERSION"] == "1.98" - super() << "\nbundler: failed to load command: #{path} (#{path})" - else - super() - end - end + let(:expected) { super() } it_behaves_like "it runs" end |