summaryrefslogtreecommitdiff
path: root/spec/support/shared
diff options
context:
space:
mode:
authorRyan Davis <ryand-ruby@zenspider.com>2020-03-06 17:46:03 -0800
committerTim Smith <tsmith84@gmail.com>2020-03-16 11:56:53 -0700
commit6e826423e240d71017a4fc9ab9f25f490ec859ad (patch)
tree255da99fccd2a05a793731b172e8be9ea18b6b07 /spec/support/shared
parent49ad29e0b7607103e32853fc8e3cf67c6d308b90 (diff)
downloadchef-6e826423e240d71017a4fc9ab9f25f490ec859ad.tar.gz
Fix all(?) circular requires coming from the specs.
Lots more in lib, but that's out of scope for this. I'm just trying to make it easier to debug a failing spec when needed. Signed-off-by: Ryan Davis <zenspider@chef.io>
Diffstat (limited to 'spec/support/shared')
-rw-r--r--spec/support/shared/context/config.rb3
-rw-r--r--spec/support/shared/integration/integration_helper.rb1
-rw-r--r--spec/support/shared/unit/execute_resource.rb2
-rw-r--r--spec/support/shared/unit/provider/file.rb1
-rw-r--r--spec/support/shared/unit/script_resource.rb2
-rw-r--r--spec/support/shared/unit/windows_script_resource.rb2
6 files changed, 0 insertions, 11 deletions
diff --git a/spec/support/shared/context/config.rb b/spec/support/shared/context/config.rb
index bb4ff7e0d1..7c4ae8dca6 100644
--- a/spec/support/shared/context/config.rb
+++ b/spec/support/shared/context/config.rb
@@ -7,9 +7,6 @@
# Required chef files here:
require "chef/config"
-# Required spec files here:
-require "spec_helper"
-
# Basic config. Nothing fancy.
shared_context "default config options" do
before do
diff --git a/spec/support/shared/integration/integration_helper.rb b/spec/support/shared/integration/integration_helper.rb
index af57e21c73..7e52f6a9f8 100644
--- a/spec/support/shared/integration/integration_helper.rb
+++ b/spec/support/shared/integration/integration_helper.rb
@@ -24,7 +24,6 @@ require "chef/json_compat"
require "chef/server_api"
require "support/shared/integration/knife_support"
require "cheffish/rspec/chef_run_support"
-require "spec_helper"
module Cheffish
class BasicChefClient
diff --git a/spec/support/shared/unit/execute_resource.rb b/spec/support/shared/unit/execute_resource.rb
index 05c2fc4a9a..2d6e8de0fd 100644
--- a/spec/support/shared/unit/execute_resource.rb
+++ b/spec/support/shared/unit/execute_resource.rb
@@ -17,8 +17,6 @@
# limitations under the License.
#
-require "spec_helper"
-
shared_examples_for "an execute resource" do
before(:each) do
diff --git a/spec/support/shared/unit/provider/file.rb b/spec/support/shared/unit/provider/file.rb
index 3df8eecc6f..d78eff0c90 100644
--- a/spec/support/shared/unit/provider/file.rb
+++ b/spec/support/shared/unit/provider/file.rb
@@ -16,7 +16,6 @@
# limitations under the License.
#
-require "spec_helper"
require "tmpdir"
if windows?
require "chef/win32/file"
diff --git a/spec/support/shared/unit/script_resource.rb b/spec/support/shared/unit/script_resource.rb
index 3c158afd6b..018a568e58 100644
--- a/spec/support/shared/unit/script_resource.rb
+++ b/spec/support/shared/unit/script_resource.rb
@@ -17,8 +17,6 @@
# limitations under the License.
#
-require "spec_helper"
-
shared_examples_for "a script resource" do
it "should create a new Chef::Resource::Script" do
diff --git a/spec/support/shared/unit/windows_script_resource.rb b/spec/support/shared/unit/windows_script_resource.rb
index 29238a3917..9e4d646ff8 100644
--- a/spec/support/shared/unit/windows_script_resource.rb
+++ b/spec/support/shared/unit/windows_script_resource.rb
@@ -16,8 +16,6 @@
# limitations under the License.
#
-require "spec_helper"
-
require "support/shared/unit/execute_resource"
require "support/shared/unit/script_resource"