Merge remote-tracking branch 'origin/master' into mrtazz/pkgng-exit-code-fix

Signed-off-by: Daniel Schauenberg <d@unwiredcouch.com>

1 files changed, 593 insertions, 590 deletions

diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb
index be0fc9d708..7bdec7b356 100644
--- a/spec/integration/knife/download_spec.rb
+++ b/spec/integration/knife/download_spec.rb
@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "spec_helper"
 require "support/shared/integration/integration_helper"
 require "chef/knife/download"
 require "chef/knife/diff"
@@ -48,21 +49,21 @@ describe "knife download", :workstation do
         end
 
         it "knife download downloads everything" do
-          knife("download /").should_succeed <<EOM
-Created /clients/chef-validator.json
-Created /clients/chef-webui.json
-Created /clients/x.json
-Created /cookbooks/x
-Created /cookbooks/x/metadata.rb
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments/_default.json
-Created /environments/x.json
-Created /nodes/x.json
-Created /roles/x.json
-Created /users/admin.json
-Created /users/x.json
-EOM
+          knife("download /").should_succeed <<~EOM
+            Created /clients/chef-validator.json
+            Created /clients/chef-webui.json
+            Created /clients/x.json
+            Created /cookbooks/x
+            Created /cookbooks/x/metadata.rb
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments/_default.json
+            Created /environments/x.json
+            Created /nodes/x.json
+            Created /roles/x.json
+            Created /users/admin.json
+            Created /users/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
       end
@@ -94,23 +95,23 @@ EOM
 
         context "except the role file" do
           before do
-            file "roles/x.json", <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "blarghle",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
+            file "roles/x.json", <<~EOM
+              {
+                "chef_type": "role",
+                "default_attributes": {
+                },
+                "description": "blarghle",
+                "env_run_lists": {
+                },
+                "json_class": "Chef::Role",
+                "name": "x",
+                "override_attributes": {
+                },
+                "run_list": [
+
+                ]
+              }
+            EOM
           end
 
           it "knife download changes the role" do
@@ -126,23 +127,23 @@ EOM
 
         context "except the role file is textually different, but not ACTUALLY different" do
           before do
-            file "roles/x.json", <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "description": "",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
+            file "roles/x.json", <<~EOM
+              {
+                "chef_type": "role",
+                "default_attributes": {
+                },
+                "env_run_lists": {
+                },
+                "json_class": "Chef::Role",
+                "name": "x",
+                "description": "",
+                "override_attributes": {
+                },
+                "run_list": [
+
+                ]
+              }
+            EOM
           end
 
           it "knife download / does not change anything" do
@@ -166,31 +167,31 @@ EOM
 
           it "knife download does nothing" do
             knife("download /").should_succeed ""
-            knife("diff --name-status /").should_succeed <<EOM
-A\t/clients/y.json
-A\t/cookbooks/x/blah.rb
-A\t/cookbooks/y
-A\t/data_bags/x/z.json
-A\t/data_bags/y
-A\t/environments/y.json
-A\t/nodes/y.json
-A\t/roles/y.json
-A\t/users/y.json
-EOM
+            knife("diff --name-status /").should_succeed <<~EOM
+              A\t/clients/y.json
+              A\t/cookbooks/x/blah.rb
+              A\t/cookbooks/y
+              A\t/data_bags/x/z.json
+              A\t/data_bags/y
+              A\t/environments/y.json
+              A\t/nodes/y.json
+              A\t/roles/y.json
+              A\t/users/y.json
+            EOM
           end
 
           it "knife download --purge deletes the extra files" do
-            knife("download --purge /").should_succeed <<EOM
-Deleted extra entry /clients/y.json (purge is on)
-Deleted extra entry /cookbooks/x/blah.rb (purge is on)
-Deleted extra entry /cookbooks/y (purge is on)
-Deleted extra entry /data_bags/x/z.json (purge is on)
-Deleted extra entry /data_bags/y (purge is on)
-Deleted extra entry /environments/y.json (purge is on)
-Deleted extra entry /nodes/y.json (purge is on)
-Deleted extra entry /roles/y.json (purge is on)
-Deleted extra entry /users/y.json (purge is on)
-EOM
+            knife("download --purge /").should_succeed <<~EOM
+              Deleted extra entry /clients/y.json (purge is on)
+              Deleted extra entry /cookbooks/x/blah.rb (purge is on)
+              Deleted extra entry /cookbooks/y (purge is on)
+              Deleted extra entry /data_bags/x/z.json (purge is on)
+              Deleted extra entry /data_bags/y (purge is on)
+              Deleted extra entry /environments/y.json (purge is on)
+              Deleted extra entry /nodes/y.json (purge is on)
+              Deleted extra entry /roles/y.json (purge is on)
+              Deleted extra entry /users/y.json (purge is on)
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end
@@ -198,54 +199,54 @@ EOM
 
       when_the_repository "is empty" do
         it "knife download creates the extra files" do
-          knife("download /").should_succeed <<EOM
-Created /clients
-Created /clients/chef-validator.json
-Created /clients/chef-webui.json
-Created /clients/x.json
-Created /cookbooks
-Created /cookbooks/x
-Created /cookbooks/x/metadata.rb
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments
-Created /environments/_default.json
-Created /environments/x.json
-Created /nodes
-Created /nodes/x.json
-Created /roles
-Created /roles/x.json
-Created /users
-Created /users/admin.json
-Created /users/x.json
-EOM
+          knife("download /").should_succeed <<~EOM
+            Created /clients
+            Created /clients/chef-validator.json
+            Created /clients/chef-webui.json
+            Created /clients/x.json
+            Created /cookbooks
+            Created /cookbooks/x
+            Created /cookbooks/x/metadata.rb
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments
+            Created /environments/_default.json
+            Created /environments/x.json
+            Created /nodes
+            Created /nodes/x.json
+            Created /roles
+            Created /roles/x.json
+            Created /users
+            Created /users/admin.json
+            Created /users/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
         it "knife download --no-diff creates the extra files" do
-          knife("download --no-diff /").should_succeed <<EOM
-Created /clients
-Created /clients/chef-validator.json
-Created /clients/chef-webui.json
-Created /clients/x.json
-Created /cookbooks
-Created /cookbooks/x
-Created /cookbooks/x/metadata.rb
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments
-Created /environments/_default.json
-Created /environments/x.json
-Created /nodes
-Created /nodes/x.json
-Created /roles
-Created /roles/x.json
-Created /users
-Created /users/admin.json
-Created /users/x.json
-EOM
+          knife("download --no-diff /").should_succeed <<~EOM
+            Created /clients
+            Created /clients/chef-validator.json
+            Created /clients/chef-webui.json
+            Created /clients/x.json
+            Created /cookbooks
+            Created /cookbooks/x
+            Created /cookbooks/x/metadata.rb
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments
+            Created /environments/_default.json
+            Created /environments/x.json
+            Created /nodes
+            Created /nodes/x.json
+            Created /roles
+            Created /roles/x.json
+            Created /users
+            Created /users/admin.json
+            Created /users/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -255,7 +256,7 @@ EOM
           end
 
           it "knife download with no parameters reports an error" do
-            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
+            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
           end
         end
       end
@@ -269,44 +270,44 @@ EOM
         end
 
         it "knife download of one data bag item itself succeeds" do
-          knife("download /data_bags/x/y.json").should_succeed <<EOM
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/z.json
-EOM
+          knife("download /data_bags/x/y.json").should_succeed <<~EOM
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/z.json
+          EOM
         end
 
         it "knife download /data_bags/x /data_bags/x/y.json downloads x once" do
-          knife("download /data_bags/x /data_bags/x/y.json").should_succeed <<EOM
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /data_bags/x/z.json
-EOM
+          knife("download /data_bags/x /data_bags/x/y.json").should_succeed <<~EOM
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /data_bags/x/z.json
+          EOM
         end
       end
     end
 
     when_the_repository "has three data bag items" do
       before do
-        file "data_bags/x/deleted.json", <<EOM
-{
-  "id": "deleted"
-}
-EOM
-        file "data_bags/x/modified.json", <<EOM
-{
-  "id": "modified"
-}
-EOM
-        file "data_bags/x/unmodified.json", <<EOM
-{
-  "id": "unmodified"
-}
-EOM
+        file "data_bags/x/deleted.json", <<~EOM
+          {
+            "id": "deleted"
+          }
+        EOM
+        file "data_bags/x/modified.json", <<~EOM
+          {
+            "id": "modified"
+          }
+        EOM
+        file "data_bags/x/unmodified.json", <<~EOM
+          {
+            "id": "unmodified"
+          }
+        EOM
       end
 
       when_the_chef_server "has a modified, unmodified, added and deleted data bag item" do
@@ -319,63 +320,63 @@ EOM
         end
 
         it "knife download of the modified file succeeds" do
-          knife("download /data_bags/x/modified.json").should_succeed <<EOM
-Updated /data_bags/x/modified.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x/modified.json").should_succeed <<~EOM
+            Updated /data_bags/x/modified.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the unmodified file does nothing" do
           knife("download /data_bags/x/unmodified.json").should_succeed ""
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the added file succeeds" do
-          knife("download /data_bags/x/added.json").should_succeed <<EOM
-Created /data_bags/x/added.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x/added.json").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the deleted file does nothing" do
           knife("download /data_bags/x/deleted.json").should_succeed ""
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download --purge of the deleted file deletes it" do
-          knife("download --purge /data_bags/x/deleted.json").should_succeed <<EOM
-Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-EOM
+          knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
+            Deleted extra entry /data_bags/x/deleted.json (purge is on)
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+          EOM
         end
         it "knife download of the entire data bag downloads everything" do
-          knife("download /data_bags/x").should_succeed <<EOM
-Created /data_bags/x/added.json
-Updated /data_bags/x/modified.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+            Updated /data_bags/x/modified.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download --purge of the entire data bag downloads everything" do
-          knife("download --purge /data_bags/x").should_succeed <<EOM
-Created /data_bags/x/added.json
-Updated /data_bags/x/modified.json
-Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          knife("download --purge /data_bags/x").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+            Updated /data_bags/x/modified.json
+            Deleted extra entry /data_bags/x/deleted.json (purge is on)
+          EOM
           knife("diff --name-status /data_bags").should_succeed ""
         end
         context "when cwd is the /data_bags directory" do
@@ -383,22 +384,22 @@ EOM
             cwd "data_bags"
           end
           it "knife download fails" do
-            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
+            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
           end
           it "knife download --purge . downloads everything" do
-            knife("download --purge .").should_succeed <<EOM
-Created x/added.json
-Updated x/modified.json
-Deleted extra entry x/deleted.json (purge is on)
-EOM
+            knife("download --purge .").should_succeed <<~EOM
+              Created x/added.json
+              Updated x/modified.json
+              Deleted extra entry x/deleted.json (purge is on)
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
           it "knife download --purge * downloads everything" do
-            knife("download --purge *").should_succeed <<EOM
-Created x/added.json
-Updated x/modified.json
-Deleted extra entry x/deleted.json (purge is on)
-EOM
+            knife("download --purge *").should_succeed <<~EOM
+              Created x/added.json
+              Updated x/modified.json
+              Deleted extra entry x/deleted.json (purge is on)
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
         end
@@ -418,48 +419,48 @@ EOM
 
         it "knife download of a modified file succeeds" do
           knife("download /cookbooks/x/metadata.rb").should_succeed "Updated /cookbooks/x/metadata.rb\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-D\t/cookbooks/x/y.rb
-A\t/cookbooks/x/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            D\t/cookbooks/x/y.rb
+            A\t/cookbooks/x/z.rb
+          EOM
         end
         it "knife download of a deleted file does nothing" do
           knife("download /cookbooks/x/z.rb").should_succeed ""
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x/metadata.rb
-D\t/cookbooks/x/y.rb
-A\t/cookbooks/x/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x/metadata.rb
+            D\t/cookbooks/x/y.rb
+            A\t/cookbooks/x/z.rb
+          EOM
         end
         it "knife download --purge of a deleted file succeeds" do
           knife("download --purge /cookbooks/x/z.rb").should_succeed "Deleted extra entry /cookbooks/x/z.rb (purge is on)\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x/metadata.rb
-D\t/cookbooks/x/y.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x/metadata.rb
+            D\t/cookbooks/x/y.rb
+          EOM
         end
         it "knife download of an added file succeeds" do
           knife("download /cookbooks/x/y.rb").should_succeed "Created /cookbooks/x/y.rb\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x/metadata.rb
-A\t/cookbooks/x/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x/metadata.rb
+            A\t/cookbooks/x/z.rb
+          EOM
         end
         it "knife download of the cookbook itself succeeds" do
-          knife("download /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/metadata.rb
-Created /cookbooks/x/y.rb
-EOM
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-A\t/cookbooks/x/z.rb
-EOM
+          knife("download /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/metadata.rb
+            Created /cookbooks/x/y.rb
+          EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            A\t/cookbooks/x/z.rb
+          EOM
         end
         it "knife download --purge of the cookbook itself succeeds" do
-          knife("download --purge /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/metadata.rb
-Created /cookbooks/x/y.rb
-Deleted extra entry /cookbooks/x/z.rb (purge is on)
-EOM
+          knife("download --purge /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/metadata.rb
+            Created /cookbooks/x/y.rb
+            Deleted extra entry /cookbooks/x/z.rb (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -478,11 +479,11 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the latest version" do
-          knife("download --purge /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/metadata.rb
-Created /cookbooks/x/onlyin1.0.1.rb
-Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          knife("download --purge /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/metadata.rb
+            Created /cookbooks/x/onlyin1.0.1.rb
+            Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -494,9 +495,9 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the updated file" do
-          knife("download --purge /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/onlyin1.0.0.rb
-EOM
+          knife("download --purge /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/onlyin1.0.0.rb
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -507,11 +508,11 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the latest version" do
-          knife("download --purge /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/metadata.rb
-Created /cookbooks/x/onlyin1.0.1.rb
-Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          knife("download --purge /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/metadata.rb
+            Created /cookbooks/x/onlyin1.0.1.rb
+            Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -522,11 +523,11 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the old version" do
-          knife("download --purge /cookbooks/x").should_succeed <<EOM
-Updated /cookbooks/x/metadata.rb
-Created /cookbooks/x/onlyin0.9.9.rb
-Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
-EOM
+          knife("download --purge /cookbooks/x").should_succeed <<~EOM
+            Updated /cookbooks/x/metadata.rb
+            Created /cookbooks/x/onlyin0.9.9.rb
+            Deleted extra entry /cookbooks/x/onlyin1.0.0.rb (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -538,14 +539,14 @@ EOM
       end
       when_the_repository "has the role in ruby" do
         before do
-          file "roles/x.rb", <<EOM
-name "x"
-description "x"
-EOM
+          file "roles/x.rb", <<~EOM
+            name "x"
+            description "x"
+          EOM
         end
 
         it "knife download refuses to change the role" do
-          knife("download /roles/x.json").should_succeed "", :stderr => "WARNING: /roles/x.rb cannot be updated (can't safely update ruby files).\n"
+          knife("download /roles/x.json").should_succeed "", stderr: "WARNING: /roles/x.rb cannot be updated (can't safely update ruby files).\n"
           knife("diff --name-status /roles/x.json").should_succeed "M\t/roles/x.rb\n"
         end
       end
@@ -560,13 +561,13 @@ EOM
           file "environments/x.json", "{"
         end
         it "knife download succeeds" do
-          warning = <<-EOH
-WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF
-                                       {
-                     (right here) ------^
+          warning = <<~EOH
+            WARN: Parse error reading #{path_to("environments/x.json")} as JSON: parse error: premature EOF
+                                                   {
+                                 (right here) ------^
 
-EOH
-          knife("download /environments/x.json").should_succeed "Updated /environments/x.json\n", :stderr => warning
+          EOH
+          knife("download /environments/x.json").should_succeed "Updated /environments/x.json\n", stderr: warning
           knife("diff --name-status /environments/x.json").should_succeed ""
         end
       end
@@ -593,7 +594,9 @@ EOH
     end
   end # without versioned cookbooks
 
-  with_versioned_cookbooks do
+  context "with versioned cookbooks" do
+    before { Chef::Config[:versioned_cookbooks] = true }
+
     when_the_chef_server "has one of each thing" do
       before do
         client "x", {}
@@ -617,21 +620,21 @@ EOH
         end
 
         it "knife download downloads everything" do
-          knife("download /").should_succeed <<EOM
-Created /clients/chef-validator.json
-Created /clients/chef-webui.json
-Created /clients/x.json
-Created /cookbooks/x-1.0.0
-Created /cookbooks/x-1.0.0/metadata.rb
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments/_default.json
-Created /environments/x.json
-Created /nodes/x.json
-Created /roles/x.json
-Created /users/admin.json
-Created /users/x.json
-EOM
+          knife("download /").should_succeed <<~EOM
+            Created /clients/chef-validator.json
+            Created /clients/chef-webui.json
+            Created /clients/x.json
+            Created /cookbooks/x-1.0.0
+            Created /cookbooks/x-1.0.0/metadata.rb
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments/_default.json
+            Created /environments/x.json
+            Created /nodes/x.json
+            Created /roles/x.json
+            Created /users/admin.json
+            Created /users/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
       end
@@ -674,23 +677,23 @@ EOM
 
         context "except the role file is textually different, but not ACTUALLY different" do
           before do
-            file "roles/x.json", <<EOM
-{
-  "chef_type": "role" ,
-  "default_attributes": {
-  },
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "description": "",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
+            file "roles/x.json", <<~EOM
+              {
+                "chef_type": "role" ,
+                "default_attributes": {
+                },
+                "env_run_lists": {
+                },
+                "json_class": "Chef::Role",
+                "name": "x",
+                "description": "",
+                "override_attributes": {
+                },
+                "run_list": [
+
+                ]
+              }
+            EOM
           end
 
           it "knife download / does not change anything" do
@@ -715,33 +718,33 @@ EOM
 
           it "knife download does nothing" do
             knife("download /").should_succeed ""
-            knife("diff --name-status /").should_succeed <<EOM
-A\t/clients/y.json
-A\t/cookbooks/x-1.0.0/blah.rb
-A\t/cookbooks/x-2.0.0
-A\t/cookbooks/y-1.0.0
-A\t/data_bags/x/z.json
-A\t/data_bags/y
-A\t/environments/y.json
-A\t/nodes/y.json
-A\t/roles/y.json
-A\t/users/y.json
-EOM
+            knife("diff --name-status /").should_succeed <<~EOM
+              A\t/clients/y.json
+              A\t/cookbooks/x-1.0.0/blah.rb
+              A\t/cookbooks/x-2.0.0
+              A\t/cookbooks/y-1.0.0
+              A\t/data_bags/x/z.json
+              A\t/data_bags/y
+              A\t/environments/y.json
+              A\t/nodes/y.json
+              A\t/roles/y.json
+              A\t/users/y.json
+            EOM
           end
 
           it "knife download --purge deletes the extra files" do
-            knife("download --purge /").should_succeed <<EOM
-Deleted extra entry /clients/y.json (purge is on)
-Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
-Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
-Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
-Deleted extra entry /data_bags/x/z.json (purge is on)
-Deleted extra entry /data_bags/y (purge is on)
-Deleted extra entry /environments/y.json (purge is on)
-Deleted extra entry /nodes/y.json (purge is on)
-Deleted extra entry /roles/y.json (purge is on)
-Deleted extra entry /users/y.json (purge is on)
-EOM
+            knife("download --purge /").should_succeed <<~EOM
+              Deleted extra entry /clients/y.json (purge is on)
+              Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
+              Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
+              Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
+              Deleted extra entry /data_bags/x/z.json (purge is on)
+              Deleted extra entry /data_bags/y (purge is on)
+              Deleted extra entry /environments/y.json (purge is on)
+              Deleted extra entry /nodes/y.json (purge is on)
+              Deleted extra entry /roles/y.json (purge is on)
+              Deleted extra entry /users/y.json (purge is on)
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end
@@ -749,28 +752,28 @@ EOM
 
       when_the_repository "is empty" do
         it "knife download creates the extra files" do
-          knife("download /").should_succeed <<EOM
-Created /clients
-Created /clients/chef-validator.json
-Created /clients/chef-webui.json
-Created /clients/x.json
-Created /cookbooks
-Created /cookbooks/x-1.0.0
-Created /cookbooks/x-1.0.0/metadata.rb
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments
-Created /environments/_default.json
-Created /environments/x.json
-Created /nodes
-Created /nodes/x.json
-Created /roles
-Created /roles/x.json
-Created /users
-Created /users/admin.json
-Created /users/x.json
-EOM
+          knife("download /").should_succeed <<~EOM
+            Created /clients
+            Created /clients/chef-validator.json
+            Created /clients/chef-webui.json
+            Created /clients/x.json
+            Created /cookbooks
+            Created /cookbooks/x-1.0.0
+            Created /cookbooks/x-1.0.0/metadata.rb
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments
+            Created /environments/_default.json
+            Created /environments/x.json
+            Created /nodes
+            Created /nodes/x.json
+            Created /roles
+            Created /roles/x.json
+            Created /users
+            Created /users/admin.json
+            Created /users/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -779,7 +782,7 @@ EOM
             cwd "."
           end
           it "knife download with no parameters reports an error" do
-            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
+            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
           end
         end
       end
@@ -793,35 +796,35 @@ EOM
         end
 
         it "knife download of one data bag item itself succeeds" do
-          knife("download /data_bags/x/y.json").should_succeed <<EOM
-Created /data_bags
-Created /data_bags/x
-Created /data_bags/x/y.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/z.json
-EOM
+          knife("download /data_bags/x/y.json").should_succeed <<~EOM
+            Created /data_bags
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/z.json
+          EOM
         end
       end
     end
 
     when_the_repository "has three data bag items" do
       before do
-        file "data_bags/x/deleted.json", <<EOM
-{
-  "id": "deleted"
-}
-EOM
-        file "data_bags/x/modified.json", <<EOM
-{
-  "id": "modified"
-}
-EOM
-        file "data_bags/x/unmodified.json", <<EOM
-{
-  "id": "unmodified"
-}
-EOM
+        file "data_bags/x/deleted.json", <<~EOM
+          {
+            "id": "deleted"
+          }
+        EOM
+        file "data_bags/x/modified.json", <<~EOM
+          {
+            "id": "modified"
+          }
+        EOM
+        file "data_bags/x/unmodified.json", <<~EOM
+          {
+            "id": "unmodified"
+          }
+        EOM
       end
 
       when_the_chef_server "has a modified, unmodified, added and deleted data bag item" do
@@ -834,63 +837,63 @@ EOM
         end
 
         it "knife download of the modified file succeeds" do
-          knife("download /data_bags/x/modified.json").should_succeed <<EOM
-Updated /data_bags/x/modified.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x/modified.json").should_succeed <<~EOM
+            Updated /data_bags/x/modified.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the unmodified file does nothing" do
           knife("download /data_bags/x/unmodified.json").should_succeed ""
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the added file succeeds" do
-          knife("download /data_bags/x/added.json").should_succeed <<EOM
-Created /data_bags/x/added.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x/added.json").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download of the deleted file does nothing" do
           knife("download /data_bags/x/deleted.json").should_succeed ""
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-A\t/data_bags/x/deleted.json
-EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download --purge of the deleted file deletes it" do
-          knife("download --purge /data_bags/x/deleted.json").should_succeed <<EOM
-Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-D\t/data_bags/x/added.json
-M\t/data_bags/x/modified.json
-EOM
+          knife("download --purge /data_bags/x/deleted.json").should_succeed <<~EOM
+            Deleted extra entry /data_bags/x/deleted.json (purge is on)
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            D\t/data_bags/x/added.json
+            M\t/data_bags/x/modified.json
+          EOM
         end
         it "knife download of the entire data bag downloads everything" do
-          knife("download /data_bags/x").should_succeed <<EOM
-Created /data_bags/x/added.json
-Updated /data_bags/x/modified.json
-EOM
-          knife("diff --name-status /data_bags").should_succeed <<EOM
-A\t/data_bags/x/deleted.json
-EOM
+          knife("download /data_bags/x").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+            Updated /data_bags/x/modified.json
+          EOM
+          knife("diff --name-status /data_bags").should_succeed <<~EOM
+            A\t/data_bags/x/deleted.json
+          EOM
         end
         it "knife download --purge of the entire data bag downloads everything" do
-          knife("download --purge /data_bags/x").should_succeed <<EOM
-Created /data_bags/x/added.json
-Updated /data_bags/x/modified.json
-Deleted extra entry /data_bags/x/deleted.json (purge is on)
-EOM
+          knife("download --purge /data_bags/x").should_succeed <<~EOM
+            Created /data_bags/x/added.json
+            Updated /data_bags/x/modified.json
+            Deleted extra entry /data_bags/x/deleted.json (purge is on)
+          EOM
           knife("diff --name-status /data_bags").should_succeed ""
         end
         context "when cwd is the /data_bags directory" do
@@ -898,22 +901,22 @@ EOM
             cwd "data_bags"
           end
           it "knife download fails" do
-            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", :stdout => /USAGE/
+            knife("download").should_fail "FATAL: You must specify at least one argument. If you want to download everything in this directory, run \"knife download .\"\n", stdout: /USAGE/
           end
           it "knife download --purge . downloads everything" do
-            knife("download --purge .").should_succeed <<EOM
-Created x/added.json
-Updated x/modified.json
-Deleted extra entry x/deleted.json (purge is on)
-EOM
+            knife("download --purge .").should_succeed <<~EOM
+              Created x/added.json
+              Updated x/modified.json
+              Deleted extra entry x/deleted.json (purge is on)
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
           it "knife download --purge * downloads everything" do
-            knife("download --purge *").should_succeed <<EOM
-Created x/added.json
-Updated x/modified.json
-Deleted extra entry x/deleted.json (purge is on)
-EOM
+            knife("download --purge *").should_succeed <<~EOM
+              Created x/added.json
+              Updated x/modified.json
+              Deleted extra entry x/deleted.json (purge is on)
+            EOM
             knife("diff --name-status /data_bags").should_succeed ""
           end
         end
@@ -933,48 +936,48 @@ EOM
 
         it "knife download of a modified file succeeds" do
           knife("download /cookbooks/x-1.0.0/metadata.rb").should_succeed "Updated /cookbooks/x-1.0.0/metadata.rb\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-D\t/cookbooks/x-1.0.0/y.rb
-A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            D\t/cookbooks/x-1.0.0/y.rb
+            A\t/cookbooks/x-1.0.0/z.rb
+          EOM
         end
         it "knife download of a deleted file does nothing" do
           knife("download /cookbooks/x-1.0.0/z.rb").should_succeed ""
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x-1.0.0/metadata.rb
-D\t/cookbooks/x-1.0.0/y.rb
-A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x-1.0.0/metadata.rb
+            D\t/cookbooks/x-1.0.0/y.rb
+            A\t/cookbooks/x-1.0.0/z.rb
+          EOM
         end
         it "knife download --purge of a deleted file succeeds" do
           knife("download --purge /cookbooks/x-1.0.0/z.rb").should_succeed "Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x-1.0.0/metadata.rb
-D\t/cookbooks/x-1.0.0/y.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x-1.0.0/metadata.rb
+            D\t/cookbooks/x-1.0.0/y.rb
+          EOM
         end
         it "knife download of an added file succeeds" do
           knife("download /cookbooks/x-1.0.0/y.rb").should_succeed "Created /cookbooks/x-1.0.0/y.rb\n"
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-M\t/cookbooks/x-1.0.0/metadata.rb
-A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            M\t/cookbooks/x-1.0.0/metadata.rb
+            A\t/cookbooks/x-1.0.0/z.rb
+          EOM
         end
         it "knife download of the cookbook itself succeeds" do
-          knife("download /cookbooks/x-1.0.0").should_succeed <<EOM
-Updated /cookbooks/x-1.0.0/metadata.rb
-Created /cookbooks/x-1.0.0/y.rb
-EOM
-          knife("diff --name-status /cookbooks").should_succeed <<EOM
-A\t/cookbooks/x-1.0.0/z.rb
-EOM
+          knife("download /cookbooks/x-1.0.0").should_succeed <<~EOM
+            Updated /cookbooks/x-1.0.0/metadata.rb
+            Created /cookbooks/x-1.0.0/y.rb
+          EOM
+          knife("diff --name-status /cookbooks").should_succeed <<~EOM
+            A\t/cookbooks/x-1.0.0/z.rb
+          EOM
         end
         it "knife download --purge of the cookbook itself succeeds" do
-          knife("download --purge /cookbooks/x-1.0.0").should_succeed <<EOM
-Updated /cookbooks/x-1.0.0/metadata.rb
-Created /cookbooks/x-1.0.0/y.rb
-Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
-EOM
+          knife("download --purge /cookbooks/x-1.0.0").should_succeed <<~EOM
+            Updated /cookbooks/x-1.0.0/metadata.rb
+            Created /cookbooks/x-1.0.0/y.rb
+            Deleted extra entry /cookbooks/x-1.0.0/z.rb (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -993,12 +996,12 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the latest version" do
-          knife("download --purge /cookbooks").should_succeed <<EOM
-Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
-Created /cookbooks/x-1.0.1
-Created /cookbooks/x-1.0.1/metadata.rb
-Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
-EOM
+          knife("download --purge /cookbooks").should_succeed <<~EOM
+            Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
+            Created /cookbooks/x-1.0.1
+            Created /cookbooks/x-1.0.1/metadata.rb
+            Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1010,12 +1013,12 @@ EOM
         end
 
         it "knife download /cookbooks downloads the updated file" do
-          knife("download --purge /cookbooks").should_succeed <<EOM
-Created /cookbooks/x-0.9.9
-Created /cookbooks/x-0.9.9/metadata.rb
-Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
-Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
-EOM
+          knife("download --purge /cookbooks").should_succeed <<~EOM
+            Created /cookbooks/x-0.9.9
+            Created /cookbooks/x-0.9.9/metadata.rb
+            Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
+            Updated /cookbooks/x-1.0.0/onlyin1.0.0.rb
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1026,12 +1029,12 @@ EOM
         end
 
         it "knife download /cookbooks/x downloads the latest version" do
-          knife("download --purge /cookbooks").should_succeed <<EOM
-Created /cookbooks/x-1.0.1
-Created /cookbooks/x-1.0.1/metadata.rb
-Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
-Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
-EOM
+          knife("download --purge /cookbooks").should_succeed <<~EOM
+            Created /cookbooks/x-1.0.1
+            Created /cookbooks/x-1.0.1/metadata.rb
+            Created /cookbooks/x-1.0.1/onlyin1.0.1.rb
+            Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1042,12 +1045,12 @@ EOM
         end
 
         it "knife download --purge /cookbooks downloads the old version and deletes the new version" do
-          knife("download --purge /cookbooks").should_succeed <<EOM
-Created /cookbooks/x-0.9.9
-Created /cookbooks/x-0.9.9/metadata.rb
-Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
-Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
-EOM
+          knife("download --purge /cookbooks").should_succeed <<~EOM
+            Created /cookbooks/x-0.9.9
+            Created /cookbooks/x-0.9.9/metadata.rb
+            Created /cookbooks/x-0.9.9/onlyin0.9.9.rb
+            Deleted extra entry /cookbooks/x-1.0.0 (purge is on)
+          EOM
           knife("diff --name-status /cookbooks").should_succeed ""
         end
       end
@@ -1102,16 +1105,16 @@ EOM
           new_result
         }.at_least(:once)
 
-        knife("download /cookbooks/x").should_succeed <<EOM
-Created /cookbooks
-Created /cookbooks/x
-Created /cookbooks/x/metadata.rb
-EOM
+        knife("download /cookbooks/x").should_succeed <<~EOM
+          Created /cookbooks
+          Created /cookbooks/x
+          Created /cookbooks/x/metadata.rb
+        EOM
       end
     end
   end
 
-  when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
+  when_the_chef_server "is in Enterprise mode", osc_compat: false, single_org: false do
     before do
       user "foo", {}
       user "bar", {}
@@ -1125,71 +1128,71 @@ EOM
 
     when_the_repository "has all the default stuff" do
       before do
-        knife("download /").should_succeed <<EOM
-Created /acls
-Created /acls/clients
-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/policy_groups.json
-Created /acls/containers/roles.json
-Created /acls/containers/sandboxes.json
-Created /acls/cookbook_artifacts
-Created /acls/cookbooks
-Created /acls/data_bags
-Created /acls/environments
-Created /acls/environments/_default.json
-Created /acls/groups
-Created /acls/groups/admins.json
-Created /acls/groups/billing-admins.json
-Created /acls/groups/clients.json
-Created /acls/groups/users.json
-Created /acls/nodes
-Created /acls/policies
-Created /acls/policy_groups
-Created /acls/roles
-Created /acls/organization.json
-Created /clients
-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/policy_groups.json
-Created /containers/roles.json
-Created /containers/sandboxes.json
-Created /cookbook_artifacts
-Created /cookbooks
-Created /data_bags
-Created /environments
-Created /environments/_default.json
-Created /groups
-Created /groups/admins.json
-Created /groups/billing-admins.json
-Created /groups/clients.json
-Created /groups/users.json
-Created /invitations.json
-Created /members.json
-Created /nodes
-Created /org.json
-Created /policies
-Created /policy_groups
-Created /roles
-EOM
+        knife("download /").should_succeed <<~EOM
+          Created /acls
+          Created /acls/clients
+          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/policy_groups.json
+          Created /acls/containers/roles.json
+          Created /acls/containers/sandboxes.json
+          Created /acls/cookbook_artifacts
+          Created /acls/cookbooks
+          Created /acls/data_bags
+          Created /acls/environments
+          Created /acls/environments/_default.json
+          Created /acls/groups
+          Created /acls/groups/admins.json
+          Created /acls/groups/billing-admins.json
+          Created /acls/groups/clients.json
+          Created /acls/groups/users.json
+          Created /acls/nodes
+          Created /acls/policies
+          Created /acls/policy_groups
+          Created /acls/roles
+          Created /acls/organization.json
+          Created /clients
+          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/policy_groups.json
+          Created /containers/roles.json
+          Created /containers/sandboxes.json
+          Created /cookbook_artifacts
+          Created /cookbooks
+          Created /data_bags
+          Created /environments
+          Created /environments/_default.json
+          Created /groups
+          Created /groups/admins.json
+          Created /groups/billing-admins.json
+          Created /groups/clients.json
+          Created /groups/users.json
+          Created /invitations.json
+          Created /members.json
+          Created /nodes
+          Created /org.json
+          Created /policies
+          Created /policy_groups
+          Created /roles
+        EOM
       end
 
       context "and the server has one of each thing" do
@@ -1217,44 +1220,44 @@ EOM
         end
 
         before do
-          knife("download /acls /groups/clients.json /groups/users.json").should_succeed <<-EOM
-Created /acls/clients/x.json
-Created /acls/containers/x.json
-Created /acls/cookbook_artifacts/x.json
-Created /acls/cookbooks/x.json
-Created /acls/data_bags/x.json
-Created /acls/environments/x.json
-Created /acls/groups/x.json
-Created /acls/nodes/x.json
-Created /acls/policies/blah.json
-Created /acls/policies/x.json
-Created /acls/policy_groups/x.json
-Created /acls/roles/x.json
-Updated /groups/clients.json
-Updated /groups/users.json
-EOM
+          knife("download /acls /groups/clients.json /groups/users.json").should_succeed <<~EOM
+            Created /acls/clients/x.json
+            Created /acls/containers/x.json
+            Created /acls/cookbook_artifacts/x.json
+            Created /acls/cookbooks/x.json
+            Created /acls/data_bags/x.json
+            Created /acls/environments/x.json
+            Created /acls/groups/x.json
+            Created /acls/nodes/x.json
+            Created /acls/policies/blah.json
+            Created /acls/policies/x.json
+            Created /acls/policy_groups/x.json
+            Created /acls/roles/x.json
+            Updated /groups/clients.json
+            Updated /groups/users.json
+          EOM
         end
 
         it "knife download / downloads everything" do
-          knife("download /").should_succeed <<EOM
-Created /clients/x.json
-Created /containers/x.json
-Created /cookbook_artifacts/x-1x1
-Created /cookbook_artifacts/x-1x1/metadata.rb
-Created /cookbooks/x
-Created /cookbooks/x/metadata.rb
-Created /data_bags/x
-Created /data_bags/x/y.json
-Created /environments/x.json
-Created /groups/x.json
-Updated /invitations.json
-Updated /members.json
-Created /nodes/x.json
-Created /policies/blah-1.0.0.json
-Created /policies/x-1.0.0.json
-Created /policy_groups/x.json
-Created /roles/x.json
-EOM
+          knife("download /").should_succeed <<~EOM
+            Created /clients/x.json
+            Created /containers/x.json
+            Created /cookbook_artifacts/x-1x1
+            Created /cookbook_artifacts/x-1x1/metadata.rb
+            Created /cookbooks/x
+            Created /cookbooks/x/metadata.rb
+            Created /data_bags/x
+            Created /data_bags/x/y.json
+            Created /environments/x.json
+            Created /groups/x.json
+            Updated /invitations.json
+            Updated /members.json
+            Created /nodes/x.json
+            Created /policies/blah-1.0.0.json
+            Created /policies/x-1.0.0.json
+            Created /policy_groups/x.json
+            Created /roles/x.json
+          EOM
           knife("diff --name-status /").should_succeed ""
         end
 
@@ -1308,22 +1311,22 @@ EOM
           end
 
           it "knife download updates everything" do
-            knife("download /").should_succeed <<EOM
-Updated /clients/x.json
-Updated /cookbook_artifacts/x-1x1/metadata.rb
-Updated /cookbooks/x/metadata.rb
-Updated /data_bags/x/y.json
-Updated /environments/x.json
-Updated /groups/x.json
-Updated /invitations.json
-Updated /members.json
-Updated /nodes/x.json
-Updated /org.json
-Created /policies/blah-1.0.0.json
-Updated /policies/x-1.0.0.json
-Updated /policy_groups/x.json
-Updated /roles/x.json
-EOM
+            knife("download /").should_succeed <<~EOM
+              Updated /clients/x.json
+              Updated /cookbook_artifacts/x-1x1/metadata.rb
+              Updated /cookbooks/x/metadata.rb
+              Updated /data_bags/x/y.json
+              Updated /environments/x.json
+              Updated /groups/x.json
+              Updated /invitations.json
+              Updated /members.json
+              Updated /nodes/x.json
+              Updated /org.json
+              Created /policies/blah-1.0.0.json
+              Updated /policies/x-1.0.0.json
+              Updated /policy_groups/x.json
+              Updated /roles/x.json
+            EOM
             knife("diff --name-status /").should_succeed ""
           end
         end