Updating Link provider delete action specs, for chef-208

Author: adamhjk

chef/lib/chef/exceptions.rb

@@ -29,5 +29,6 @@ class UnsupportedAction < RuntimeError; end
     class MissingLibrary < RuntimeError; end
     class User < RuntimeError; end
     class Group < RuntimeError; end
+    class Link < RuntimeError; end
   end
 end

chef/lib/chef/provider/link.rb

@@ -69,21 +69,21 @@ def action_create
 
       def action_delete
         if ::File.exists?(@new_resource.target_file)
-	      if @new_resource.link_type == :symbolic 
-	        if ::File.symlink?(@new_resource.target_file)
+  	      if @new_resource.link_type == :symbolic 
+  	        if ::File.symlink?(@new_resource.target_file)
               Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.target_file}")
               ::File.delete(@new_resource.target_file)
               @new_resource.updated = true
             else
-              raise "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a symbolic link."
+              raise Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a symbolic link."
             end
           elsif @new_resource.link_type == :hard 
             if ::File.exists?(@new_resource.to) && ::File.stat(@current_resource.target_file).ino == ::File.stat(@new_resource.to).ino
               Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.target_file}")
               ::File.delete(@new_resource.target_file)
               @new_resource.updated = true
             else
-              raise "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a hard link."
+              raise Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a hard link."
             end
           end
         end

chef/spec/unit/provider/link_spec.rb

@@ -277,14 +277,14 @@
     Chef::Resource::Link.stub!(:new).and_return(@current_resource)
     @provider.current_resource = @current_resource
     @new_resource.stub!(:to_s).and_return("link[/tmp/fofile]")
+    File.stub!(:symlink?).and_return(true)
     File.stub!(:exists?).and_return(true)
     File.stub!(:delete).and_return(true)
   end
 
-  describe "when the file exists and is writeable" do
+  describe "when the file exists" do
     before do
       File.should_receive(:exists?).with("/tmp/fofile-link").and_return(true)
-      File.should_receive(:writable?).with("/tmp/fofile-link").and_return(true)
     end
 
     it "should log an appropriate error message" do
@@ -303,23 +303,24 @@
     end
   end
 
-  describe "when the file does not exist" do
-    before do
-      File.should_receive(:exists?).with("/tmp/fofile-link").and_return(false)
+  describe "when the file exists but is not a symbolic link" do
+    before(:each) do
+      File.should_receive(:symlink?).with("/tmp/fofile-link").and_return(false)
     end
 
-    it "should raise a runtime error" do
-      lambda { @provider.action_delete }.should raise_error(RuntimeError)
+    it "should raise a Link error" do
+      lambda { @provider.action_delete }.should raise_error(Chef::Exceptions::Link)
     end
   end
 
-  describe "when the file isn't writable" do
+  describe "when the file does not exist" do
     before do
-      File.should_receive(:writable?).with("/tmp/fofile-link").and_return(false)
+      File.should_receive(:exists?).with("/tmp/fofile-link").and_return(false)
     end
 
-    it "should raise a runtime error" do
-      lambda { @provider.action_delete }.should raise_error(RuntimeError)
+    it "should not raise a Link error" do
+      lambda { @provider.action_delete }.should_not raise_error(Chef::Exceptions::Link)
     end
   end
+
 end