diff options
| author | danielsdeleo <dan@getchef.com> | 2015-01-27 14:49:55 -0800 |
|---|---|---|
| committer | danielsdeleo <dan@getchef.com> | 2015-01-27 14:49:55 -0800 |
| commit | c8d59328d6ed3b1e4fb45c4d08bbf20a3be59e71 (patch) | |
| tree | fdd7fe4b41f5bd5c419c7eb2ff2b79851655c48e | |
| parent | 3840ba64b808a935451e450fe4691d96409d28f1 (diff) | |
| download | chef-zero-c8d59328d6ed3b1e4fb45c4d08bbf20a3be59e71.tar.gz | |
Update bundle and test config for latest pedant
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | spec/run_pedant.rb | 2 | ||||
| -rw-r--r-- | spec/support/pedant.rb | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -2,12 +2,6 @@ source 'https://rubygems.org' gemspec gem 'rest-client', :github => 'opscode/rest-client' -# TODO: REVERT THIS -#gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '81f3b4ecbc09d04950f2819b38a6a8f906ada2a7' +gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '0a3547aa38b98f57bf856aee055d42af4d2de06c' gem 'chef', :github => 'opscode/chef', :ref => 'a2dee150e68a611249577a8adcb2c3e329d6762d' -# TODO: REVERT THIS -gem 'chef-pedant', path: "../chef-pedant" - -# TODO: and this -gem 'oc-chef-pedant', path: "../oc-chef-pedant" diff --git a/spec/run_pedant.rb b/spec/run_pedant.rb index 3657da8..2caf1ff 100644 --- a/spec/run_pedant.rb +++ b/spec/run_pedant.rb @@ -72,11 +72,13 @@ begin Pedant.config.suite = 'api' Pedant.config[:config_file] = 'spec/support/pedant.rb' + Pedant.setup([ '--skip-knife', '--skip-validation', '--skip-authentication', '--skip-authorization', + '--skip-keys', '--skip-omnibus' ]) diff --git a/spec/support/pedant.rb b/spec/support/pedant.rb index d6100d2..29a0ec1 100644 --- a/spec/support/pedant.rb +++ b/spec/support/pedant.rb @@ -75,6 +75,10 @@ superuser_name 'admin' superuser_key key webui_key key +# The Policies endpoint is feature-flagged during development. Zero supports +# the policies endpoint, so turn it on: +policies? true + # Set the platform_class platform_class Pedant::OpenSourcePlatform |