diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-08-11 15:02:59 -0600 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-08-11 15:02:59 -0600 |
| commit | 64dfcde7df7670e2e85fe125a36e74379ed310bc (patch) | |
| tree | 5580cdeeb59d1d270216524a247ba4f518aa64d5 | |
| parent | 113e41ee7de1594c68025276de5c91afe719c99a (diff) | |
| parent | aabb201bf324f8c03fd0e55a51b91fa20e2fff55 (diff) | |
| download | chef-zero-mp/merge-pedants.tar.gz | |
Merge pull request #151 from andrewjamesbrown/andrewjamesbrown/gemspecsmp/merge-pedants
Switch to pedant in chef-server repo
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | spec/run_oc_pedant.rb | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -3,7 +3,7 @@ gemspec gem 'rest-client', :github => 'chef/rest-client' -gem 'oc-chef-pedant', :github => 'chef/oc-chef-pedant', :tag => '2.0.0' +gem 'oc-chef-pedant', :github => 'chef/chef-server' gem 'chef', :github => 'chef/chef', :tag => '12.4.1' diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index 053062a..efcaf8d 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -29,7 +29,9 @@ begin #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', @@ -40,8 +42,7 @@ begin '--skip-authorization', '--skip-omnibus', '--skip-usags', - '--skip-internal_orgs', - '--skip-rename_org', + '--exclude-internal-orgs', '--skip-headers' ]) |