microwave 1.0.4 → 11.400.2

data/spec/unit/platform_spec.rb

@@ -129,8 +129,8 @@ describe Chef::Platform do
     kitty = Chef::Resource::Cat.new("loulou")    
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     Chef::Platform.find_provider_for_node(node, kitty).should eql("nice")
   end
 
@@ -139,8 +139,8 @@ describe Chef::Platform do
     kitty.stub!(:provider).and_return(Chef::Provider::File)
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     Chef::Platform.find_provider_for_node(node, kitty).should eql(Chef::Provider::File)
   end
 
@@ -150,15 +150,15 @@ describe Chef::Platform do
     Chef::Platform.platforms[:default].delete(:cat)
     node = Chef::Node.new
     node.name("Intel")
-    node.platform("mac_os")
-    node.platform_version("8.5")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "8.5"
     Chef::Platform.find_provider_for_node(node, kitty).should eql(Chef::Provider::Cat)
   end
  
   def setup_file_resource
     node = Chef::Node.new
-    node.platform("mac_os_x")
-    node.platform_version("9.2.2")
+    node.automatic_attrs[:platform] = "mac_os_x"
+    node.automatic_attrs[:platform_version] = "9.2.2"
     run_context = Chef::RunContext.new(node, {}, @events)
     [ Chef::Resource::File.new("whateva", run_context), run_context ]
   end

data/spec/unit/provider/breakpoint_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.
@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 describe Chef::Provider::Breakpoint do
-  
+
   before do
     @resource = Chef::Resource::Breakpoint.new
     @node = Chef::Node.new
@@ -29,13 +29,13 @@ describe Chef::Provider::Breakpoint do
     @run_context.stub!(:resource_collection).and_return(@collection)
     @provider = Chef::Provider::Breakpoint.new(@resource, @run_context)
   end
-  
+
   it "responds to load_current_resource" do
     @provider.should respond_to(:load_current_resource)
   end
-  
+
   it "gets the iterator from @collection and pauses it" do
-    Shef.stub!(:running?).and_return(true)
+    Shell.stub!(:running?).and_return(true)
     @iterator = mock("stepable_iterator")
     @collection.stub!(:iterator).and_return(@iterator)
     @iterator.should_receive(:pause)
@@ -43,8 +43,8 @@ describe Chef::Provider::Breakpoint do
     @resource.should be_updated
   end
 
-  it "doesn't pause the iterator if Shef isn't running" do
-    Shef.stub!(:running?).and_return(false)
+  it "doesn't pause the iterator if chef-shell isn't running" do
+    Shell.stub!(:running?).and_return(false)
     @iterator = mock("stepable_iterator")
     @collection.stub!(:iterator).and_return(@iterator)
     @iterator.should_not_receive(:pause)

data/spec/unit/provider/cookbook_file_spec.rb

@@ -28,7 +28,9 @@ describe Chef::Provider::CookbookFile do
 
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
-    @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)
     @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
 
     @new_resource = Chef::Resource::CookbookFile.new('apache2_module_conf_generate.pl', @run_context)
@@ -83,7 +85,7 @@ EXPECTED
       @provider.current_resource = @current_resource
     end
 
-    after { ::File.exist?(@install_to) && FileUtils.rm(@install_to) }
+    after { ::File.exist?(File.dirname(@install_to)) && FileUtils.rm_rf(@install_to) }
 
     it "loads the current file state" do
       @provider.load_current_resource
@@ -95,12 +97,6 @@ EXPECTED
       @provider.file_cache_location.should == expected
     end
 
-    it "stages the cookbook to a temporary file" do
-      @new_resource.path(@install_to)
-      @provider.should_receive(:deploy_tempfile)
-      @provider.run_action(:create)
-    end
-
     it "installs the file from the cookbook cache" do
       @new_resource.path(@install_to)
       @provider.should_receive(:backup_new_resource)

data/spec/unit/provider/deploy/revision_spec.rb

@@ -53,13 +53,11 @@ describe Chef::Provider::Deploy::Revision do
 
   it "stores the release dir in the file cache when copying the cached repo" do
     FileUtils.stub!(:mkdir_p)
-    @provider.stub!(:run_command).and_return(true)
+    FileUtils.stub!(:cp_r)
     @provider.copy_cached_repo
-    @provider.converge
     @provider.stub!(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.copy_cached_repo
-    @provider.converge
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
 
     @provider.all_releases.should == [@expected_release_dir,second_release]
@@ -67,22 +65,18 @@ describe Chef::Provider::Deploy::Revision do
 
   it "removes a release from the file cache when it's used again in another release and append it to the end" do
     FileUtils.stub!(:mkdir_p)
-    @provider.stub!(:run_command).and_return(true)
+    FileUtils.stub!(:cp_r)
     @provider.copy_cached_repo
-    @provider.converge
     @provider.stub!(:release_slug).and_return("73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2")
     @provider.load_current_resource
     @provider.copy_cached_repo
-    @provider.converge
     second_release = "/my/deploy/dir/releases/73219b87e977d9c7ba1aa57e9ad1d88fa91a0ec2"
     @provider.all_releases.should == [@expected_release_dir,second_release]
     @provider.copy_cached_repo
-    @provider.converge
 
     @provider.stub!(:release_slug).and_return("8a3195bf3efa246f743c5dfa83683201880f935c")
     @provider.load_current_resource
     @provider.copy_cached_repo
-    @provider.converge
     @provider.all_releases.should == [second_release, @expected_release_dir]
   end
 

data/spec/unit/provider/deploy_spec.rb

@@ -54,15 +54,11 @@ describe Chef::Provider::Deploy do
     end
 
     it "creates deploy_to dir" do
+      ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
       @provider.stub(:update_cached_repo)
       @provider.deploy
     end
 
-    it "creates deploy_to dir before calling update_cached_repo (CHEF-3435)" do
-      @provider.send(:converge_actions).should_receive(:empty?).and_return(false)
-      @provider.should_receive(:update_cached_repo).ordered
-      @provider.deploy
-    end
   end
 
   it "does not create deploy_to dir if it exists" do
@@ -75,10 +71,10 @@ describe Chef::Provider::Deploy do
     @provider.stub(:symlink)
     @provider.stub(:migrate)
     @provider.deploy
-    @provider.converge
   end
 
   it "ensures the deploy_to dir ownership after the verfication that it exists" do
+    ::Dir.should_receive(:chdir).with(@expected_release_dir).exactly(4).times
     @provider.should_receive(:verify_directories_exist).ordered
     @provider.should_receive(:enforce_ownership).ordered
     @provider.stub(:copy_cached_repo)
@@ -106,7 +102,6 @@ describe Chef::Provider::Deploy do
     @provider.should_receive(:callback).with(:after_restart, nil)
     @provider.should_receive(:cleanup!)
     @provider.deploy
-    @provider.converge
   end
 
   it "should not deploy if there is already a deploy at release_path, and it is the current release" do
@@ -134,7 +129,6 @@ describe Chef::Provider::Deploy do
     @resource.svn_force_export true
     @provider.scm_provider.should_receive(:run_action).with(:force_export)
     @provider.update_cached_repo
-    @provider.converge
   end
 
   it "Removes the old release before deploying when force deploying over it" do
@@ -259,7 +253,6 @@ describe Chef::Provider::Deploy do
     @runner.should_receive(:converge)
     callback_code = Proc.new { :noop }
     @provider.callback(:whatevs, callback_code)
-    @provider.converge
   end
 
   it "loads callback files from the release/ dir if the file exists" do
@@ -268,7 +261,6 @@ describe Chef::Provider::Deploy do
     ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
     @provider.should_receive(:from_file).with(foo_callback)
     @provider.callback(:foo, "deploy/foo.rb")
-    @provider.converge
   end
 
   it "raises a runtime error if a callback file is explicitly specified but does not exist" do
@@ -286,7 +278,6 @@ describe Chef::Provider::Deploy do
     ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
     @provider.should_receive(:from_file).with(bar_callback)
     @provider.callback(:bar, nil)
-    @provider.converge
   end
 
   it "skips an eval callback if the file doesn't exist" do
@@ -295,7 +286,6 @@ describe Chef::Provider::Deploy do
     ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
     @provider.should_not_receive(:from_file)
     @provider.callback(:barbaz, nil)
-    @provider.converge
   end
 
   # CHEF-3449 #converge_by is called in #recipe_eval and must happen in sequence
@@ -326,22 +316,19 @@ describe Chef::Provider::Deploy do
   it "syncs the cached copy of the repo" do
     @provider.scm_provider.should_receive(:run_action).with(:sync)
     @provider.update_cached_repo
-    @provider.converge
   end
 
   it "makes a copy of the cached repo in releases dir" do
     FileUtils.should_receive(:mkdir_p).with("/my/deploy/dir/releases")
-    @provider.should_receive(:run_command).with({:command => "cp -RPp /my/deploy/dir/shared/cached-copy/. #{@expected_release_dir}"})
+    FileUtils.should_receive(:cp_r).with("/my/deploy/dir/shared/cached-copy/.", @expected_release_dir, :preserve => true)
     @provider.copy_cached_repo
-    @provider.converge
   end
 
   it "calls the internal callback :release_created when copying the cached repo" do
     FileUtils.stub!(:mkdir_p)
-    @provider.stub!(:run_command).and_return(true)
+    FileUtils.stub!(:cp_r)
     @provider.should_receive(:release_created)
     @provider.copy_cached_repo
-    @provider.converge
   end
 
   it "chowns the whole release dir to user and group specified in the resource" do
@@ -349,7 +336,6 @@ describe Chef::Provider::Deploy do
     @resource.group "bar"
     FileUtils.should_receive(:chown_R).with("foo", "bar", "/my/deploy/dir")
     @provider.enforce_ownership
-    @provider.converge
   end
 
   it "skips the migration when resource.migrate => false but runs symlinks before migration" do
@@ -357,7 +343,6 @@ describe Chef::Provider::Deploy do
     @provider.should_not_receive :run_command
     @provider.should_receive :run_symlinks_before_migrate
     @provider.migrate
-    @provider.converge
   end
 
   it "links the database.yml and runs resource.migration_command when resource.migrate #=> true" do
@@ -377,7 +362,6 @@ describe Chef::Provider::Deploy do
                                                 :log_tag => "deploy[/my/deploy/dir]",
                                                 :environment => {"RAILS_ENV"=>"production"})
     @provider.migrate
-    @provider.converge
   end
 
   it "purges the current release's /log /tmp/pids/ and /public/system directories" do
@@ -385,7 +369,6 @@ describe Chef::Provider::Deploy do
     FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/tmp/pids")
     FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/public/system")
     @provider.purge_tempfiles_from_current_release
-    @provider.converge
   end
 
   it "symlinks temporary files and logs from the shared dir into the current release" do
@@ -401,7 +384,6 @@ describe Chef::Provider::Deploy do
     FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/config/database.yml", @expected_release_dir + "/config/database.yml")
     @provider.should_receive(:enforce_ownership)
     @provider.link_tempfiles_to_current_release
-    @provider.converge
   end
 
   it "symlinks the current release dir into production" do
@@ -409,7 +391,6 @@ describe Chef::Provider::Deploy do
     FileUtils.should_receive(:ln_sf).with(@expected_release_dir, "/my/deploy/dir/current")
     @provider.should_receive(:enforce_ownership)
     @provider.link_current_release_to_production
-    @provider.converge
   end
 
   context "with a customized app layout" do
@@ -419,14 +400,12 @@ describe Chef::Provider::Deploy do
       @resource.create_dirs_before_symlink(%w{baz qux})
       @resource.symlinks "foo/bar" => "foo/bar", "baz" => "qux/baz"
       @resource.symlink_before_migrate "radiohead/in_rainbows.yml" => "awesome"
-      @provider.converge
     end
 
     it "purges the purge_before_symlink directories" do
       FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/foo")
       FileUtils.should_receive(:rm_rf).with(@expected_release_dir + "/bar")
       @provider.purge_tempfiles_from_current_release
-      @provider.converge
     end
 
     it "symlinks files from the shared directory to the current release directory" do
@@ -439,7 +418,6 @@ describe Chef::Provider::Deploy do
       FileUtils.should_receive(:ln_sf).with("/my/deploy/dir/shared/radiohead/in_rainbows.yml", @expected_release_dir + "/awesome")
       @provider.should_receive(:enforce_ownership)
       @provider.link_tempfiles_to_current_release
-      @provider.converge
     end
     
   end
@@ -447,14 +425,12 @@ describe Chef::Provider::Deploy do
   it "does nothing for restart if restart_command is empty" do
     @provider.should_not_receive(:run_command)
     @provider.restart
-    @provider.converge
   end
 
   it "runs the restart command in the current application dir when the resource has a restart_command" do
     @resource.restart_command "restartcmd"
     @provider.should_receive(:run_command).with(:command => "restartcmd", :cwd => "/my/deploy/dir/current", :log_tag => "deploy[/my/deploy/dir]", :log_level => :debug)
     @provider.restart
-    @provider.converge
   end
 
   it "lists all available releases" do
@@ -474,7 +450,6 @@ describe Chef::Provider::Deploy do
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040200000000")
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040300000000")
     @provider.cleanup!
-    @provider.converge
   end
 
   it "removes all but a certain number of releases when the resource has a keep_releases" do
@@ -486,7 +461,6 @@ describe Chef::Provider::Deploy do
     @provider.stub!(:all_releases).and_return(all_releases)
     FileUtils.should_receive(:rm_rf).with("/my/deploy/dir/20040100000000")
     @provider.cleanup!
-    @provider.converge
   end
 
   it "fires a callback for :release_deleted when deleting an old release" do
@@ -497,7 +471,6 @@ describe Chef::Provider::Deploy do
     FileUtils.stub!(:rm_rf)
     @provider.should_receive(:release_deleted).with("/my/deploy/dir/20040300000000")
     @provider.cleanup!
-    @provider.converge
   end
 
   it "puts resource.to_hash in @configuration for backwards compat with capistano-esque deploy hooks" do
@@ -509,7 +482,6 @@ describe Chef::Provider::Deploy do
     resource.environment "production"
     provider = Chef::Provider::Deploy.new(resource, @run_context)
     provider.instance_variable_get(:@configuration)[:environment].should eql("production")
-    @provider.converge
   end
 
   it "shouldn't give a no method error on migrate if the environment is nil" do
@@ -517,7 +489,7 @@ describe Chef::Provider::Deploy do
     @provider.stub!(:run_symlinks_before_migrate)
     @provider.stub!(:run_command)
     @provider.migrate
-    @provider.converge
+
   end
 
   context "using inline recipes for callbacks" do
@@ -527,7 +499,6 @@ describe Chef::Provider::Deploy do
       recipe_code = Proc.new {snitch = 42}
       #@provider.should_receive(:instance_eval).with(&recipe_code)
       @provider.callback(:whateverz, recipe_code)
-      @provider.converge
       snitch.should == 42
     end
 
@@ -536,7 +507,6 @@ describe Chef::Provider::Deploy do
       ::Dir.should_receive(:chdir).with(@expected_release_dir).and_yield
       @provider.should_receive(:from_file).with(@expected_release_dir + "/chefz/foobar_callback.rb")
       @provider.callback(:whateverz, "chefz/foobar_callback.rb")
-      @provider.converge
     end
 
     it "instance_evals a block/proc for restart command" do
@@ -544,7 +514,6 @@ describe Chef::Provider::Deploy do
       restart_cmd = Proc.new {snitch = 42}
       @resource.restart(&restart_cmd)
       @provider.restart
-      @provider.converge
       snitch.should == 42
     end
 
@@ -554,7 +523,6 @@ describe Chef::Provider::Deploy do
     it "defines sudo as a forwarder to execute" do
       @provider.should_receive(:execute).with("the moon, fool")
       @provider.sudo("the moon, fool")
-      @provider.converge
     end
 
     it "defines run as a forwarder to execute, setting the user, group, cwd and environment to new_resource.user" do
@@ -583,7 +551,7 @@ describe Chef::Provider::Deploy do
         end
       }.twice
       @provider.run("iGoToHell4this")
-      @provider.converge
+
     end
 
     it "defines run as a forwarder to execute, setting cwd and environment but not override" do
@@ -594,7 +562,6 @@ describe Chef::Provider::Deploy do
       mock_execution.should_receive(:cwd).with(no_args()).and_return("/some/value")
       mock_execution.should_receive(:environment).with(no_args()).and_return({})
       @provider.run("iGoToHell4this")
-      @provider.converge
     end
 
 
@@ -615,7 +582,6 @@ describe Chef::Provider::Deploy do
       runner.should_receive(:converge)
       #
       @provider.callback(:phony, callback_code)
-      @provider.converge
       snitch.should be_an_instance_of(Chef::Resource::Execute)
       snitch.user.should == "tehCat"
     end

data/spec/unit/provider/directory_spec.rb

@@ -19,13 +19,16 @@
 require 'ostruct'
 
 require 'spec_helper'
+require 'tmpdir'
 
 describe Chef::Provider::Directory do
   before(:each) do
-    @new_resource = Chef::Resource::Directory.new('/tmp')
-    @new_resource.owner(500)
-    @new_resource.group(500)
-    @new_resource.mode(0644)
+    @new_resource = Chef::Resource::Directory.new(Dir.tmpdir)
+    if !windows?
+      @new_resource.owner(500)
+      @new_resource.group(500)
+      @new_resource.mode(0644)
+    end
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
@@ -33,80 +36,112 @@ describe Chef::Provider::Directory do
     @directory = Chef::Provider::Directory.new(@new_resource, @run_context)
   end
 
-  context "load_current_resource_attrs", :unix_only do
-    it "should load the current resource based on the new resource" do
-      File.stub!(:exist?).and_return(true)
+
+  describe "scanning file security metadata on windows" do
+    before do
+    end
+
+    it "describes the directory's access rights" do
+      pending
+    end
+  end
+
+  describe "scanning file security metadata on unix" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(false)
+    end
+    let(:mock_stat) do
       cstats = mock("stats")
       cstats.stub!(:uid).and_return(500)
       cstats.stub!(:gid).and_return(500)
       cstats.stub!(:mode).and_return(0755)
-      File.should_receive(:stat).twice.and_return(cstats)
-      @directory.load_current_resource
-      @directory.current_resource.path.should eql(@new_resource.path)
-      @directory.current_resource.owner.should eql(500)
-      @directory.current_resource.group.should eql(500)
-      @directory.current_resource.mode.should == 00755
-    end
-  
-    it "should create a new directory on create, setting updated to true" do
-      @new_resource.path "/tmp/foo"
-  
-      File.should_receive(:exist?).exactly(3).and_return(false)
-      Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
-  
-      @directory.should_receive(:set_all_access_controls)
-      @directory.stub!(:update_new_file_state)
-      @directory.run_action(:create)
-      @directory.new_resource.should be_updated
+      cstats
     end
-  
-    it "should raise an exception if the parent directory does not exist and recursive is false" do 
-      @new_resource.path "/tmp/some/dir"
-      @new_resource.recursive false
-      lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist) 
-    end
-  
-    it "should create a new directory when parent directory does not exist if recursive is true and permissions are correct" do
-      @new_resource.path "/path/to/dir"
-      @new_resource.recursive true
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-  
-      File.should_receive(:exist?).with('/path/to').ordered.and_return(false)
-      File.should_receive(:exist?).with('/path').ordered.and_return(true)
-      File.should_receive(:writable?).with('/path').ordered.and_return(true)
-      File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
-   
-      FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true) 
-      @directory.should_receive(:set_all_access_controls)
-      @directory.stub!(:update_new_file_state)
-      @directory.run_action(:create)
-      @new_resource.should be_updated
+
+    it "describes the access mode as a String of octal integers" do
+      File.stub!(:exist?).and_return(true)
+      File.should_receive(:stat).and_return(mock_stat)
+      @directory.load_current_resource
+      @directory.current_resource.mode.should == "0755"
     end
-   
-    # it "should raise an error when creating a directory recursively and permissions do not allow creation" do
-      
-    # end
-  
-    it "should raise an error when creating a directory when parent directory is a file" do
-      File.should_receive(:directory?).and_return(false)
-      Dir.should_not_receive(:mkdir).with(@new_resource.path)
-      lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
-      @directory.new_resource.should_not be_updated
+
+    context "when user and group are specified with UID/GID" do
+      it "describes the current owner and group as UID and GID" do
+        File.stub!(:exist?).and_return(true)
+        File.should_receive(:stat).and_return(mock_stat)
+        @directory.load_current_resource
+        @directory.current_resource.path.should eql(@new_resource.path)
+        @directory.current_resource.owner.should eql(500)
+        @directory.current_resource.group.should eql(500)
+      end
     end
-    
-    it "should not create the directory if it already exists" do
-      stub_file_cstats
-      @new_resource.path "/tmp/foo"
-      File.should_receive(:exist?).exactly(3).and_return(true)
-      Dir.should_not_receive(:mkdir).with(@new_resource.path)
-      @directory.should_receive(:set_all_access_controls)
-      @directory.run_action(:create)
+
+    context "when user/group are specified with user/group names" do
     end
   end
 
-  context "load_current_resource_attrs", :windows_only do
-    pending "CHEF-3557: Fix implicit resource change collection on Windows"
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should create a new directory on create, setting updated to true", :unix_only do
+    @new_resource.path "/tmp/foo"
+
+    File.should_receive(:exist?).exactly(2).and_return(false)
+    File.should_receive(:directory?).with("/tmp").and_return(true)
+    Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
+
+    @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
+    @directory.run_action(:create)
+    @directory.new_resource.should be_updated
+  end
+
+  it "should raise an exception if the parent directory does not exist and recursive is false" do 
+    @new_resource.path "/tmp/some/dir"
+    @new_resource.recursive false
+    lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist) 
+  end
+
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should create a new directory when parent directory does not exist if recursive is true and permissions are correct", :unix_only do
+    @new_resource.path "/path/to/dir"
+    @new_resource.recursive true
+    File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+
+    File.should_receive(:exist?).with('/path/to').ordered.and_return(false)
+    File.should_receive(:exist?).with('/path').ordered.and_return(true)
+    File.should_receive(:writable?).with('/path').ordered.and_return(true)
+    File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+
+    FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true) 
+    @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
+    @directory.run_action(:create)
+    @new_resource.should be_updated
+  end
+
+
+  it "should raise an error when creating a directory when parent directory is a file" do
+    File.should_receive(:directory?).and_return(false)
+    Dir.should_not_receive(:mkdir).with(@new_resource.path)
+    lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
+    @directory.new_resource.should_not be_updated
+  end
+
+  # Unix only for now. While file security attribute reporting for windows is
+  # disabled, unix and windows differ in the number of exist? calls that are
+  # made by the provider.
+  it "should not create the directory if it already exists", :unix_only do
+    stub_file_cstats
+    @new_resource.path "/tmp/foo"
+    File.should_receive(:directory?).twice.and_return(true)
+    File.should_receive(:writable?).with("/tmp").and_return(true)
+    File.should_receive(:exist?).exactly(3).and_return(true)
+    Dir.should_not_receive(:mkdir).with(@new_resource.path)
+    @directory.should_receive(:set_all_access_controls)
+    @directory.run_action(:create)
   end
 
   it "should delete the directory if it exists, and is writable with action_delete" do