chef-dk 3.13.1 → 4.0.60

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

@@ -59,14 +59,14 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
     let(:argv) { [] }
 
     let(:expected_files_full_paths) do
-      expected_files_relpaths.map { |p| File.join(Dir["#{tempdir}"], "code_generator", p) }
+      expected_files_relpaths.map { |p| File.join(tempdir, "code_generator", p) }
     end
 
     it "creates a copy of code_generator in the CWD" do
       Dir.chdir(tempdir) do
         expect(generator_generator.run).to eq(0)
       end
-      base_path = File.join(Dir["#{tempdir}"], "code_generator")
+      base_path = File.join(tempdir, "code_generator")
       expect(actual_files(base_path)).to match_array(expected_files_full_paths)
     end
 
@@ -105,7 +105,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
         it "fails" do
           expect(generator_generator.run).to eq(1)
-          expect(actual_files(tempdir)).to eq(Dir["#{conflicting_dir}"])
+          expect(actual_files(tempdir)).to eq([ conflicting_dir ])
 
           expected_msg = "ERROR: file or directory #{conflicting_dir} exists.\n"
 
@@ -116,7 +116,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
       context "and there isn't a directory named code_generator in that directory" do
 
         let(:expected_files_full_paths) do
-          expected_files_relpaths.map { |p| File.join(Dir["#{tempdir}"], "code_generator", p) }
+          expected_files_relpaths.map { |p| File.join(tempdir, "code_generator", p) }
         end
 
         it "names the cookbook code_generator" do
@@ -127,7 +127,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
         it "copies the code_generator to GIVEN_DIR/code_generator" do
           expect(generator_generator.run).to eq(0)
 
-          base_path = File.join(Dir["#{tempdir}"], "code_generator")
+          base_path = File.join(tempdir, "code_generator")
           expect(actual_files(base_path)).to match_array(expected_files_full_paths)
         end
       end
@@ -136,7 +136,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
     context "when the path is a regular file" do
 
-      let(:conflicting_file) { File.join(Dir["#{tempdir}"], "roadblock") }
+      let(:conflicting_file) { File.join(tempdir, "roadblock") }
 
       let(:argv) { [ conflicting_file ] }
 
@@ -157,7 +157,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
     context "when the last element of the given path doesn't exist" do
 
-      let(:target_dir) { File.join(Dir["#{tempdir}"], "my_cool_generator") }
+      let(:target_dir) { File.join(tempdir, "my_cool_generator") }
 
       let(:argv) { [ target_dir ] }
 

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

@@ -29,8 +29,7 @@ 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(Dir["#{tempdir}"], "new_repo") }
+  let(:repo_path) { File.join(tempdir, "new_repo") }
 
   let(:expected_cookbook_files) do
     expected_cookbook_file_relpaths.map do |relpath|
-      File.join(Dir["#{tempdir}"], "new_repo", relpath)
+      File.join(tempdir, "new_repo", relpath)
     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(%r{Put files/directories that should be ignored in this file when uploading})
+          expect(file_contents).to match(/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(%r{\.chef/\*\.pem})
-          expect(file_contents).to match(%r{\.chef/encrypted_data_bag_secret})
-          expect(file_contents).to_not match(%r{cookbooks/\*\*})
+          expect(file_contents).to match(/\.chef\/\*\.pem/)
+          expect(file_contents).to match(/\.chef\/encrypted_data_bag_secret/)
+          expect(file_contents).to_not match(/cookbooks\/\*\*/)
         end
 
         context "with --policy-only" do
           let(:argv) { ["new_repo", "--policy-only" ] }
 
           it "blocks cookbooks" do
-            expect(file_contents).to match(%r{cookbooks/\*\*})
-            expect(file_contents).to match(%r{cookbooks/README\.md})
+            expect(file_contents).to match(/cookbooks\/\*\*/)
+            expect(file_contents).to match(/cookbooks\/README\.md/)
           end
         end
       end

data/spec/unit/command/verify_spec.rb

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

data/spec/unit/cookbook_profiler/identifiers_spec.rb

@@ -43,9 +43,9 @@ describe ChefDK::CookbookProfiler::Identifiers do
   let(:cookbook_files_with_cksums) do
     # Entries must be sorted lexically.
     {
-      ".kitchen.yml" => "85ba09a085dab072722cb197e04fa805",
       "README.md" => "0f15038071e5a131bef176cbe2a956d1",
       "chefignore" => "03485640b005eb1083c76518764053dd",
+      "kitchen.yml" => "85ba09a085dab072722cb197e04fa805",
       "metadata.rb" => "4879d0004b177546cfbcfb2fd26df7c8",
       "recipes/default.rb" => "9a0f27d741deaca21461073f7452474f",
     }
@@ -71,11 +71,11 @@ describe ChefDK::CookbookProfiler::Identifiers do
   end
 
   it "generates a Hash of the cookbook's content" do
-    expect(identifiers.content_identifier).to eq("467dc855408ce8b74f991c5dc2fd72a6aa369b60")
+    expect(identifiers.content_identifier).to eq("f24326bbf81d67fcab6a5615c75092d1c6da81cc")
   end
 
   it "generates a dotted decimal representation of the content hash" do
-    expect(identifiers.dotted_decimal_identifier).to eq("19841547746970856.51597439762547453.126060145843040")
+    expect(identifiers.dotted_decimal_identifier).to eq("68190778005396839.71120167330236240.161429682029004")
   end
 
 end

data/spec/unit/policyfile_lock_build_spec.rb

@@ -205,7 +205,7 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       <<~REVISION_STRING
         name:minimal_policyfile
         run-list-item:recipe[foo]
-        cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
+        cookbook:foo;id:f24326bbf81d67fcab6a5615c75092d1c6da81cc
         default_attributes:{}
         override_attributes:{}
       REVISION_STRING
@@ -292,7 +292,7 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
       <<~REVISION_STRING
         name:minimal_policyfile
         run-list-item:recipe[foo]
-        cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
+        cookbook:foo;id:f24326bbf81d67fcab6a5615c75092d1c6da81cc
         default_attributes:{"aaa":"aaa","bbb":null,"ccc":false,"ddd":true,"e":1.2,"f":5,"foo":"bar","g":1e+15,"nested":{"a":"b"}}
         override_attributes:{"foo2":"baz"}
       REVISION_STRING