diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-04 15:14:01 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-09 09:16:06 -0800 |
| commit | 3913addd011cee9126dfbaaf5ce804ce8aaf8928 (patch) | |
| tree | 7f7ab0cbfc3b28e906c2628f982c2f37e42e26d1 | |
| parent | 4b8abe63c1f030dcbac00997027d7689f498e44f (diff) | |
| download | chef-3913addd011cee9126dfbaaf5ce804ce8aaf8928.tar.gz | |
can't strip the PATH out of the env.
also add back a bunch of other ruby env vars so that our ruby
environment remains sane.
| -rw-r--r-- | spec/integration/client/client_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb index bfc88659e0..f6e50066bf 100644 --- a/spec/integration/client/client_spec.rb +++ b/spec/integration/client/client_spec.rb @@ -47,7 +47,7 @@ describe "chef-client" do # cf. CHEF-4914 let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" } - let(:critical_env_vars) { %w{PATH RUBYOPT BUNDLE_GEMFILE GEM_PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") } + let(:critical_env_vars) { %w{_ORIGINAL_GEM_PATH GEM_PATH GEM_HOME GEM_ROOT BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYLIB RUBYOPT RUBY_ENGINE RUBY_ROOT RUBY_VERSION PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") } when_the_repository "has a cookbook with a no-op recipe" do before { file "cookbooks/x/recipes/default.rb", "" } |