diff options
author | Tom Duffield <tom@chef.io> | 2017-03-06 15:09:47 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-06 15:09:47 -0600 |
commit | 141af228bd48f5551bb9b1ed595e21b1f8c34012 (patch) | |
tree | 913bbae9ed310a34963ed2f01c1bbb9f87e9d5e1 | |
parent | 97840ea056879d102baf559e90035819de3991b7 (diff) | |
parent | 47e3fcf946d1e3fed8abe60094627e04263f65cc (diff) | |
download | chef-zero-141af228bd48f5551bb9b1ed595e21b1f8c34012.tar.gz |
Merge pull request #254 from chef/ssd/no-dep-veil
Remove veil dependency
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | spec/run_oc_pedant.rb | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -5,7 +5,6 @@ gemspec group :pedant do gem "oc-chef-pedant", :git => "https://github.com/chef/chef-server.git" - gem "veil", :git => "https://github.com/chef/chef_secrets.git" end group :changelog do diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index 70c5806..c68681c 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +require "json" require "bundler" require "bundler/setup" @@ -107,7 +108,9 @@ begin start_chef_server end - ENV["SECRETS_FILE"] = "spec/support/secrets.json" + test_secrets = JSON.parse(File.read("spec/support/secrets.json")) + ENV["SUPERUSER_KEY"] = test_secrets["chef-server"]["superuser_key"] + ENV["WEBUI_KEY"] = test_secrets["chef-server"]["webui_key"] require "rspec/core" require "pedant" |