summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-12-04 16:52:35 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-12-04 16:52:35 -0800
commit8dac4f52d786b7d16133a956fafb01f4ade05ff0 (patch)
tree66a21c6784791d70dc35c438be9d0ecbe24421d7
parentb630537e48fdee30bc4aa3e498a29ec465b279d8 (diff)
parent652c77324da9b2df658b21837b0e74feff3a2e78 (diff)
downloadchef-8dac4f52d786b7d16133a956fafb01f4ade05ff0.tar.gz
Merge pull request #4240 from chef/lcg/remove-focus
focus snuck into a PR
-rw-r--r--spec/integration/recipes/lwrp_inline_resources_spec.rb2
-rw-r--r--spec/spec_helper.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/spec/integration/recipes/lwrp_inline_resources_spec.rb b/spec/integration/recipes/lwrp_inline_resources_spec.rb
index 73b7d428f0..bd5eaf66a4 100644
--- a/spec/integration/recipes/lwrp_inline_resources_spec.rb
+++ b/spec/integration/recipes/lwrp_inline_resources_spec.rb
@@ -75,7 +75,7 @@ describe "LWRPs with inline resources" do
end
end
- it "resources declared in b are executed immediately inline", :focus do
+ it "resources declared in b are executed immediately inline" do
r = nil
expect_recipe {
r = lwrp_inline_resources_test2 'hi' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7b3b61cad0..7691d88ff3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -204,6 +204,11 @@ RSpec.configure do |config|
ENV['CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS'] = "1"
end
+ # raise if anyone commits any test to CI with :focus set on it
+ config.before(:example, :focus) do
+ raise 'This example was committed with `:focus` and should not have been'
+ end if ENV['CI']
+
config.before(:suite) do
ARGV.clear
end