chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/unit/cookbook_manifest_spec.rb

@@ -205,9 +205,9 @@ describe "Chef::CookbookVersion manifest" do
   
   it "should return a manifest record based on priority preference: host" do
     node = Chef::Node.new
-    node[:platform] = "ubuntu"
-    node[:platform_version] = "9.10"
-    node[:fqdn] = "examplehost.example.org"
+    node.automatic_attrs[:platform] = "ubuntu"
+    node.automatic_attrs[:platform_version] = "9.10"
+    node.automatic_attrs[:fqdn] = "examplehost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "afile.rb")
     manifest_record.should_not be_nil
@@ -216,9 +216,9 @@ describe "Chef::CookbookVersion manifest" do
   
   it "should return a manifest record based on priority preference: platform & full version" do
     node = Chef::Node.new
-    node[:platform] = "ubuntu"
-    node[:platform_version] = "9.10"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "ubuntu"
+    node.automatic_attrs[:platform_version] = "9.10"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "afile.rb")
     manifest_record.should_not be_nil
@@ -227,9 +227,9 @@ describe "Chef::CookbookVersion manifest" do
 
   it "should return a manifest record based on priority preference: platform & partial version" do
     node = Chef::Node.new
-    node[:platform] = "newubuntu"
-    node[:platform_version] = "9.10"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "newubuntu"
+    node.automatic_attrs[:platform_version] = "9.10"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "afile.rb")
     manifest_record.should_not be_nil
@@ -238,9 +238,9 @@ describe "Chef::CookbookVersion manifest" do
   
   it "should return a manifest record based on priority preference: platform only" do
     node = Chef::Node.new
-    node[:platform] = "ubuntu"
-    node[:platform_version] = "1.0"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "ubuntu"
+    node.automatic_attrs[:platform_version] = "1.0"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "afile.rb")
     manifest_record.should_not be_nil
@@ -249,9 +249,9 @@ describe "Chef::CookbookVersion manifest" do
   
   it "should return a manifest record based on priority preference: default" do
     node = Chef::Node.new
-    node[:platform] = "notubuntu"
-    node[:platform_version] = "1.0"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "notubuntu"
+    node.automatic_attrs[:platform_version] = "1.0"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "afile.rb")
     manifest_record.should_not be_nil
@@ -260,9 +260,9 @@ describe "Chef::CookbookVersion manifest" do
 
   it "should return a manifest record based on priority preference: platform & full version - platform_version variant 1" do
     node = Chef::Node.new
-    node[:platform] = "fakeos"
-    node[:platform_version] = "2.0.rc.1"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "fakeos"
+    node.automatic_attrs[:platform_version] = "2.0.rc.1"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "bfile.rb")
     manifest_record.should_not be_nil
@@ -271,9 +271,9 @@ describe "Chef::CookbookVersion manifest" do
 
   it "should return a manifest record based on priority preference: platform & partial version - platform_version variant 1" do
     node = Chef::Node.new
-    node[:platform] = "newfakeos"
-    node[:platform_version] = "2.0.rc.1"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "newfakeos"
+    node.automatic_attrs[:platform_version] = "2.0.rc.1"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "bfile.rb")
     manifest_record.should_not be_nil
@@ -282,9 +282,9 @@ describe "Chef::CookbookVersion manifest" do
 
   it "should return a manifest record based on priority preference: platform & full version - platform_version variant 2" do
     node = Chef::Node.new
-    node[:platform] = "fakeos"
-    node[:platform_version] = "maple tree"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "fakeos"
+    node.automatic_attrs[:platform_version] = "maple tree"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "bfile.rb")
     manifest_record.should_not be_nil
@@ -293,9 +293,9 @@ describe "Chef::CookbookVersion manifest" do
 
   it "should return a manifest record based on priority preference: platform & full version - platform_version variant 3" do
     node = Chef::Node.new
-    node[:platform] = "fakeos"
-    node[:platform_version] = "1"
-    node[:fqdn] = "differenthost.example.org"
+    node.automatic_attrs[:platform] = "fakeos"
+    node.automatic_attrs[:platform_version] = "1"
+    node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
     manifest_record = @cookbook.preferred_manifest_record(node, :files, "bfile.rb")
     manifest_record.should_not be_nil
@@ -306,9 +306,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a directory of manifest records based on priority preference: host" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "examplehost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "examplehost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -320,9 +320,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a directory of manifest records based on priority preference: platform & full version" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -334,9 +334,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a directory of manifest records based on priority preference: platform & partial version" do
       node = Chef::Node.new
-      node[:platform] = "newubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "newubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -348,9 +348,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a directory of manifest records based on priority preference: platform only" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "1.0"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "1.0"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -362,9 +362,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a directory of manifest records based on priority preference: default" do
       node = Chef::Node.new
-      node[:platform] = "notubuntu"
-      node[:platform_version] = "1.0"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "notubuntu"
+      node.automatic_attrs[:platform_version] = "1.0"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -376,9 +376,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 1" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "2.0.rc.1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "2.0.rc.1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -390,9 +390,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a manifest record based on priority preference: platform & partial version - platform_version variant 1" do
       node = Chef::Node.new
-      node[:platform] = "newfakeos"
-      node[:platform_version] = "2.0.rc.1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "newfakeos"
+      node.automatic_attrs[:platform_version] = "2.0.rc.1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -404,9 +404,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 2" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "maple tree"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "maple tree"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -418,9 +418,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 3" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       manifest_records = @cookbook.preferred_manifest_records_for_directory(node, :files, "adirectory")
       manifest_records.should_not be_nil
@@ -436,9 +436,9 @@ describe "Chef::CookbookVersion manifest" do
   describe "when globbing for relative file paths based on filespecificity" do
     it "should return a list of relative paths based on priority preference: host" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "examplehost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "examplehost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -449,9 +449,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & full version" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -462,9 +462,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & partial version" do
       node = Chef::Node.new
-      node[:platform] = "newubuntu"
-      node[:platform_version] = "9.10"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "newubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -475,9 +475,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform only" do
       node = Chef::Node.new
-      node[:platform] = "ubuntu"
-      node[:platform_version] = "1.0"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "1.0"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -488,9 +488,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: default" do
       node = Chef::Node.new
-      node[:platform] = "notubuntu"
-      node[:platform_version] = "1.0"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "notubuntu"
+      node.automatic_attrs[:platform_version] = "1.0"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -501,9 +501,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & full version - platform_version variant 1" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "2.0.rc.1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "2.0.rc.1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -514,9 +514,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & partial version - platform_version variant 1" do
       node = Chef::Node.new
-      node[:platform] = "newfakeos"
-      node[:platform_version] = "2.0.rc.1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "newfakeos"
+      node.automatic_attrs[:platform_version] = "2.0.rc.1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -527,9 +527,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & full version - platform_version variant 2" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "maple tree"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "maple tree"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil
@@ -540,9 +540,9 @@ describe "Chef::CookbookVersion manifest" do
 
     it "should return a list of relative paths based on priority preference: platform & full version - platform_version variant 3" do
       node = Chef::Node.new
-      node[:platform] = "fakeos"
-      node[:platform_version] = "1"
-      node[:fqdn] = "differenthost.example.org"
+      node.automatic_attrs[:platform] = "fakeos"
+      node.automatic_attrs[:platform_version] = "1"
+      node.automatic_attrs[:fqdn] = "differenthost.example.org"
 
       filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "adirectory")
       filenames.should_not be_nil

data/spec/unit/cookbook_spec.rb

@@ -22,7 +22,9 @@ describe Chef::CookbookVersion do
 #  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"))
-    @cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(@cookbook_repo))
+    cl = Chef::CookbookLoader.new(@cookbook_repo)
+    cl.load_cookbooks
+    @cookbook_collection = Chef::CookbookCollection.new(cl)
     @cookbook = @cookbook_collection[:openldap]
     @node = Chef::Node.new
     @node.name "JuliaChild"
@@ -66,20 +68,6 @@ describe Chef::CookbookVersion do
     @cookbook.preferred_filename(@node, :files, 'a-filename', 'the-checksum').should be_nil
   end
 
-# TODO: timh, cw: 5/20/2010: removed CookbookVersion.recipe? as it's not used; see cookbook.rb
-#   it "should allow you to test for a recipe with recipe?" do
-#     @cookbook.recipe_filenames = [ "one", "two" ]
-#     @cookbook.recipe?("one").should eql(true)
-#     @cookbook.recipe?("shanghai").should eql(false)
-#   end
-
-# TODO: timh, cw: 5/20/2010: removed CookbookVersion.recipe? as it's not used; see cookbook.rb
-#  it "should allow you to test for a recipe? with a fq recipe name" do
-#    @cookbook.recipe_filenames = [ "one", "two" ]
-#    @cookbook.recipe?("openldap::one").should eql(true)
-#    @cookbook.recipe?("shanghai::city").should eql(false)
-#  end
-
   it "should allow you to include a fully-qualified recipe using the DSL" do
     # DSL method include_recipe allows multiple arguments, so extract the first
     recipe = @run_context.include_recipe("openldap::gigantor").first
@@ -93,9 +81,4 @@ describe Chef::CookbookVersion do
     lambda { @cookbook.load_recipe("doesnt_exist", @node) }.should raise_error(ArgumentError)
   end
 
-  it "should allow you to load an attribute file by name via load_attribute" do
-    @node.include_attribute("openldap::smokey")
-    @node.smokey.should == "robinson"
-  end
-
 end

data/spec/unit/cookbook_version_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,56 +17,10 @@
 
 require 'spec_helper'
 
-describe Chef::MinimalCookbookVersion do
-  describe "when first created" do
-    before do
-      @params = { "id"=>"1a806f1c-b409-4d8e-abab-fa414ff5b96d",
-                  "key"=>"activemq",
-                  "value"=>{"version"=>"0.3.3", "deps"=>{"java"=>">= 0.0.0", "runit"=>">= 0.0.0"}}}
-      @minimal_cookbook_version = Chef::MinimalCookbookVersion.new(@params)
-    end
-
-    it "has a name" do
-      @minimal_cookbook_version.name.should == 'activemq'
-    end
-
-    it "has a version" do
-      @minimal_cookbook_version.version.should == '0.3.3'
-    end
-
-    it "has a list of dependencies" do
-      @minimal_cookbook_version.deps.should == {"java" => ">= 0.0.0", "runit" => ">= 0.0.0"}
-    end
-
-    it "has cookbook metadata" do
-      metadata = @minimal_cookbook_version.metadata
-
-      metadata.name.should == 'activemq'
-      metadata.dependencies['java'].should == '>= 0.0.0'
-      metadata.dependencies['runit'].should == '>= 0.0.0'
-    end
-  end
-
-  describe "when created from cookbooks with old style version contraints" do
-    before do
-      @params = { "id"=>"1a806f1c-b409-4d8e-abab-fa414ff5b96d",
-                  "key"=>"activemq",
-                  "value"=>{"version"=>"0.3.3", "deps"=>{"apt" => ">> 1.0.0"}}}
-      @minimal_cookbook_version = Chef::MinimalCookbookVersion.new(@params)
-    end
-
-    it "translates the version constraints" do
-      metadata = @minimal_cookbook_version.metadata
-      metadata.dependencies['apt'].should == '> 1.0.0'
-    end
-  end
-end
-
 describe Chef::CookbookVersion do
   describe "when first created" do
     before do
-      @couchdb_driver = Chef::CouchDB.new
-      @cookbook_version = Chef::CookbookVersion.new("tatft", @couchdb_driver)
+      @cookbook_version = Chef::CookbookVersion.new("tatft")
     end
 
     it "has a name" do
@@ -114,14 +68,6 @@ describe Chef::CookbookVersion do
       @cookbook_version.should be_frozen_version
     end
 
-    it "has no couchdb id" do
-      @cookbook_version.couchdb_id.should be_nil
-    end
-
-    it "has the couchdb driver it was given on create" do
-      @cookbook_version.couchdb.should equal(@couchdb_driver)
-    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]
@@ -133,19 +79,19 @@ describe Chef::CookbookVersion do
     end
 
     it "creates a manifest hash of its contents" do
-      expected = {"recipes"=>[], 
-                  "definitions"=>[], 
-                  "libraries"=>[], 
-                  "attributes"=>[], 
-                  "files"=>[], 
-                  "templates"=>[], 
-                  "resources"=>[], 
-                  "providers"=>[], 
-                  "root_files"=>[], 
-                  "cookbook_name"=>"tatft", 
+      expected = {"recipes"=>[],
+                  "definitions"=>[],
+                  "libraries"=>[],
+                  "attributes"=>[],
+                  "files"=>[],
+                  "templates"=>[],
+                  "resources"=>[],
+                  "providers"=>[],
+                  "root_files"=>[],
+                  "cookbook_name"=>"tatft",
                   "metadata"=>Chef::Cookbook::Metadata.new,
-                  "version"=>"0.0.0", 
-                  "name"=>"tatft-0.0.0"} 
+                  "version"=>"0.0.0",
+                  "name"=>"tatft-0.0.0"}
       @cookbook_version.manifest.should == expected
     end
   end
@@ -267,7 +213,12 @@ describe Chef::CookbookVersion do
 
     describe "raises an error when attempting to load a missing cookbook_file and" do
       before do
-        node = Chef::Node.new.tap {|n| n.name("sample.node"); n[:fqdn] = "sample.example.com"; n[:platform] = "ubuntu"; n[:platform_version] = "10.04"}
+        node = Chef::Node.new.tap do |n|
+          n.name("sample.node")
+          n.automatic_attrs[:fqdn] = "sample.example.com"
+          n.automatic_attrs[:platform] = "ubuntu"
+          n.automatic_attrs[:platform_version] = "10.04"
+        end
         @attempt_to_load_file = lambda { @cookbook_version.preferred_manifest_record(node, :files, "no-such-thing.txt") }
       end
 
@@ -275,7 +226,7 @@ describe Chef::CookbookVersion do
         useful_explanation = Regexp.new(Regexp.escape("Cookbook 'tatft' (0.0.0) does not contain"))
         @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
       end
-  
+
       it "lists suggested places to look" do
         useful_explanation = Regexp.new(Regexp.escape("files/default/no-such-thing.txt"))
         @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
@@ -320,7 +271,7 @@ describe Chef::CookbookVersion do
       b.version = "1.2.0"
       a.should == b
     end
-    
+
 
     it "should not allow you to sort cookbooks with different names" do
       apt = Chef::CookbookVersion.new "apt"
@@ -353,54 +304,4 @@ describe Chef::CookbookVersion do
 
   end
 
-  describe "when deleting in the database" do
-    before do
-      @couchdb_driver = Chef::CouchDB.new
-      @cookbook_version = Chef::CookbookVersion.new("tatft", @couchdb_driver)
-      @cookbook_version.version = "1.2.3"
-      @couchdb_rev = "_123456789"
-      @cookbook_version.couchdb_rev = @couchdb_rev
-    end
-
-    it "deletes its document from couchdb" do
-      @couchdb_driver.should_receive(:delete).with("cookbook_version", "tatft-1.2.3", @couchdb_rev)
-      @cookbook_version.cdb_destroy
-    end
-
-    it "deletes associated checksum objects when purged" do
-      checksums = {"12345" => "/tmp/foo", "23456" => "/tmp/bar", "34567" => "/tmp/baz"}
-      @cookbook_version.stub!(:checksums).and_return(checksums)
-
-      chksum_docs = checksums.map do |md5, path|
-        cksum_doc = mock("Chef::Checksum for #{md5} at #{path}")
-        Chef::Checksum.should_receive(:cdb_load).with(md5, @couchdb_driver).and_return(cksum_doc)
-        cksum_doc.should_receive(:purge)
-        cksum_doc
-      end
-
-      @cookbook_version.should_receive(:cdb_destroy)
-      @cookbook_version.purge
-    end
-
-    it "successfully purges when associated checksum objects are missing" do
-      checksums = {"12345" => "/tmp/foo", "23456" => "/tmp/bar", "34567" => "/tmp/baz"}
-
-      chksum_docs = checksums.map do |md5, path|
-        cksum_doc = mock("Chef::Checksum for #{md5} at #{path}")
-        Chef::Checksum.should_receive(:cdb_load).with(md5, @couchdb_driver).and_return(cksum_doc)
-        cksum_doc.should_receive(:purge)
-        cksum_doc
-      end
-
-      missing_checksum = {"99999" => "/tmp/qux"}
-      Chef::Checksum.should_receive(:cdb_load).with("99999", @couchdb_driver).and_raise(Chef::Exceptions::CouchDBNotFound)
-
-      @cookbook_version.stub!(:checksums).and_return(checksums.merge(missing_checksum))
-
-      @cookbook_version.should_receive(:cdb_destroy)
-      lambda {@cookbook_version.purge}.should_not raise_error
-    end
-
-  end
-
 end