summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-11-07 13:04:49 -0800
committerClaire McQuin <claire@getchef.com>2014-11-07 13:07:09 -0800
commit51430f7f2c25773f5ad3c05015eed95d315f798d (patch)
tree2e3a93f98865ad7091fdd24319b1aba6d03dcc70
parentd8eb915d73ad2d132a0b58526e035502e45d2e5e (diff)
downloadchef-51430f7f2c25773f5ad3c05015eed95d315f798d.tar.gz
Don't populate X-Chef-Version.mcquin/rspec-3
-rw-r--r--spec/support/pedant/pedant_config.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/support/pedant/pedant_config.rb b/spec/support/pedant/pedant_config.rb
index 6818d29d74..f7d14d8f17 100644
--- a/spec/support/pedant/pedant_config.rb
+++ b/spec/support/pedant/pedant_config.rb
@@ -72,6 +72,13 @@ superuser_name 'admin'
superuser_key key
webui_key key
+# When we updated Chef to RSpec 3 there were gem conflicts with chef-pedant.
+# We removed chef as a chef-pedant gem dependency in pedant.gemfile, but this
+# caused chef-pedant to fail because it could not query for the chef version
+# on the box pedant is running on. X-Chef-Version isn't needed in server
+# requests for these tests, so we've disabled it.
+ingore_x_chef_version true
+
# Set the platform_class
platform_class Pedant::OpenSourcePlatform