summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <cdoherty@chef.io>2015-11-10 13:39:23 -0800
committerChris Doherty <cdoherty@chef.io>2015-11-10 15:12:04 -0800
commit409371275f66ac8a4a0de86cd8041f901351345d (patch)
tree6a71da8622f3d7d1964c90aae52f3f5655feb8d6
parent10d474450b4fc768c640edb139c9a11e043aea7d (diff)
downloadchef-zero-409371275f66ac8a4a0de86cd8041f901351345d.tar.gz
Move the 'server_api_version 0' thing into oc_pedant.rb.
-rw-r--r--spec/run_oc_pedant.rb1
-rw-r--r--spec/support/oc_pedant.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 55f6ec9..d084ea2 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -77,7 +77,6 @@ begin
Pedant::Config.search_url_fmt = "/dummy?fq=+X_CHEF_type_CHEF_X:%{type}&q=%{query}&wt=json"
Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
- Pedant.config[:server_api_version] = 0
# "the goal is that only authorization, authentication and validation tests are turned off" - @jkeiser
Pedant.setup([
diff --git a/spec/support/oc_pedant.rb b/spec/support/oc_pedant.rb
index e3bcf27..91ad533 100644
--- a/spec/support/oc_pedant.rb
+++ b/spec/support/oc_pedant.rb
@@ -45,6 +45,8 @@ maximum_search_time 0
# # to be enabled for Pedant tests to work correctly
explicit_port_url true
+server_api_version 0
+
# We're starting to break tests up into groups based on different
# criteria. The proper API tests (the results of which are viewable
# to OPC customers) should be the only ones run by Pedant embedded in