summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2018-09-13 11:01:04 +0000
committerThe Bundler Bot <bot@bundler.io>2018-09-13 11:01:04 +0000
commitcb543fb07c08ec0bc79f61c35a00dc645367f7a1 (patch)
treeb7e62c578ed7b6f0b59926f139f16d0f57d85180
parent87f49b2dc000b38776e6a73924e63ec090d53062 (diff)
parenta71d74c358e5b9df4e12904a52600d24ba1ce3eb (diff)
downloadbundler-cb543fb07c08ec0bc79f61c35a00dc645367f7a1.tar.gz
Auto merge of #6696 - bundler:fix_locally_failing_spec, r=colby-swandale
Better conditional assertion This is another try at #6685. ### What was the end-user problem that led to this PR? The problem was that I get a failure when running the specs locally. ### What was your diagnosis of the problem? My diagnosis was that the result of this specs depends, not on whether we are on Travis or not, but on which platform the spec runs. ### What is your fix for the problem, implemented in this PR? My fix is to check for the platform so that each platform gets its expected result, regardless of whether the spec is run on Travis CI or not. ### Why did you choose this fix out of the possible options? I chose this fix because hopefully it doesn't break local specs for @colby-swandale, and it fixes them for me :)
-rw-r--r--spec/commands/exec_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb
index 95c10c0a9f..492907743a 100644
--- a/spec/commands/exec_spec.rb
+++ b/spec/commands/exec_spec.rb
@@ -561,7 +561,7 @@ RSpec.describe "bundle exec" do
ex << "raise SignalException, 'SIGTERM'\n"
ex
end
- let(:expected_err) { ENV["TRAVIS"] ? "Terminated" : "" }
+ let(:expected_err) { RUBY_PLATFORM =~ /darwin/ ? "" : "Terminated" }
let(:exit_code) do
# signal mask 128 + plus signal 15 -> TERM
# this is specified by C99