chef 12.18.31 → 13.0.118

data/spec/unit/cookbook_manifest_spec.rb

@@ -81,11 +81,6 @@ describe Chef::CookbookManifest do
       expect(cookbook_manifest.frozen_version?).to be(false)
     end
 
-    it "delegates `segment_filenames' to cookbook_version" do
-      expect(cookbook_version).to receive(:segment_filenames).with(:recipes).and_return([])
-      expect(cookbook_manifest.segment_filenames(:recipes)).to eq([])
-    end
-
   end
 
   context "when given an empty cookbook" do
@@ -101,15 +96,7 @@ describe Chef::CookbookManifest do
 
         "frozen?" => false,
 
-        "recipes" => [],
-        "definitions" => [],
-        "libraries" => [],
-        "attributes" => [],
-        "files" => [],
-        "templates" => [],
-        "resources" => [],
-        "providers" => [],
-        "root_files" => [],
+        "all_files" => [],
       }
     end
 
@@ -123,16 +110,7 @@ describe Chef::CookbookManifest do
 
     let(:cookbook_root) { File.join(CHEF_SPEC_DATA, "cb_version_cookbooks", "tatft") }
 
-    let(:attribute_filenames)   { Dir[File.join(cookbook_root, "attributes", "**", "*.rb")] }
-    let(:definition_filenames)  { Dir[File.join(cookbook_root, "definitions", "**", "*.rb")] }
-    let(:file_filenames)        { Dir[File.join(cookbook_root, "files", "**", "*.tgz")] }
-    let(:recipe_filenames)      { Dir[File.join(cookbook_root, "recipes", "**", "*.rb")] }
-    let(:template_filenames)    { Dir[File.join(cookbook_root, "templates", "**", "*.erb")] }
-    let(:library_filenames)     { Dir[File.join(cookbook_root, "libraries", "**", "*.rb")] }
-    let(:resource_filenames)    { Dir[File.join(cookbook_root, "resources", "**", "*.rb")] }
-    let(:provider_filenames)    { Dir[File.join(cookbook_root, "providers", "**", "*.rb")] }
-    let(:root_filenames)        { Array(File.join(cookbook_root, "README.rdoc")) }
-    let(:metadata_filenames)    { Array(File.join(cookbook_root, "metadata.json")) }
+    let(:all_files) { Dir[File.join(cookbook_root, "**", "**")].reject { |f| File.directory? f } }
 
     let(:match_md5) { /[0-9a-f]{32}/ }
 
@@ -141,8 +119,15 @@ describe Chef::CookbookManifest do
 
         relative_path = Pathname.new(path).relative_path_from(Pathname.new(cookbook_root)).to_s
 
+        parts = relative_path.split("/")
+        name = if %w{templates files}.include?(parts[0]) && parts.length == 3
+                 File.join(parts[0], parts[2])
+               else
+                 relative_path
+               end
+
         {
-          "name"        => File.basename(path),
+          "name"        => name,
           "path"        => relative_path,
           "checksum"    => Chef::Digester.generate_md5_checksum_for_file(path),
           "specificity" => "default",
@@ -161,29 +146,12 @@ describe Chef::CookbookManifest do
 
         "frozen?" => false,
 
-        "recipes"     => map_to_file_specs(recipe_filenames),
-        "definitions" => map_to_file_specs(definition_filenames),
-        "libraries"   => map_to_file_specs(library_filenames),
-        "attributes"  => map_to_file_specs(attribute_filenames),
-        "files"       => map_to_file_specs(file_filenames),
-        "templates"   => map_to_file_specs(template_filenames),
-        "resources"   => map_to_file_specs(resource_filenames),
-        "providers"   => map_to_file_specs(provider_filenames),
-        "root_files"  => map_to_file_specs(root_filenames),
+        "all_files" => map_to_file_specs(all_files),
       }
     end
 
     before do
-      cookbook_version.attribute_filenames   = attribute_filenames
-      cookbook_version.definition_filenames  = definition_filenames
-      cookbook_version.file_filenames        = file_filenames
-      cookbook_version.recipe_filenames      = recipe_filenames
-      cookbook_version.template_filenames    = template_filenames
-      cookbook_version.library_filenames     = library_filenames
-      cookbook_version.resource_filenames    = resource_filenames
-      cookbook_version.provider_filenames    = provider_filenames
-      cookbook_version.root_filenames        = root_filenames
-      cookbook_version.metadata_filenames    = metadata_filenames
+      cookbook_version.all_files = all_files
     end
 
     it "converts the CookbookVersion to a ruby Hash representation" do

data/spec/unit/cookbook_site_streaming_uploader_spec.rb

@@ -49,10 +49,6 @@ describe Chef::CookbookSiteStreamingUploader do
       cookbook = @loader[:openldap]
       files_count = Dir.glob(File.join(@cookbook_repo, cookbook.name.to_s, "**", "*"), File::FNM_DOTMATCH).count { |file| File.file?(file) }
 
-      # The fixture cookbook contains a spec/spec_helper.rb file, which is not
-      # a part of any cookbook segment, so it is not uploaded.
-      files_count -= 1
-
       expect(Tempfile).to receive(:new).with("chef-#{cookbook.name}-build").and_return(FakeTempfile.new("chef-#{cookbook.name}-build"))
       expect(FileUtils).to receive(:mkdir_p).exactly(files_count + 1).times
       expect(FileUtils).to receive(:cp).exactly(files_count).times

data/spec/unit/cookbook_spec.rb

@@ -19,7 +19,8 @@
 require "spec_helper"
 
 describe Chef::CookbookVersion do
-#  COOKBOOK_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks", "openldap"))
+  COOKBOOK_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks", "openldap"))
+
   before(:each) do
     @cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
     cl = Chef::CookbookLoader.new(@cookbook_repo)
@@ -37,26 +38,21 @@ describe Chef::CookbookVersion do
   end
 
   it "should allow you to set the list of attribute files and create the mapping from short names to paths" do
-    @cookbook.attribute_filenames = [ "attributes/one.rb", "attributes/two.rb" ]
-    expect(@cookbook.attribute_filenames).to eq([ "attributes/one.rb", "attributes/two.rb" ])
-    expect(@cookbook.attribute_filenames_by_short_filename.keys.sort).to eql(%w{one two})
-    expect(@cookbook.attribute_filenames_by_short_filename["one"]).to eq("attributes/one.rb")
-    expect(@cookbook.attribute_filenames_by_short_filename["two"]).to eq("attributes/two.rb")
+    expect(@cookbook.attribute_filenames_by_short_filename.keys.sort).to eql(%w{default smokey})
+    expect(@cookbook.attribute_filenames_by_short_filename["default"]).to eq(File.join(COOKBOOK_PATH, "attributes/default.rb"))
+    expect(@cookbook.attribute_filenames_by_short_filename["smokey"]).to eq(File.join(COOKBOOK_PATH, "attributes/smokey.rb"))
   end
 
   it "should allow you to set the list of recipe files and create the mapping of recipe short name to filename" do
-    @cookbook.recipe_filenames = [ "recipes/one.rb", "recipes/two.rb" ]
-    expect(@cookbook.recipe_filenames).to eq([ "recipes/one.rb", "recipes/two.rb" ])
-    expect(@cookbook.recipe_filenames_by_name.keys.sort).to eql(%w{one two})
-    expect(@cookbook.recipe_filenames_by_name["one"]).to eq("recipes/one.rb")
-    expect(@cookbook.recipe_filenames_by_name["two"]).to eq("recipes/two.rb")
+    expect(@cookbook.recipe_filenames_by_name.keys.sort).to eql(%w{default gigantor one return})
+    expect(@cookbook.recipe_filenames_by_name["one"]).to eq(File.join(COOKBOOK_PATH, "recipes/one.rb"))
+    expect(@cookbook.recipe_filenames_by_name["gigantor"]).to eq(File.join(COOKBOOK_PATH, "recipes/gigantor.rb"))
   end
 
   it "should generate a list of recipes by fully-qualified name" do
-    @cookbook.recipe_filenames = [ "recipes/one.rb", "/recipes/two.rb", "three.rb" ]
     expect(@cookbook.fully_qualified_recipe_names.include?("openldap::one")).to eq(true)
-    expect(@cookbook.fully_qualified_recipe_names.include?("openldap::two")).to eq(true)
-    expect(@cookbook.fully_qualified_recipe_names.include?("openldap::three")).to eq(true)
+    expect(@cookbook.fully_qualified_recipe_names.include?("openldap::gigantor")).to eq(true)
+    expect(@cookbook.fully_qualified_recipe_names.include?("openldap::return")).to eq(true)
   end
 
   it "should raise an ArgumentException if you try to load a bad recipe name" do

data/spec/unit/cookbook_uploader_spec.rb

@@ -65,7 +65,7 @@ describe Chef::CookbookUploader do
 
   it "creates an HTTP client with default configuration when not initialized with one" do
     default_http_client = double("Chef::ServerAPI")
-    expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_url]).and_return(default_http_client)
+    expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_url], version_class: Chef::CookbookManifestVersions).and_return(default_http_client)
     uploader = described_class.new(cookbooks_to_upload)
     expect(uploader.rest).to eq(default_http_client)
   end

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -23,177 +23,204 @@ describe Chef::CookbookVersion, "file specificity" do
   before(:each) do
     @cookbook = Chef::CookbookVersion.new("test-cookbook", "/cookbook-folder")
     @cookbook.manifest = {
-      "files" =>
+      "all_files" =>
       [
        # afile.rb
        {
-         :name => "afile.rb",
+         :name => "files/afile.rb",
          :path => "files/host-examplehost.example.org/afile.rb",
+         :full_path => "/cookbook-folder/files/host-examplehost.example.org/afile.rb",
          :checksum => "csum-host",
          :specificity => "host-examplehost.example.org",
        },
        {
-         :name => "afile.rb",
+         :name => "files/afile.rb",
          :path => "files/ubuntu-9.10/afile.rb",
+         :full_path => "/cookbook-folder/files/ubuntu-9.10/afile.rb",
          :checksum => "csum-platver-full",
          :specificity => "ubuntu-9.10",
        },
        {
-         :name => "afile.rb",
+         :name => "files/afile.rb",
          :path => "files/newubuntu-9/afile.rb",
+         :full_path => "/cookbook-folder/files/newubuntu-9/afile.rb",
          :checksum => "csum-platver-partial",
          :specificity => "newubuntu-9",
        },
        {
-         :name => "afile.rb",
+         :name => "files/afile.rb",
          :path => "files/ubuntu/afile.rb",
+         :full_path => "/cookbook-folder/files/ubuntu/afile.rb",
          :checksum => "csum-plat",
          :specificity => "ubuntu",
        },
        {
-         :name => "afile.rb",
+         :name => "files/afile.rb",
          :path => "files/default/afile.rb",
+         :full_path => "/cookbook-folder/files/default/afile.rb",
          :checksum => "csum-default",
          :specificity => "default",
        },
 
        # for different/odd platform_versions
        {
-         :name => "bfile.rb",
+         :name => "files/bfile.rb",
          :path => "files/fakeos-2.0.rc.1/bfile.rb",
+         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/bfile.rb",
          :checksum => "csum2-platver-full",
          :specificity => "fakeos-2.0.rc.1",
        },
        {
-         :name => "bfile.rb",
+         :name => "files/bfile.rb",
          :path => "files/newfakeos-2.0.rc/bfile.rb",
+         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc/bfile.rb",
          :checksum => "csum2-platver-partial",
          :specificity => "newfakeos-2.0.rc",
        },
        {
-         :name => "bfile.rb",
+         :name => "files/bfile.rb",
          :path => "files/fakeos-maple tree/bfile.rb",
+         :full_path => "/cookbook-folder/files/fakeos-maple tree/bfile.rb",
          :checksum => "csum3-platver-full",
          :specificity => "maple tree",
        },
        {
-         :name => "bfile.rb",
+         :name => "files/bfile.rb",
          :path => "files/fakeos-1/bfile.rb",
+         :full_path => "/cookbook-folder/files/fakeos-1/bfile.rb",
          :checksum => "csum4-platver-full",
          :specificity => "fakeos-1",
        },
 
        # directory adirectory
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
+         :full_path => "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
          :checksum => "csum-host-1",
          :specificity => "host-examplehost.example.org",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
+         :full_path => "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
          :checksum => "csum-host-2",
          :specificity => "host-examplehost.example.org",
        },
 
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
          :checksum => "csum-platver-full-1",
          :specificity => "ubuntu-9.10",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
          :checksum => "csum-platver-full-2",
          :specificity => "ubuntu-9.10",
        },
 
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
+         :full_path => "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
          :checksum => "csum-platver-partial-1",
          :specificity => "newubuntu-9",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
+         :full_path => "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
          :checksum => "csum-platver-partial-2",
          :specificity => "nweubuntu-9",
        },
 
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/ubuntu/adirectory/anotherfile1.rb.platform",
+         :full_path => "/cookbook-folder/files/ubuntu/adirectory/anotherfile1.rb.platform",
          :checksum => "csum-plat-1",
          :specificity => "ubuntu",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/ubuntu/adirectory/anotherfile2.rb.platform",
+         :full_path => "/cookbook-folder/files/ubuntu/adirectory/anotherfile2.rb.platform",
          :checksum => "csum-plat-2",
          :specificity => "ubuntu",
        },
 
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/default/adirectory/anotherfile1.rb.default",
+         :full_path => "/cookbook-folder/files/default/adirectory/anotherfile1.rb.default",
          :checksum => "csum-default-1",
          :specificity => "default",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/default/adirectory/anotherfile2.rb.default",
+         :full_path => "/cookbook-folder/files/default/adirectory/anotherfile2.rb.default",
          :checksum => "csum-default-2",
          :specificity => "default",
        },
        # for different/odd platform_versions
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
          :checksum => "csum2-platver-full-1",
          :specificity => "fakeos-2.0.rc.1",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
          :checksum => "csum2-platver-full-2",
          :specificity => "fakeos-2.0.rc.1",
        },
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
+         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
          :checksum => "csum2-platver-partial-1",
          :specificity => "newfakeos-2.0.rc",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
+         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
          :checksum => "csum2-platver-partial-2",
          :specificity => "newfakeos-2.0.rc",
        },
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
          :checksum => "csum3-platver-full-1",
          :specificity => "fakeos-maple tree",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
          :checksum => "csum3-platver-full-2",
          :specificity => "fakeos-maple tree",
        },
        {
-         :name => "anotherfile1.rb",
+         :name => "files/anotherfile1.rb",
          :path => "files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
          :checksum => "csum4-platver-full-1",
          :specificity => "fakeos-1",
        },
        {
-         :name => "anotherfile2.rb",
+         :name => "files/anotherfile2.rb",
          :path => "files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
+         :full_path => "/cookbook-folder/files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
          :checksum => "csum4-platver-full-2",
          :specificity => "fakeos-1",
        },

data/spec/unit/cookbook_version_spec.rb

@@ -25,38 +25,6 @@ describe Chef::CookbookVersion do
       expect(cookbook_version.name).to eq("tatft")
     end
 
-    it "has no attribute files" do
-      expect(cookbook_version.attribute_filenames).to be_empty
-    end
-
-    it "has no resource definition files" do
-      expect(cookbook_version.definition_filenames).to be_empty
-    end
-
-    it "has no cookbook files" do
-      expect(cookbook_version.file_filenames).to be_empty
-    end
-
-    it "has no recipe files" do
-      expect(cookbook_version.recipe_filenames).to be_empty
-    end
-
-    it "has no library files" do
-      expect(cookbook_version.library_filenames).to be_empty
-    end
-
-    it "has no LWRP resource files" do
-      expect(cookbook_version.resource_filenames).to be_empty
-    end
-
-    it "has no LWRP provider files" do
-      expect(cookbook_version.provider_filenames).to be_empty
-    end
-
-    it "has no metadata files" do
-      expect(cookbook_version.metadata_filenames).to be_empty
-    end
-
     it "has an empty set of all_files" do
       expect(cookbook_version.all_files).to be_empty
     end
@@ -82,17 +50,7 @@ describe Chef::CookbookVersion do
     let(:cookbook_paths_by_type) do
       {
         # Dunno if the paths here are representitive of what is set by CookbookLoader...
-        all_files:  Dir[File.join(cookbook_root, "**", "*.rb")],
-        attribute_filenames:  Dir[File.join(cookbook_root, "attributes", "**", "*.rb")],
-        definition_filenames: Dir[File.join(cookbook_root, "definitions", "**", "*.rb")],
-        file_filenames:       Dir[File.join(cookbook_root, "files", "**", "*.tgz")],
-        recipe_filenames:     Dir[File.join(cookbook_root, "recipes", "**", "*.rb")],
-        template_filenames:   Dir[File.join(cookbook_root, "templates", "**", "*.erb")],
-        library_filenames:    Dir[File.join(cookbook_root, "libraries", "**", "*.rb")],
-        resource_filenames:   Dir[File.join(cookbook_root, "resources", "**", "*.rb")],
-        provider_filenames:   Dir[File.join(cookbook_root, "providers", "**", "*.rb")],
-        root_filenames:       Array(File.join(cookbook_root, "README.rdoc")),
-        metadata_filenames:   Array(File.join(cookbook_root, "metadata.json")),
+        all_files:  Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 
@@ -102,18 +60,9 @@ describe Chef::CookbookVersion do
 
       let(:cookbook_version) do
         Chef::CookbookVersion.new("tatft", cookbook_root).tap do |c|
-        # Currently the cookbook loader finds all the files then tells CookbookVersion
-        # where they are.
-          c.attribute_filenames  = cookbook_paths_by_type[:attribute_filenames]
-          c.definition_filenames = cookbook_paths_by_type[:definition_filenames]
-          c.recipe_filenames     = cookbook_paths_by_type[:recipe_filenames]
-          c.template_filenames   = cookbook_paths_by_type[:template_filenames]
-          c.file_filenames       = cookbook_paths_by_type[:file_filenames]
-          c.library_filenames    = cookbook_paths_by_type[:library_filenames]
-          c.resource_filenames   = cookbook_paths_by_type[:resource_filenames]
-          c.provider_filenames   = cookbook_paths_by_type[:provider_filenames]
-          c.root_filenames       = cookbook_paths_by_type[:root_filenames]
-          c.metadata_filenames   = cookbook_paths_by_type[:metadata_filenames]
+          # Currently the cookbook loader finds all the files then tells CookbookVersion
+          # where they are.
+          c.all_files = cookbook_paths_by_type[:all_files]
         end
       end
 
@@ -168,18 +117,7 @@ describe Chef::CookbookVersion do
 
     let(:cookbook_paths_by_type) do
       {
-        # Dunno if the paths here are representitive of what is set by CookbookLoader...
-        all_files:            Dir[File.join(cookbook_root, "**", "*.rb")],
-        attribute_filenames:  Dir[File.join(cookbook_root, "attributes", "**", "*.rb")],
-        definition_filenames: Dir[File.join(cookbook_root, "definitions", "**", "*.rb")],
-        file_filenames:       Dir[File.join(cookbook_root, "files", "**", "*.*")],
-        recipe_filenames:     Dir[File.join(cookbook_root, "recipes", "**", "*.rb")],
-        template_filenames:   Dir[File.join(cookbook_root, "templates", "**", "*.*")],
-        library_filenames:    Dir[File.join(cookbook_root, "libraries", "**", "*.rb")],
-        resource_filenames:   Dir[File.join(cookbook_root, "resources", "**", "*.rb")],
-        provider_filenames:   Dir[File.join(cookbook_root, "providers", "**", "*.rb")],
-        root_filenames:       Array(File.join(cookbook_root, "README.rdoc")),
-        metadata_filenames:   Array(File.join(cookbook_root, "metadata.json")),
+        all_files:  Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 
@@ -187,16 +125,7 @@ describe Chef::CookbookVersion do
 
     let(:cookbook_version) do
       Chef::CookbookVersion.new("cookbook2", cookbook_root).tap do |c|
-        c.attribute_filenames  = cookbook_paths_by_type[:attribute_filenames]
-        c.definition_filenames = cookbook_paths_by_type[:definition_filenames]
-        c.recipe_filenames     = cookbook_paths_by_type[:recipe_filenames]
-        c.template_filenames   = cookbook_paths_by_type[:template_filenames]
-        c.file_filenames       = cookbook_paths_by_type[:file_filenames]
-        c.library_filenames    = cookbook_paths_by_type[:library_filenames]
-        c.resource_filenames   = cookbook_paths_by_type[:resource_filenames]
-        c.provider_filenames   = cookbook_paths_by_type[:provider_filenames]
-        c.root_filenames       = cookbook_paths_by_type[:root_filenames]
-        c.metadata_filenames   = cookbook_paths_by_type[:metadata_filenames]
+        c.all_files = cookbook_paths_by_type[:all_files]
       end
     end
 
@@ -255,19 +184,19 @@ describe Chef::CookbookVersion do
 
     it "should sort based on the version number" do
       examples = [
-                  # smaller, larger
-                  ["1.0", "2.0"],
-                  ["1.2.3", "1.2.4"],
-                  ["1.2.3", "1.3.0"],
-                  ["1.2.3", "1.3"],
-                  ["1.2.3", "2.1.1"],
-                  ["1.2.3", "2.1"],
-                  ["1.2", "1.2.4"],
-                  ["1.2", "1.3.0"],
-                  ["1.2", "1.3"],
-                  ["1.2", "2.1.1"],
-                  ["1.2", "2.1"],
-                 ]
+        # smaller, larger
+        ["1.0", "2.0"],
+        ["1.2.3", "1.2.4"],
+        ["1.2.3", "1.3.0"],
+        ["1.2.3", "1.3"],
+        ["1.2.3", "2.1.1"],
+        ["1.2.3", "2.1"],
+        ["1.2", "1.2.4"],
+        ["1.2", "1.3.0"],
+        ["1.2", "1.3"],
+        ["1.2", "2.1.1"],
+        ["1.2", "2.1"],
+      ]
       examples.each do |smaller, larger|
         sm = Chef::CookbookVersion.new("foo", "/tmp/blah")
         lg = Chef::CookbookVersion.new("foo", "/tmp/blah")
@@ -318,42 +247,4 @@ describe Chef::CookbookVersion do
 
   end
 
-  describe "when deprecation warnings are errors" do
-
-    subject(:cbv) { Chef::CookbookVersion.new("version validation", "/tmp/blah") }
-
-    it "errors on #status and #status=" do
-      expect { cbv.status = :wat }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-      expect { cbv.status }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-    end
-
-  end
-
-  describe "deprecated features" do
-
-    subject(:cbv) { Chef::CookbookVersion.new("tatft", "/tmp/blah").tap { |c| c.version = "1.2.3" } }
-
-    before do
-      Chef::Config[:treat_deprecation_warnings_as_errors] = false
-    end
-
-    it "gives a save URL for the standard cookbook API" do
-      expect(cbv.save_url).to eq("cookbooks/tatft/1.2.3")
-    end
-
-    it "gives a force save URL for the standard cookbook API" do
-      expect(cbv.force_save_url).to eq("cookbooks/tatft/1.2.3?force=true")
-    end
-
-    it "is \"ready\"" do
-      # WTF is this? what are the valid states? and why aren't they set with encapsulating methods?
-      # [Dan 15-Jul-2010]
-      expect(cbv.status).to eq(:ready)
-    end
-
-    include_examples "to_json equivalent to Chef::JSONCompat.to_json" do
-      let(:jsonable) { Chef::CookbookVersion.new("tatft", "/tmp/blah") }
-    end
-
-  end
 end

data/spec/unit/data_bag_item_spec.rb

@@ -52,6 +52,10 @@ describe Chef::DataBagItem do
       expect { data_bag_item.raw_data = { "id" => "octahedron" } }.not_to raise_error
     end
 
+    it "should let you set the raw_data with a hash containing symbols" do
+      expect { data_bag_item.raw_data = { :id => "octahedron" } }.not_to raise_error
+    end
+
     it "should let you set the raw_data from a mash" do
       expect { data_bag_item.raw_data = Mash.new({ "id" => "octahedron" }) }.not_to raise_error
     end