summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-11-13 16:05:50 -0800
committerJohn Keiser <john@johnkeiser.com>2015-11-13 16:05:50 -0800
commit2d71904941dc80097f8d3ef59e6662a3edebcd93 (patch)
tree2cf73adb32721987a073fea17d3bcc98f4e09afb
parent0638635dcd860b76169de2a4b333511ed4ef200c (diff)
downloadchef-zero-2d71904941dc80097f8d3ef59e6662a3edebcd93.tar.gz
Associate pivotal with the org before going in
-rw-r--r--Gemfile4
-rw-r--r--spec/run_oc_pedant.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 2c7bde9..46d8928 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,10 +5,10 @@ gem 'rest-client', :github => 'chef/rest-client'
# we were using e9bf7fe4440afd34856401831b30636100be958b, but now float on latest release.
# gem 'oc-chef-pedant', :github => 'chef/chef-server'
-gem 'oc-chef-pedant', :path => "#{ENV['HOME']}/repos/chef-server"
+gem 'oc-chef-pedant', :path => "../chef-server"
# bundler resolve failure on "rspec_junit_formatter"
# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
# gem 'chef', :github => 'chef/chef'
-gem 'chef', :path => "#{ENV['HOME']}/repos/chef"
+gem 'chef', :path => "../chef"
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 7960894..45a4499 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -30,6 +30,7 @@ def start_cheffs_server(chef_repo_path)
data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'pedant-testorg')
data_store = ChefZero::DataStore::DefaultFacade.new(data_store, 'pedant-testorg', false)
+ data_store.create(%w(organizations pedant-testorg users), 'pivotal', '{}')
server = ChefZero::Server.new(
port: 8889,