chef 14.14.29 → 14.15.6

data/spec/integration/knife/environment_compare_spec.rb

@@ -49,7 +49,7 @@ describe "knife environment compare", :workstation do
         blah  = 1.0.0 
         krad  >= 1.0.0
         
-EOM
+      EOM
     end
 
     it "compares the cookbooks for two environments" do
@@ -58,7 +58,7 @@ EOM
         blah  = 1.0.0   = 1.1.0 
         krad  >= 1.0.0  >= 1.0.0
         
-EOM
+      EOM
     end
 
     it "compares the cookbooks for all environments" do
@@ -67,7 +67,7 @@ EOM
         blah  = 1.0.0   = 1.1.0 
         krad  >= 1.0.0  >= 1.0.0
         
-EOM
+      EOM
     end
     # rubocop:enable Layout/TrailingWhitespace
   end

data/spec/integration/knife/environment_from_file_spec.rb

@@ -45,7 +45,7 @@ describe "knife environment from file", :workstation do
 
             }
           }
-EOM
+        EOM
 
         file "environments/car.json", <<~EOM
           {
@@ -63,7 +63,7 @@ EOM
 
             }
           }
-EOM
+        EOM
 
         file "environments/cdr.json", <<~EOM
           {
@@ -81,14 +81,14 @@ EOM
 
             }
           }
-EOM
+        EOM
 
       end
 
       it "uploads a single file" do
         knife("environment from file #{env_dir}/cons.json").should_succeed stderr: <<~EOM
           Updated Environment cons
-EOM
+        EOM
       end
 
       it "uploads many files" do
@@ -96,7 +96,7 @@ EOM
           Updated Environment cons
           Updated Environment car
           Updated Environment cdr
-EOM
+        EOM
       end
 
       it "uploads all environments in the repository" do
@@ -107,7 +107,7 @@ EOM
           car
           cdr
           cons
-EOM
+        EOM
       end
 
     end

data/spec/integration/knife/environment_list_spec.rb

@@ -34,7 +34,7 @@ describe "knife environment list", :workstation do
         _default
         b
         y
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/environment_show_spec.rb

@@ -43,7 +43,7 @@ describe "knife environment show", :workstation do
         json_class:          Chef::Environment
         name:                b
         override_attributes:
-EOM
+      EOM
     end
     # rubocop:enable Layout/TrailingWhitespace
 
@@ -54,7 +54,7 @@ EOM
             baz:
               raz.my: mataz
             foo: bar
-EOM
+      EOM
     end
 
     it "shows the requested nested attribute of an environment" do
@@ -62,7 +62,7 @@ EOM
         b:
           default_attributes.baz:
             raz.my: mataz
-EON
+      EON
     end
 
     it "shows the requested attribute of an environment with custom field separator" do
@@ -70,7 +70,7 @@ EON
         b:
           default_attributes:baz:
             raz.my: mataz
-EOT
+      EOT
     end
   end
 end

data/spec/integration/knife/list_spec.rb

@@ -35,7 +35,7 @@ describe "knife list", :workstation do
         /nodes
         /roles
         /users
-EOM
+      EOM
     end
 
     it "knife list -R / returns everything" do
@@ -66,7 +66,7 @@ EOM
 
         /users:
         admin.json
-EOM
+      EOM
     end
   end
 
@@ -100,7 +100,7 @@ EOM
         /nodes
         /roles
         /users
-EOM
+      EOM
     end
 
     it "knife list -R / returns everything" do
@@ -163,7 +163,7 @@ EOM
         admin.json
         user1.json
         user2.json
-EOM
+      EOM
     end
 
     it "knife list -R --flat / returns everything" do
@@ -201,7 +201,7 @@ EOM
         /users/admin.json
         /users/user1.json
         /users/user2.json
-EOM
+      EOM
     end
 
     it "knife list -Rfp / returns everything" do
@@ -239,14 +239,14 @@ EOM
         /users/admin.json
         /users/user1.json
         /users/user2.json
-EOM
+      EOM
     end
 
     it "knife list /cookbooks returns the list of cookbooks" do
       knife("list /cookbooks").should_succeed <<~EOM
         /cookbooks/cookbook1
         /cookbooks/cookbook2
-EOM
+      EOM
     end
 
     it "knife list /cookbooks/*2/*/*.rb returns the one file" do
@@ -258,7 +258,7 @@ EOM
         /cookbooks/cookbook1/metadata.rb
         /cookbooks/cookbook2/metadata.rb
         /cookbooks/cookbook2/recipes/default.rb
-EOM
+      EOM
     end
 
     it "knife list /cookbooks/**.rb returns all ruby files" do
@@ -266,7 +266,7 @@ EOM
         /cookbooks/cookbook1/metadata.rb
         /cookbooks/cookbook2/metadata.rb
         /cookbooks/cookbook2/recipes/default.rb
-EOM
+      EOM
     end
 
     it "knife list /**.json returns all json files" do
@@ -289,7 +289,7 @@ EOM
         /users/admin.json
         /users/user1.json
         /users/user2.json
-EOM
+      EOM
     end
 
     it "knife list /data**.json returns all data bag json files" do
@@ -298,7 +298,7 @@ EOM
         /data_bags/bag1/item2.json
         /data_bags/bag2/item1.json
         /data_bags/bag2/item2.json
-EOM
+      EOM
     end
 
     it "knife list /environments/missing_file.json reports missing file" do
@@ -351,7 +351,7 @@ EOM
               users/admin.json
               users/user1.json
               users/user2.json
-EOM
+            EOM
           end
         end
       end
@@ -396,7 +396,7 @@ EOM
               /users/admin.json
               /users/user1.json
               /users/user2.json
-EOM
+            EOM
           end
 
           it "knife list -Rfp .. returns everything" do
@@ -434,7 +434,7 @@ EOM
               /users/admin.json
               /users/user1.json
               /users/user2.json
-EOM
+            EOM
           end
 
           it "knife list -Rfp returns cookbooks" do
@@ -445,7 +445,7 @@ EOM
               cookbook2/metadata.rb
               cookbook2/recipes/
               cookbook2/recipes/default.rb
-EOM
+            EOM
           end
         end
       end
@@ -461,7 +461,7 @@ EOM
               metadata.rb
               recipes/
               recipes/default.rb
-EOM
+            EOM
           end
         end
       end
@@ -483,7 +483,7 @@ EOM
               cookbook2/metadata.rb
               cookbook2/recipes/
               cookbook2/recipes/default.rb
-EOM
+            EOM
           end
         end
 
@@ -498,7 +498,7 @@ EOM
               cookbook2/metadata.rb
               cookbook2/recipes/
               cookbook2/recipes/default.rb
-EOM
+            EOM
           end
         end
       end
@@ -520,7 +520,7 @@ EOM
               cookbook2/metadata.rb
               cookbook2/recipes/
               cookbook2/recipes/default.rb
-EOM
+            EOM
           end
         end
 
@@ -535,7 +535,7 @@ EOM
               cookbook2/metadata.rb
               cookbook2/recipes/
               cookbook2/recipes/default.rb
-EOM
+            EOM
           end
         end
       end
@@ -619,7 +619,7 @@ EOM
           /users/
           /users/user1.json
           /users/user2.json
-EOM
+        EOM
       end
 
       context "missing file/directory tests" do
@@ -665,7 +665,7 @@ EOM
           /policies
           /policy_groups
           /roles
-EOM
+        EOM
       end
 
       it "knife list -R / returns everything" do
@@ -780,7 +780,7 @@ EOM
           /policy_groups:
 
           /roles:
-EOM
+        EOM
       end
     end
 
@@ -896,7 +896,7 @@ EOM
         /policy_groups:
 
         /roles:
-EOM
+      EOM
     end
 
     context "has plenty of stuff in it" do
@@ -1052,7 +1052,7 @@ EOM
           /roles/
           /roles/role1.json
           /roles/role2.json
-EOM
+        EOM
       end
     end
   end

data/spec/integration/knife/node_bulk_delete_spec.rb

@@ -39,12 +39,12 @@ describe "knife node bulk delete", :workstation do
 
         Are you sure you want to delete these nodes? (Y/N) Deleted node car
         Deleted node cat
-EOM
+      EOM
 
       knife("node list").should_succeed <<~EOM
         cdr
         cons
-EOM
+      EOM
     end
   end
 

data/spec/integration/knife/node_delete_spec.rb

@@ -34,13 +34,13 @@ describe "knife node delete", :workstation do
     it "deletes a node" do
       knife("node delete car", input: "Y").should_succeed <<~EOM
         Do you really want to delete car? (Y/N) Deleted node[car]
-EOM
+      EOM
 
       knife("node list").should_succeed <<~EOM
         cat
         cdr
         cons
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/node_environment_set_spec.rb

@@ -34,7 +34,7 @@ describe "knife node environment set", :workstation do
       knife("node show cons -a chef_environment").should_succeed <<~EOM
         cons:
           chef_environment: lisp
-EOM
+      EOM
     end
 
     it "with no environment" do

data/spec/integration/knife/node_from_file_spec.rb

@@ -43,14 +43,14 @@ describe "knife node from file", :workstation do
               ]
             }
           }
-EOM
+        EOM
 
       end
 
       it "uploads a single file" do
         knife("node from file #{node_dir}/cons.json").should_succeed stderr: <<~EOM
           Updated Node cons
-EOM
+        EOM
       end
 
     end

data/spec/integration/knife/node_list_spec.rb

@@ -37,7 +37,7 @@ describe "knife node list", :workstation do
         cat
         cdr
         cons
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/raw_spec.rb

@@ -63,7 +63,7 @@ describe "knife raw", :workstation do
 
           ]
         }
-EOM
+      EOM
     end
 
     it "knife raw /blarghle returns 404" do
@@ -90,7 +90,7 @@ EOM
 
           }
         }
-EOM
+      EOM
       knife("show /roles/x.json").should_fail "ERROR: /roles/x.json: No such file or directory\n"
     end
 
@@ -115,7 +115,7 @@ EOM
 
             }
           }
-EOM
+        EOM
         file.close
 
         knife("raw -m PUT -i #{file.path} /roles/x").should_succeed <<~EOM
@@ -137,14 +137,14 @@ EOM
 
             }
           }
-EOM
+        EOM
         knife("show /roles/x.json").should_succeed <<~EOM
           /roles/x.json:
           {
             "name": "x",
             "description": "eek"
           }
-EOM
+        EOM
       end
     end
 
@@ -166,21 +166,21 @@ EOM
             "env_run_lists": {
             }
           }
-EOM
+        EOM
         file.close
 
         knife("raw -m POST -i #{file.path} /roles").should_succeed <<~EOM
           {
             "uri": "#{Chef::Config.chef_server_url}/roles/y"
           }
-EOM
+        EOM
         knife("show /roles/y.json").should_succeed <<~EOM
           /roles/y.json:
           {
             "name": "y",
             "description": "eek"
           }
-EOM
+        EOM
       end
     end
 
@@ -206,13 +206,13 @@ EOM
             "x": "y",
             "a": "b"
           }
-EOM
+        EOM
       end
 
       it "knife raw --no-pretty /blah returns the raw json" do
         knife("raw --no-pretty /blah").should_succeed <<~EOM
           { "x": "y", "a": "b" }
-EOM
+        EOM
       end
     end
 
@@ -235,13 +235,13 @@ EOM
       it "knife raw /blah returns the raw text" do
         knife("raw /blah").should_succeed(<<~EOM)
           { "x": "y", "a": "b" }
-EOM
+        EOM
       end
 
       it "knife raw --no-pretty /blah returns the raw text" do
         knife("raw --no-pretty /blah").should_succeed(<<~EOM)
           { "x": "y", "a": "b" }
-EOM
+        EOM
       end
     end
   end