diff options
author | John Keiser <john@johnkeiser.com> | 2015-11-03 17:25:07 -0800 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2015-11-03 17:25:07 -0800 |
commit | 0f61b7ebaf6823ab67e4c808830a52889617f709 (patch) | |
tree | 651d792476e48658e12768a63f6640f3bd63c977 | |
parent | 90b7b4e747c93cbf42e57bcaa9385830e713e2d1 (diff) | |
download | chef-0f61b7ebaf6823ab67e4c808830a52889617f709.tar.gz |
Use top level gemfile
-rw-r--r-- | pedant.gemfile | 4 | ||||
-rw-r--r-- | spec/support/pedant/Gemfile | 3 | ||||
-rw-r--r-- | spec/support/pedant/run_pedant.rb | 56 |
3 files changed, 30 insertions, 33 deletions
diff --git a/pedant.gemfile b/pedant.gemfile index 3302bccfe1..b5e9947215 100644 --- a/pedant.gemfile +++ b/pedant.gemfile @@ -4,9 +4,11 @@ gemspec :name => "chef" # TODO figure out how to grab this stuff from the main Gemfile gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" +gem 'oc-chef-pedant', :github => 'chef/chef-server', branch: 'e9bf7fe4440afd34856401831b30636100be958b' + # We are pinning chef-zero to 4.2.x until ChefFS can deal # with V1 api calls or chef-zero supports both v0 and v1 -gem "chef-zero", "~> 4.2.3" +gem "chef-zero", path: '../chef-zero' group(:docgen) do gem "tomlrb" diff --git a/spec/support/pedant/Gemfile b/spec/support/pedant/Gemfile deleted file mode 100644 index d4224cd439..0000000000 --- a/spec/support/pedant/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option" diff --git a/spec/support/pedant/run_pedant.rb b/spec/support/pedant/run_pedant.rb index f619a061fb..cb6be2a2e1 100644 --- a/spec/support/pedant/run_pedant.rb +++ b/spec/support/pedant/run_pedant.rb @@ -40,41 +40,39 @@ begin # Capture setup data into master_chef_repo_path server = start_server(chef_repo_path) - begin - require 'rspec/core' - require 'pedant' - require 'pedant/organization' + require 'pedant' + require 'pedant/organization' - #Pedant::Config.rerun = true + #Pedant::Config.rerun = true - Pedant.config.suite = 'api' - Pedant.config.internal_server = 'http://localhost:8889' - Pedant.config[:config_file] = 'spec/support/oc_pedant.rb' - Pedant.config[:server_api_version] = 0 - Pedant.setup([ - '--skip-knife', - '--skip-keys', - '--skip-controls', - '--skip-acl', - '--skip-validation', - '--skip-authentication', - '--skip-authorization', - '--skip-omnibus', - '--skip-usags', - '--exclude-internal-orgs', - '--skip-headers', + Pedant.config.suite = 'api' + Pedant.config.internal_server = 'http://localhost:8889' + Pedant.config[:config_file] = 'spec/support/pedant/pedant_config.rb' + Pedant.config[:server_api_version] = 0 + Pedant.setup([ + '--skip-knife', + '--skip-keys', + '--skip-controls', + '--skip-acl', + '--skip-validation', + '--skip-authentication', + '--skip-authorization', + '--skip-omnibus', + '--skip-usags', + '--exclude-internal-orgs', + '--skip-headers', - # Chef 12 features not yet 100% supported by Chef Zero - '--skip-policies', - '--skip-cookbook-artifacts', - '--skip-containers', - '--skip-api-v1' + # Chef 12 features not yet 100% supported by Chef Zero + '--skip-policies', + '--skip-cookbook-artifacts', + '--skip-containers', + '--skip-api-v1' - ]) + ]) - result = RSpec::Core::Runner.run(Pedant.config.rspec_args) + result = RSpec::Core::Runner.run(Pedant.config.rspec_args) - server.stop if server.running? + server.stop if server.running? ensure server.stop if server && server.running? |