diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-05-29 17:46:35 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-05-29 17:50:07 -0700 |
| commit | 05f3eb35423e4f1d7b75330b027ba71e5d6297cc (patch) | |
| tree | 1ba1e30209272b339a8071eac2bc188e44f893a5 | |
| parent | 65bceb59fb7c8f2427234f4210e1ea07bd1255c1 (diff) | |
| download | chef-05f3eb35423e4f1d7b75330b027ba71e5d6297cc.tar.gz | |
Revert the change to the load paths in the specsrevert_paths
This reverts commit de8d3a3299a18d4bfd2b419cb1303258441a862a.
This code works fine within Workstation, but it fails hard with DK. We
need to keep the DK verify checks running with Chef 15 until both of
these codebases go away. For now just revert this and roll forward with
life in master where we have the new paths
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | spec/spec_helper.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 01ff1d3c47..59515d4f7b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,16 +24,18 @@ module Shell IRB = nil unless defined? IRB end -$LOAD_PATH.unshift File.expand_path("../..", __FILE__) - -$LOAD_PATH.unshift File.expand_path("../../chef-config/lib", __FILE__) -$LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __FILE__) +# Ruby 1.9 Compat +$:.unshift File.expand_path("../..", __FILE__) require "rubygems" require "rspec/mocks" require "webmock/rspec" +$:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) +$:.unshift(File.expand_path("../lib", __FILE__)) +$:.unshift(File.dirname(__FILE__)) + require "chef" require "chef/knife" |