From c14f8414009ba41fd5634acc83817b226901ae80 Mon Sep 17 00:00:00 2001 From: Pete Higgins Date: Wed, 11 Mar 2020 13:06:16 -0700 Subject: Fix load path in test runs. Signed-off-by: Pete Higgins --- spec/spec_helper.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 605f920125..54e0ef41b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,18 +24,16 @@ 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("../../chef-config/lib", __FILE__) +$LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __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__)) - if ENV["COVERAGE"] require "simplecov" SimpleCov.start do -- cgit v1.2.1