chef-dk 3.11.3 → 3.12.0

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -115,7 +115,7 @@ describe ChefDK::Command::GeneratorCommands::Policyfile do
 
     let(:expected_policyfile_content) do
       <<~POLICYFILE_RB
-        # Policyfile.rb - Describe how you want Chef to build your system.
+        # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
         #
         # For more information on the Policyfile feature, visit
         # https://docs.chef.io/policyfile.html

data/spec/unit/command/generator_commands/recipe_spec.rb

@@ -29,7 +29,8 @@ describe ChefDK::Command::GeneratorCommands::Recipe do
                               "spec/spec_helper.rb",
                               "spec/unit/recipes/new_recipe_spec.rb",
                               "test/integration/default/new_recipe_test.rb",
-                            ] end
+                            ]
+    end
     let(:new_file_name) { "new_recipe" }
 
   end

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -35,11 +35,11 @@ describe ChefDK::Command::GeneratorCommands::Repo do
   let(:file) { "" }
   let(:file_path) { File.join(repo_path, file) }
   let(:file_contents) { File.read(file_path) }
-  let(:repo_path) { File.join(tempdir, "new_repo") }
+  let(:repo_path) { File.join(Dir["#{tempdir}"], "new_repo") }
 
   let(:expected_cookbook_files) do
     expected_cookbook_file_relpaths.map do |relpath|
-      File.join(tempdir, "new_repo", relpath)
+      File.join(Dir["#{tempdir}"], "new_repo", relpath)
     end
   end
 
@@ -178,7 +178,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
         let(:file) { "README.md" }
 
         it "is the standard readme" do
-          expect(file_contents).to match(/Every Chef installation needs a Chef Repository/)
+          expect(file_contents).to match(/Every Chef Infra installation needs a Chef Repository/)
         end
       end
 
@@ -186,7 +186,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
         let(:file) { "chefignore" }
 
         it "has the preamble" do
-          expect(file_contents).to match(/Put files\/directories that should be ignored in this file when uploading/)
+          expect(file_contents).to match(%r{Put files/directories that should be ignored in this file when uploading})
         end
       end
 
@@ -195,17 +195,17 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
         it "has the right contents" do
           expect(file_contents).to match(/\.rake_test_cache/)
-          expect(file_contents).to match(/\.chef\/\*\.pem/)
-          expect(file_contents).to match(/\.chef\/encrypted_data_bag_secret/)
-          expect(file_contents).to_not match(/cookbooks\/\*\*/)
+          expect(file_contents).to match(%r{\.chef/\*\.pem})
+          expect(file_contents).to match(%r{\.chef/encrypted_data_bag_secret})
+          expect(file_contents).to_not match(%r{cookbooks/\*\*})
         end
 
         context "with --policy-only" do
           let(:argv) { ["new_repo", "--policy-only" ] }
 
           it "blocks cookbooks" do
-            expect(file_contents).to match(/cookbooks\/\*\*/)
-            expect(file_contents).to match(/cookbooks\/README\.md/)
+            expect(file_contents).to match(%r{cookbooks/\*\*})
+            expect(file_contents).to match(%r{cookbooks/README\.md})
           end
         end
       end
@@ -215,7 +215,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
         let(:file) { ".chef-repo.txt" }
 
         it "explains why it's there" do
-          expect(file_contents).to include("This file gives ChefDK's generators a hint")
+          expect(file_contents).to include("This file gives the Chef CLI's generators a hint")
         end
       end
 
@@ -256,7 +256,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
           let(:file) { "cookbooks/example/recipes/default.rb" }
 
           it "has the right contents" do
-            expect(file_contents).to match(/log "Welcome to Chef, \#\{node\['example'\]\['name'\]\}!" do/)
+            expect(file_contents).to match(/log "Welcome to Chef Infra Client, \#\{node\['example'\]\['name'\]\}!" do/)
           end
         end
       end
@@ -297,7 +297,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
             let(:expected_content) do
               <<~README
-                Create policyfiles here. When using a chef-repo, give your policyfiles
+                Create Policyfiles here. When using a chef-repo, give your Policyfiles
                 the same filename as the name set in the policyfile itself, and use the
                 `.rb` file extension.
               README
@@ -327,11 +327,11 @@ describe ChefDK::Command::GeneratorCommands::Repo do
               <<~README
                 Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
 
-                For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
+                For example, in this directory, you'll find an example role file called `example.json` which can be uploaded to the Chef Infra Server:
 
                     knife role from file roles/example.json
 
-                For more information on roles, see the Chef wiki page:
+                For more information on roles, see the Chef docs site:
 
                 https://docs.chef.io/roles.html
               README
@@ -349,13 +349,13 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
             let(:expected_content) do
               <<~README
-                Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
+                Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the Chef Infra Server, use the knife command.
 
-                For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
+                For example, in this directory, you'll find an example environment file called `example.json` which can be uploaded to the Chef Infra Server:
 
                     knife environment from file environments/example.json
 
-                For more information on environments, see the Chef wiki page:
+                For more information on environments, see the Chef docs site:
 
                 https://docs.chef.io/environments.html
               README

data/spec/unit/command/verify_spec.rb

@@ -45,10 +45,10 @@ describe ChefDK::Command::Verify do
       "chef-apply",
       "chef-provisioning",
       "chefspec",
-      "generated-cookbooks-pass-chefspec",
+      "chef-vault",
+      "generated-cookbooks-pass-chefspec-and-foodcritic",
       "fauxhai",
       "knife-spork",
-      "kitchen-vagrant",
       "package installation",
       "openssl",
       "inspec",