chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

data/spec/integration/knife/node_bulk_delete_spec.rb

@@ -32,18 +32,18 @@ describe "knife node bulk delete", :workstation do
     end
 
     it "deletes all matching nodes" do
-      knife("node bulk delete ^ca.*", input: "Y").should_succeed <<EOM
-The following nodes will be deleted:
+      knife("node bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
+        The following nodes will be deleted:
 
-car  cat
+        car  cat
 
-Are you sure you want to delete these nodes? (Y/N) Deleted node car
-Deleted node cat
+        Are you sure you want to delete these nodes? (Y/N) Deleted node car
+        Deleted node cat
 EOM
 
-      knife("node list").should_succeed <<EOM
-cdr
-cons
+      knife("node list").should_succeed <<~EOM
+        cdr
+        cons
 EOM
     end
   end

data/spec/integration/knife/node_delete_spec.rb

@@ -32,14 +32,14 @@ describe "knife node delete", :workstation do
     end
 
     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]
+      knife("node delete car", input: "Y").should_succeed <<~EOM
+        Do you really want to delete car? (Y/N) Deleted node[car]
 EOM
 
-      knife("node list").should_succeed <<EOM
-cat
-cdr
-cons
+      knife("node list").should_succeed <<~EOM
+        cat
+        cdr
+        cons
 EOM
     end
 

data/spec/integration/knife/node_environment_set_spec.rb

@@ -31,9 +31,9 @@ describe "knife node environment set", :workstation do
 
     it "sets an environment on a node" do
       knife("node environment set cons lisp").should_succeed /chef_environment:.*lisp/
-      knife("node show cons -a chef_environment").should_succeed <<EOM
-cons:
-  chef_environment: lisp
+      knife("node show cons -a chef_environment").should_succeed <<~EOM
+        cons:
+          chef_environment: lisp
 EOM
     end
 

data/spec/integration/knife/node_from_file_spec.rb

@@ -29,27 +29,27 @@ describe "knife node from file", :workstation do
     when_the_repository "has some nodes" do
       before do
 
-        file "nodes/cons.json", <<EOM
-{
-  "name": "cons",
-  "chef_environment": "_default",
-  "run_list": [
-  "recipe[cons]"
-]
-,
-  "normal": {
-    "tags": [
-
-    ]
-  }
-}
+        file "nodes/cons.json", <<~EOM
+          {
+            "name": "cons",
+            "chef_environment": "_default",
+            "run_list": [
+            "recipe[cons]"
+          ]
+          ,
+            "normal": {
+              "tags": [
+
+              ]
+            }
+          }
 EOM
 
       end
 
       it "uploads a single file" do
-        knife("node from file #{node_dir}/cons.json").should_succeed stderr: <<EOM
-Updated Node cons
+        knife("node from file #{node_dir}/cons.json").should_succeed stderr: <<~EOM
+          Updated Node cons
 EOM
       end
 

data/spec/integration/knife/node_list_spec.rb

@@ -32,11 +32,11 @@ describe "knife node list", :workstation do
     end
 
     it "lists all cookbooks" do
-      knife("node list").should_succeed <<EOM
-car
-cat
-cdr
-cons
+      knife("node list").should_succeed <<~EOM
+        car
+        cat
+        cdr
+        cons
 EOM
     end
 

data/spec/integration/knife/raw_spec.rb

@@ -38,31 +38,31 @@ describe "knife raw", :workstation do
       user "x", "{}"
     end
 
-    it "knife raw /nodes/x returns the node", :skip => (RUBY_VERSION < "1.9") do
-      knife("raw /nodes/x").should_succeed <<EOM
-{
-  "name": "x",
-  "json_class": "Chef::Node",
-  "chef_type": "node",
-  "chef_environment": "_default",
-  "override": {
-
-  },
-  "normal": {
-    "tags": [
-
-    ]
-  },
-  "default": {
-
-  },
-  "automatic": {
-
-  },
-  "run_list": [
-
-  ]
-}
+    it "knife raw /nodes/x returns the node", skip: (RUBY_VERSION < "1.9") do
+      knife("raw /nodes/x").should_succeed <<~EOM
+        {
+          "name": "x",
+          "json_class": "Chef::Node",
+          "chef_type": "node",
+          "chef_environment": "_default",
+          "override": {
+
+          },
+          "normal": {
+            "tags": [
+
+            ]
+          },
+          "default": {
+
+          },
+          "automatic": {
+
+          },
+          "run_list": [
+
+          ]
+        }
 EOM
     end
 
@@ -70,116 +70,116 @@ EOM
       knife("raw /blarghle").should_fail(/ERROR: Server responded with error 404 "Not Found\s*"/)
     end
 
-    it "knife raw -m DELETE /roles/x succeeds", :skip => (RUBY_VERSION < "1.9") do
-      knife("raw -m DELETE /roles/x").should_succeed <<EOM
-{
-  "name": "x",
-  "description": "",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
+    it "knife raw -m DELETE /roles/x succeeds", skip: (RUBY_VERSION < "1.9") do
+      knife("raw -m DELETE /roles/x").should_succeed <<~EOM
+        {
+          "name": "x",
+          "description": "",
+          "json_class": "Chef::Role",
+          "chef_type": "role",
+          "default_attributes": {
 
-  },
-  "override_attributes": {
+          },
+          "override_attributes": {
 
-  },
-  "run_list": [
+          },
+          "run_list": [
 
-  ],
-  "env_run_lists": {
+          ],
+          "env_run_lists": {
 
-  }
-}
+          }
+        }
 EOM
       knife("show /roles/x.json").should_fail "ERROR: /roles/x.json: No such file or directory\n"
     end
 
-    it "knife raw -m PUT -i blah.txt /roles/x succeeds", :skip => (RUBY_VERSION < "1.9") do
+    it "knife raw -m PUT -i blah.txt /roles/x succeeds", skip: (RUBY_VERSION < "1.9") do
       Tempfile.open("raw_put_input") do |file|
-        file.write <<EOM
-{
-  "name": "x",
-  "description": "eek",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
+        file.write <<~EOM
+          {
+            "name": "x",
+            "description": "eek",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
 
-  },
-  "override_attributes": {
+            },
+            "override_attributes": {
 
-  },
-  "run_list": [
+            },
+            "run_list": [
 
-  ],
-  "env_run_lists": {
+            ],
+            "env_run_lists": {
 
-  }
-}
+            }
+          }
 EOM
         file.close
 
-        knife("raw -m PUT -i #{file.path} /roles/x").should_succeed <<EOM
-{
-  "name": "x",
-  "description": "eek",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
+        knife("raw -m PUT -i #{file.path} /roles/x").should_succeed <<~EOM
+          {
+            "name": "x",
+            "description": "eek",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
 
-  },
-  "override_attributes": {
+            },
+            "override_attributes": {
 
-  },
-  "run_list": [
+            },
+            "run_list": [
 
-  ],
-  "env_run_lists": {
+            ],
+            "env_run_lists": {
 
-  }
-}
+            }
+          }
 EOM
-        knife("show /roles/x.json").should_succeed <<EOM
-/roles/x.json:
-{
-  "name": "x",
-  "description": "eek"
-}
+        knife("show /roles/x.json").should_succeed <<~EOM
+          /roles/x.json:
+          {
+            "name": "x",
+            "description": "eek"
+          }
 EOM
       end
     end
 
-    it "knife raw -m POST -i blah.txt /roles succeeds", :skip => (RUBY_VERSION < "1.9") do
+    it "knife raw -m POST -i blah.txt /roles succeeds", skip: (RUBY_VERSION < "1.9") do
       Tempfile.open("raw_put_input") do |file|
-        file.write <<EOM
-{
-  "name": "y",
-  "description": "eek",
-  "json_class": "Chef::Role",
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ],
-  "env_run_lists": {
-  }
-}
+        file.write <<~EOM
+          {
+            "name": "y",
+            "description": "eek",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
+            },
+            "override_attributes": {
+            },
+            "run_list": [
+
+            ],
+            "env_run_lists": {
+            }
+          }
 EOM
         file.close
 
-        knife("raw -m POST -i #{file.path} /roles").should_succeed <<EOM
-{
-  "uri": "#{Chef::Config.chef_server_url}/roles/y"
-}
+        knife("raw -m POST -i #{file.path} /roles").should_succeed <<~EOM
+          {
+            "uri": "#{Chef::Config.chef_server_url}/roles/y"
+          }
 EOM
-        knife("show /roles/y.json").should_succeed <<EOM
-/roles/y.json:
-{
-  "name": "y",
-  "description": "eek"
-}
+        knife("show /roles/y.json").should_succeed <<~EOM
+          /roles/y.json:
+          {
+            "name": "y",
+            "description": "eek"
+          }
 EOM
       end
     end
@@ -198,18 +198,18 @@ EOM
         @raw_server_thread.kill if @raw_server_thread
       end
 
-      it "knife raw /blah returns the prettified json", :skip => (RUBY_VERSION < "1.9") do
-        knife("raw /blah").should_succeed <<EOM
-{
-  "x": "y",
-  "a": "b"
-}
+      it "knife raw /blah returns the prettified json", skip: (RUBY_VERSION < "1.9") do
+        knife("raw /blah").should_succeed <<~EOM
+          {
+            "x": "y",
+            "a": "b"
+          }
 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" }
+        knife("raw --no-pretty /blah").should_succeed <<~EOM
+          { "x": "y", "a": "b" }
 EOM
       end
     end
@@ -229,14 +229,14 @@ EOM
       end
 
       it "knife raw /blah returns the raw text" do
-        knife("raw /blah").should_succeed(<<EOM)
-{ "x": "y", "a": "b" }
+        knife("raw /blah").should_succeed(<<~EOM)
+          { "x": "y", "a": "b" }
 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" }
+        knife("raw --no-pretty /blah").should_succeed(<<~EOM)
+          { "x": "y", "a": "b" }
 EOM
       end
     end

data/spec/integration/knife/role_bulk_delete_spec.rb

@@ -32,18 +32,18 @@ describe "knife role bulk delete", :workstation do
     end
 
     it "deletes all matching roles" do
-      knife("role bulk delete ^ca.*", input: "Y").should_succeed <<EOM
-The following roles will be deleted:
+      knife("role bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
+        The following roles will be deleted:
 
-car  cat
+        car  cat
 
-Are you sure you want to delete these roles? (Y/N) Deleted role car
-Deleted role cat
+        Are you sure you want to delete these roles? (Y/N) Deleted role car
+        Deleted role cat
 EOM
 
-      knife("role list").should_succeed <<EOM
-cdr
-cons
+      knife("role list").should_succeed <<~EOM
+        cdr
+        cons
 EOM
     end