diff options
author | Chris Doherty <cdoherty@chef.io> | 2015-11-10 16:24:11 -0800 |
---|---|---|
committer | Chris Doherty <cdoherty@chef.io> | 2015-11-10 16:24:11 -0800 |
commit | bf7ecbc1845133d07ca53098f86d2bcb5a97e834 (patch) | |
tree | 8d663148cff051a961471826f6ff2efec2a8954b | |
parent | 0c475039992d4c0f46e5ae25e9769d344a11d335 (diff) | |
download | chef-zero-bf7ecbc1845133d07ca53098f86d2bcb5a97e834.tar.gz |
Move search-related config to oc_pedant.rb.
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | spec/run_oc_pedant.rb | 6 | ||||
-rw-r--r-- | spec/support/oc_pedant.rb | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -8,3 +8,4 @@ gem 'rest-client', :github => 'chef/rest-client' gem 'oc-chef-pedant', :path => "#{ENV['HOME']}/repos/chef-server" gem 'chef', :github => 'chef/chef' +# gem 'chef', :path => "#{ENV['HOME']}/repos/chef" diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index 01ec4d8..a522998 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -70,11 +70,6 @@ begin # Pedant::Config.rerun = true Pedant.config.suite = 'api' - Pedant.config.internal_server = Pedant::Config.search_server = 'http://localhost:8889' - - # see dummy_endpoint.rb. - Pedant.config.search_commit_url = "/dummy" - 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' @@ -96,7 +91,6 @@ begin '--skip-cookbook-artifacts', '--skip-containers', '--skip-api-v1' - ]) result = RSpec::Core::Runner.run(Pedant.config.rspec_args) diff --git a/spec/support/oc_pedant.rb b/spec/support/oc_pedant.rb index bc78408..cc62dd4 100644 --- a/spec/support/oc_pedant.rb +++ b/spec/support/oc_pedant.rb @@ -47,6 +47,14 @@ explicit_port_url true server_api_version 0 +internal_server chef_server + +# see dummy_endpoint.rb for details. +search_server chef_server +search_commit_url "/dummy" +search_url_fmt "/dummy?fq=+X_CHEF_type_CHEF_X:%{type}&q=%{query}&wt=json" + + # 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 |