Unverified Commit cf894175 authored by Steven Danna's avatar Steven Danna Committed by GitHub
Browse files

Merge pull request #804 from chef/ssd/new-bundler

with_clean_env should clean BUNDLER_ variables
parents e3807801 9fe75ee4
......@@ -928,6 +928,7 @@ module Omnibus
original = ENV.to_hash
ENV.delete("_ORIGINAL_GEM_PATH")
ENV.delete_if { |k, _| k.start_with?("BUNDLER_") }
ENV.delete_if { |k, _| k.start_with?("BUNDLE_") }
ENV.delete_if { |k, _| k.start_with?("GEM_") }
ENV.delete_if { |k, _| k.start_with?("RUBY") }
......
......@@ -345,6 +345,7 @@ module Omnibus
before do
# sles identifies as suse
stub_ohai(platform: "suse", version: "11.4")
allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
end
it "sets the defaults" do
expect(subject.with_standard_compiler_flags).to eq(
......@@ -384,6 +385,7 @@ module Omnibus
before do
# sles identifies as suse
stub_ohai(platform: "suse", version: "12.2")
allow(subject).to receive(:which).with("gcc-4.8").and_return(false)
end
it "sets the defaults" do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment