summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-05-30 15:32:26 -0700
committerTim Smith <tsmith84@gmail.com>2020-05-30 15:41:07 -0700
commitf721afabbf5649202ae9a3b64752aceb5a78325a (patch)
tree7fd009c6defb9d41f04f39b3c0906e85653c49e2
parent05f3eb35423e4f1d7b75330b027ba71e5d6297cc (diff)
downloadchef-f721afabbf5649202ae9a3b64752aceb5a78325a.tar.gz
Use lamonts set of paths
I confirmed these work with chefdk Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--spec/spec_helper.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 59515d4f7b..e85a417578 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -24,18 +24,17 @@ module Shell
IRB = nil unless defined? IRB
end
-# Ruby 1.9 Compat
-$:.unshift File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../chef-config/lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __FILE__)
+$LOAD_PATH.unshift File.dirname(__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"