diff options
author | Pete Higgins <pete@peterhiggins.org> | 2020-07-13 12:48:21 -0700 |
---|---|---|
committer | Pete Higgins <pete@peterhiggins.org> | 2020-07-13 13:35:19 -0700 |
commit | ea09c756ef643dda36932c9578080bd867e72b4c (patch) | |
tree | 98afc976824a6476cc63b6227730106e4c098ed5 /spec | |
parent | 04eac6a86e51d71cdbfbe163ebb70a887c1c9ddb (diff) | |
download | chef-ea09c756ef643dda36932c9578080bd867e72b4c.tar.gz |
The spec/ directory is in the path.fix-spec_helper-requires
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/functional/resource/windows_user_privilege_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/run_lock_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/util/powershell/cmdlet_spec.rb | 2 | ||||
-rw-r--r-- | spec/functional/version_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/data_collector_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/json_compat_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/knife/cookbook_upload_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/ifconfig_spec.rb | 1 | ||||
-rw-r--r-- | spec/unit/provider/package/smartos_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/service/redhat_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/resource_reporter_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/run_lock_spec.rb | 2 | ||||
-rw-r--r-- | spec/unit/scan_access_control_spec.rb | 2 |
13 files changed, 12 insertions, 13 deletions
diff --git a/spec/functional/resource/windows_user_privilege_spec.rb b/spec/functional/resource/windows_user_privilege_spec.rb index e30971d2e6..f52bbbe23b 100644 --- a/spec/functional/resource/windows_user_privilege_spec.rb +++ b/spec/functional/resource/windows_user_privilege_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../../spec_helper" +require "spec_helper" describe Chef::Resource::WindowsUserPrivilege, :windows_only do let(:principal) { nil } diff --git a/spec/functional/run_lock_spec.rb b/spec/functional/run_lock_spec.rb index e922bdfd85..fa450b9c8d 100644 --- a/spec/functional/run_lock_spec.rb +++ b/spec/functional/run_lock_spec.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../spec_helper" +require "spec_helper" require "chef/client" describe Chef::RunLock do diff --git a/spec/functional/util/powershell/cmdlet_spec.rb b/spec/functional/util/powershell/cmdlet_spec.rb index d8de1390a2..565456f687 100644 --- a/spec/functional/util/powershell/cmdlet_spec.rb +++ b/spec/functional/util/powershell/cmdlet_spec.rb @@ -17,7 +17,7 @@ # require "chef/json_compat" -require_relative "../../../spec_helper" +require "spec_helper" describe Chef::Util::Powershell::Cmdlet, :windows_powershell_dsc_only do before(:all) do diff --git a/spec/functional/version_spec.rb b/spec/functional/version_spec.rb index c8f2bab1ea..935dabb205 100644 --- a/spec/functional/version_spec.rb +++ b/spec/functional/version_spec.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../spec_helper" +require "spec_helper" require "chef/mixin/shell_out" require "chef/version" require "ohai/version" diff --git a/spec/unit/data_collector_spec.rb b/spec/unit/data_collector_spec.rb index 1e527135dc..79d5ed7d5f 100644 --- a/spec/unit/data_collector_spec.rb +++ b/spec/unit/data_collector_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "chef/data_collector" require "socket" diff --git a/spec/unit/json_compat_spec.rb b/spec/unit/json_compat_spec.rb index 896775f04d..9a3ce2121a 100644 --- a/spec/unit/json_compat_spec.rb +++ b/spec/unit/json_compat_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "chef/json_compat" describe Chef::JSONCompat do diff --git a/spec/unit/knife/cookbook_upload_spec.rb b/spec/unit/knife/cookbook_upload_spec.rb index bc13ce834c..c667742187 100644 --- a/spec/unit/knife/cookbook_upload_spec.rb +++ b/spec/unit/knife/cookbook_upload_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) +require "spec_helper" require "chef/cookbook_uploader" require "timeout" diff --git a/spec/unit/provider/ifconfig_spec.rb b/spec/unit/provider/ifconfig_spec.rb index 88fa5883f2..668a3ca9d9 100644 --- a/spec/unit/provider/ifconfig_spec.rb +++ b/spec/unit/provider/ifconfig_spec.rb @@ -16,7 +16,6 @@ # limitations under the License. # -# require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) require "spec_helper" require "chef/exceptions" diff --git a/spec/unit/provider/package/smartos_spec.rb b/spec/unit/provider/package/smartos_spec.rb index 91ccb87211..5d815a579e 100644 --- a/spec/unit/provider/package/smartos_spec.rb +++ b/spec/unit/provider/package/smartos_spec.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")) +require "spec_helper" require "ostruct" describe Chef::Provider::Package::SmartOS, "load_current_resource" do diff --git a/spec/unit/provider/service/redhat_spec.rb b/spec/unit/provider/service/redhat_spec.rb index b965183d14..9795abf771 100644 --- a/spec/unit/provider/service/redhat_spec.rb +++ b/spec/unit/provider/service/redhat_spec.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")) +require "spec_helper" require "ostruct" shared_examples_for "define_resource_requirements_common" do diff --git a/spec/unit/resource_reporter_spec.rb b/spec/unit/resource_reporter_spec.rb index cac384f1c4..69d5b28e7e 100644 --- a/spec/unit/resource_reporter_spec.rb +++ b/spec/unit/resource_reporter_spec.rb @@ -19,7 +19,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "chef/resource_reporter" require "socket" diff --git a/spec/unit/run_lock_spec.rb b/spec/unit/run_lock_spec.rb index c4fcb8ad6f..17e6fb6521 100644 --- a/spec/unit/run_lock_spec.rb +++ b/spec/unit/run_lock_spec.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require_relative "../spec_helper" +require "spec_helper" require "chef/client" describe Chef::RunLock do diff --git a/spec/unit/scan_access_control_spec.rb b/spec/unit/scan_access_control_spec.rb index ba09b990f5..5406201891 100644 --- a/spec/unit/scan_access_control_spec.rb +++ b/spec/unit/scan_access_control_spec.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require_relative "../spec_helper" +require "spec_helper" require "chef/scan_access_control" describe Chef::ScanAccessControl do |