diff options
| -rw-r--r-- | .rubocop.yml | 4 | ||||
| -rw-r--r-- | chef-config/spec/spec_helper.rb | 2 | ||||
| -rw-r--r-- | chef-config/spec/unit/workstation_config_loader_spec.rb | 2 | ||||
| -rw-r--r-- | chef-utils/spec/spec_helper.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 3209f30aba..0c874566be 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -36,5 +36,5 @@ ChefRuby/UnlessDefinedRequire: Include: - 'lib/**/*' - 'chef-bin/**/*' - - 'chef-config/**/*' - - 'chef-utils/**/*' + - 'chef-config/lib/**/*' + - 'chef-utils/lib/**/*' diff --git a/chef-config/spec/spec_helper.rb b/chef-config/spec/spec_helper.rb index fb6e78a6b1..557f1f6432 100644 --- a/chef-config/spec/spec_helper.rb +++ b/chef-config/spec/spec_helper.rb @@ -1,4 +1,4 @@ -require "chef-utils" unless defined?(ChefUtils) +require "chef-utils" # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| diff --git a/chef-config/spec/unit/workstation_config_loader_spec.rb b/chef-config/spec/unit/workstation_config_loader_spec.rb index cffc316240..70b42ad961 100644 --- a/chef-config/spec/unit/workstation_config_loader_spec.rb +++ b/chef-config/spec/unit/workstation_config_loader_spec.rb @@ -20,7 +20,7 @@ require "spec_helper" require "tempfile" unless defined?(Tempfile) require "chef-config/exceptions" -require "chef-utils" unless defined?(ChefUtils) +require "chef-utils" require "chef-config/workstation_config_loader" RSpec.describe ChefConfig::WorkstationConfigLoader do diff --git a/chef-utils/spec/spec_helper.rb b/chef-utils/spec/spec_helper.rb index b7efd66c4e..0b193e2d9a 100644 --- a/chef-utils/spec/spec_helper.rb +++ b/chef-utils/spec/spec_helper.rb @@ -1,4 +1,4 @@ -require "chef-utils" unless defined?(ChefUtils) +require "chef-utils" # FIXME: dynamically generate this for accuracy HELPER_MODULES = [ |