summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-09-23 12:48:31 -0700
committerJohn Keiser <john@johnkeiser.com>2015-09-23 14:08:52 -0700
commitefe6286540a56960e109dcc65db63cc7461c1753 (patch)
treedad6872cc3c4865fb2e4cf47c08fdfa772c025d0 /spec/integration
parent2ded4c34fdb2bf8b1f2caa8213cacd022db7084a (diff)
downloadchef-efe6286540a56960e109dcc65db63cc7461c1753.tar.gz
Re-upgrade chef-zero to latestjk/latest-chef-zero
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/knife/download_spec.rb4
-rw-r--r--spec/integration/knife/list_spec.rb8
-rw-r--r--spec/integration/knife/upload_spec.rb2
3 files changed, 13 insertions, 1 deletions
diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb
index c87e6fe20a..8842ed5ac4 100644
--- a/spec/integration/knife/download_spec.rb
+++ b/spec/integration/knife/download_spec.rb
@@ -1113,11 +1113,13 @@ Created /acls/clients/foo-validator.json
Created /acls/containers
Created /acls/containers/clients.json
Created /acls/containers/containers.json
+Created /acls/containers/cookbook_artifacts.json
Created /acls/containers/cookbooks.json
Created /acls/containers/data.json
Created /acls/containers/environments.json
Created /acls/containers/groups.json
Created /acls/containers/nodes.json
+Created /acls/containers/policies.json
Created /acls/containers/roles.json
Created /acls/containers/sandboxes.json
Created /acls/containers/x.json
@@ -1139,11 +1141,13 @@ Created /clients/foo-validator.json
Created /containers
Created /containers/clients.json
Created /containers/containers.json
+Created /containers/cookbook_artifacts.json
Created /containers/cookbooks.json
Created /containers/data.json
Created /containers/environments.json
Created /containers/groups.json
Created /containers/nodes.json
+Created /containers/policies.json
Created /containers/roles.json
Created /containers/sandboxes.json
Created /containers/x.json
diff --git a/spec/integration/knife/list_spec.rb b/spec/integration/knife/list_spec.rb
index 911b56ef18..b289642c7d 100644
--- a/spec/integration/knife/list_spec.rb
+++ b/spec/integration/knife/list_spec.rb
@@ -702,11 +702,13 @@ foo-validator.json
/acls/containers:
clients.json
containers.json
+cookbook_artifacts.json
cookbooks.json
data.json
environments.json
groups.json
nodes.json
+policies.json
roles.json
sandboxes.json
@@ -733,11 +735,13 @@ foo-validator.json
/containers:
clients.json
containers.json
+cookbook_artifacts.json
cookbooks.json
data.json
environments.json
groups.json
nodes.json
+policies.json
roles.json
sandboxes.json
@@ -804,11 +808,13 @@ foo-validator.json
/acls/containers:
clients.json
containers.json
+cookbook_artifacts.json
cookbooks.json
data.json
environments.json
groups.json
nodes.json
+policies.json
roles.json
sandboxes.json
@@ -835,11 +841,13 @@ foo-validator.json
/containers:
clients.json
containers.json
+cookbook_artifacts.json
cookbooks.json
data.json
environments.json
groups.json
nodes.json
+policies.json
roles.json
sandboxes.json
diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb
index 826ecec364..6ca8c3d8ce 100644
--- a/spec/integration/knife/upload_spec.rb
+++ b/spec/integration/knife/upload_spec.rb
@@ -198,7 +198,7 @@ Created /nodes/y.json
Created /roles/y.json
Created /users/y.json
EOM
- knife('diff --name-status /').should_succeed ''
+ knife('diff /').should_succeed ''
end
it 'knife upload --no-diff adds the new files' do