microwave 1.0.4 → 11.400.2

data/spec/unit/provider/erl_call_spec.rb

@@ -60,7 +60,6 @@ describe Chef::Provider::ErlCall do
       Process.should_receive(:wait).with(@pid)
 
       @provider.action_run
-      @provider.converge
 
       @stdin.string.should == "#{@new_resource.code}\n"
     end
@@ -78,7 +77,6 @@ describe Chef::Provider::ErlCall do
       Process.should_receive(:wait).with(@pid)
 
       @provider.action_run
-      @provider.converge
 
       @stdin.string.should == "#{@new_resource.code}\n"
     end

data/spec/unit/provider/file_spec.rb

@@ -53,80 +53,86 @@ describe Chef::Provider::File do
     @provider.current_resource.content.should eql(nil)
   end
 
-  context "load_current_resource_attrs", :unix_only do
+  describe "examining file security metadata on Unix" do
+    before do
+      Chef::Platform.stub!(:windows?).and_return(false)
+    end
     it "should collect the current state of the file on the filesystem and populate current_resource" do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-      
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      ::File.should_receive(:stat).exactly(1).times.with(@resource.path).and_return(stat_struct)
+
+      # test execution
+
+      Etc.should_receive(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
+      Etc.should_receive(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+
       # test execution 
       @provider.load_current_resource
-  
+
       # post-condition checks
-      @provider.current_resource.mode.should == 0600
-      @provider.current_resource.owner.should == 0
-      @provider.current_resource.group.should == 0
+      @provider.current_resource.mode.should == "0600"
+      @provider.current_resource.owner.should == "root"
+      @provider.current_resource.group.should == "wheel"
     end
-  
+
     it "should NOT update the new_resource state with the current_resourse state if new_resource state is already specified" do
       # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-  
+      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
+      ::File.should_receive(:stat).exactly(1).times.with(@resource.path).and_return(stat_struct)
+
       @provider.new_resource.group(1)
       @provider.new_resource.owner(1)
       @provider.new_resource.mode(0644)
-  
-      # test execution 
+
+      # test execution
       @provider.load_current_resource
-  
+
       # post-condition checks
       @provider.new_resource.group.should == 1
       @provider.new_resource.owner.should == 1
       @provider.new_resource.mode.should == 0644
     end
-  
-    it "should update the new_resource state with the current_resource state if the new_resource state is not specified." do
-      # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      ::File.should_receive(:stat).exactly(3).with(@resource.path).and_return(stat_struct)
-  
-      @provider.new_resource.group(nil)
-      @provider.new_resource.owner(nil)
-      @provider.new_resource.mode(nil)
-  
-      # test execution 
-      @provider.load_current_resource
-  
-      # post-condition checks
-      @provider.new_resource.group.should eql(@provider.current_resource.group)
-      @provider.new_resource.owner.should eql(@provider.current_resource.owner)
-      @provider.new_resource.mode.should eql(@provider.current_resource.mode)
-    end
-  
-    it "should update the new_resource when attempting to set the new state" do
-      # test setup
-      stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
-      # called once in update_new_file_state and once in checksum
-      ::File.should_receive(:stat).twice.with(@provider.new_resource.path).and_return(stat_struct)  
-      ::File.should_receive(:directory?).once.with(@provider.new_resource.path).and_return(false)
-  
-      @provider.new_resource.group(nil)
-      @provider.new_resource.owner(nil)
-      @provider.new_resource.mode(nil)
-      
-      # test exectution 
-      @provider.update_new_file_state
-  
-      # post-condition checks
-      @provider.new_resource.group.should == 0
-      @provider.new_resource.owner.should == 0
-      @provider.new_resource.mode.should == 0600
+
+    context "when the new_resource does not specify the desired access control" do
+      it "records access control information in the new resource after modifying the file" do
+        # test setup
+        stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000) 
+        # called once in update_new_file_state and once in checksum
+        ::File.should_receive(:stat).once.with(@provider.new_resource.path).and_return(stat_struct)  
+        ::File.should_receive(:directory?).once.with(@provider.new_resource.path).and_return(false)
+
+        Etc.should_receive(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
+        Etc.should_receive(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
+
+        @provider.new_resource.group(nil)
+        @provider.new_resource.owner(nil)
+        @provider.new_resource.mode(nil)
+
+        # test exectution
+        @provider.update_new_file_state
+
+        # post-condition checks
+        @provider.new_resource.group.should == "wheel"
+        @provider.new_resource.owner.should == "root"
+        @provider.new_resource.mode.should == "0600"
+      end
     end
   end
 
-  context "load_current_resource_attrs", :windows_only do
-    pending "CHEF-3557: Fix implicit resource change collection on Windows"
+  describe "when reporting security metadata on windows" do
+
+    it "records the file owner" do
+      pending
+    end
+
+    it "records rights for each user in the ACL" do
+      pending
+    end
+
+    it "records deny_rights for each user in the ACL" do
+      pending
+    end
   end
 
   it "should load a mostly blank current resource if the file specified in new_resource doesn't exist/isn't readable" do
@@ -174,16 +180,18 @@ describe Chef::Provider::File do
     @provider.new_resource.content "foobar"
     @provider.should_receive(:diff_current_from_content).and_return("")
     @provider.should_receive(:backup)
+    # checksum check
+    File.should_receive(:open).with(@provider.new_resource.path, "rb").and_yield(io)
     File.should_receive(:open).with(@provider.new_resource.path, "w").and_yield(io)
     @provider.set_content
-    lambda { @provider.send(:converge_actions).converge! }.should_not raise_error
     io.string.should == "foobar"
   end
 
   it "should not set the content of the file if it already matches the requested content" do
     @provider.load_current_resource
     @provider.new_resource.content IO.read(@resource.path)
-    File.stub!(:open).and_return(1)
+    # Checksum check:
+    File.should_receive(:open).with(@resource.path, "rb").and_yield(StringIO.new(@resource.content))
     File.should_not_receive(:open).with(@provider.new_resource.path, "w")
     lambda { @provider.set_content }.should_not raise_error
     @resource.should_not be_updated_by_last_action
@@ -343,10 +351,12 @@ describe Chef::Provider::File do
     end
 
     it "should call action create if the does not file exist" do
-      @resource.path("/tmp/non_existant_file")
+      @resource.path("/tmp/example-dir/non_existant_file")
       @provider = Chef::Provider::File.new(@resource, @run_context)
       @provider.should_receive(:diff_current_from_content).and_return("")
       ::File.stub!(:exists?).with(@resource.path).and_return(false)
+      ::File.stub!(:directory?).with("/tmp/example-dir/non_existant_file").and_return(false)
+      ::File.stub!(:directory?).with("/tmp/example-dir").and_return(true)
       @provider.stub!(:update_new_file_state)
       io = StringIO.new
       File.should_receive(:open).with(@provider.new_resource.path, "w+").and_yield(io)
@@ -356,7 +366,7 @@ describe Chef::Provider::File do
     end
   end
 
-  describe "when a diff is requested" do
+  describe "when a diff is requested", :uses_diff => true do
 
     before(:each) do
       @original_config = Chef::Config.hash_dup
@@ -486,7 +496,7 @@ describe Chef::Provider::File do
     it "should return valid diff output when content does not match the string content provided" do
        Tempfile.open("some-temp") do |file|
          @resource.path file.path
-         @provider = Chef::Provider::File.new(@resource, @run_context) 
+         @provider = Chef::Provider::File.new(@resource, @run_context)
          @provider.load_current_resource
          result = @provider.diff_current_from_content "foo baz"
          # remove the file name info which varies.

data/spec/unit/provider/git_spec.rb

@@ -163,7 +163,6 @@ SHAS
                                                 :environment =>{"GIT_SSH"=>"do_it_this_way.sh"}, :log_level => :info, :log_tag => "git[web2.0 app]", :live_stream => STDOUT)
 
     @provider.clone
-    @provider.converge
   end
 
   it "runs a clone command with escaped destination" do
@@ -174,7 +173,6 @@ SHAS
     @provider.should_receive(:shell_out!).with(expected_cmd, :user => "deployNinja",
                                                 :environment =>{"GIT_SSH"=>"do_it_this_way.sh"}, :log_level => :info, :log_tag => "git[web2.0 app]", :live_stream => STDOUT)
     @provider.clone
-    @provider.converge
   end
 
   it "compiles a clone command using --depth for shallow cloning" do
@@ -182,7 +180,6 @@ SHAS
     expected_cmd = 'git clone --depth 5 git://github.com/opscode/chef.git /my/deploy/dir'
     @provider.should_receive(:shell_out!).with(expected_cmd, {:log_level => :info, :log_tag => "git[web2.0 app]", :live_stream => STDOUT})
     @provider.clone
-    @provider.converge
   end
 
   it "compiles a clone command with a remote other than ``origin''" do
@@ -190,14 +187,12 @@ SHAS
     expected_cmd = 'git clone -o opscode git://github.com/opscode/chef.git /my/deploy/dir'
     @provider.should_receive(:shell_out!).with(expected_cmd, {:log_level => :info, :log_tag => "git[web2.0 app]", :live_stream => STDOUT})
     @provider.clone
-    @provider.converge
   end
 
   it "runs a checkout command with default options" do
     expected_cmd = 'git checkout -b deploy d35af14d41ae22b19da05d7d03a0bafc321b244c'
     @provider.should_receive(:shell_out!).with(expected_cmd, :cwd => "/my/deploy/dir", :log_level => :debug, :log_tag => "git[web2.0 app]")
     @provider.checkout
-    @provider.converge
   end
 
   it "runs an enable_submodule command" do
@@ -205,20 +200,17 @@ SHAS
     expected_cmd = "git submodule update --init --recursive"
     @provider.should_receive(:shell_out!).with(expected_cmd, :cwd => "/my/deploy/dir", :log_level => :info, :log_tag => "git[web2.0 app]", :live_stream => STDOUT)
     @provider.enable_submodules
-    @provider.converge
   end
 
   it "does nothing for enable_submodules if resource.enable_submodules #=> false" do
     @provider.should_not_receive(:shell_out!)
     @provider.enable_submodules
-    @provider.converge
   end
 
   it "runs a sync command with default options" do
     expected_cmd = "git fetch origin && git fetch origin --tags && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
     @provider.should_receive(:shell_out!).with(expected_cmd, :cwd=> "/my/deploy/dir", :log_level => :debug, :log_tag => "git[web2.0 app]")
     @provider.fetch_updates
-    @provider.converge
   end
 
   it "runs a sync command with the user and group specified in the resource" do
@@ -228,7 +220,6 @@ SHAS
     @provider.should_receive(:shell_out!).with(expected_cmd, :cwd => "/my/deploy/dir",
                                                 :user => "whois", :group => "thisis", :log_level => :debug, :log_tag => "git[web2.0 app]")
     @provider.fetch_updates
-    @provider.converge
   end
 
   it "configures remote tracking branches when remote is not ``origin''" do
@@ -239,7 +230,6 @@ SHAS
     fetch_command = "git fetch opscode && git fetch opscode --tags && git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
     @provider.should_receive(:shell_out!).with(fetch_command, :cwd => "/my/deploy/dir", :log_level => :debug, :log_tag => "git[web2.0 app]")
     @provider.fetch_updates
-    @provider.converge
   end
 
   it "raises an error if the git clone command would fail because the enclosing directory doesn't exist" do

data/spec/unit/provider/group/groupadd_spec.rb

@@ -132,7 +132,7 @@ describe Chef::Provider::Group::Groupadd do
   describe "modify_group_members" do
 
     it "should raise an error when calling modify_group_members" do
-      lambda { @provider.modify_group_members ; @provider.converge }.should raise_error(Chef::Exceptions::Group, "you must override modify_group_members in #{@provider.to_s}")
+      lambda { @provider.modify_group_members }.should raise_error(Chef::Exceptions::Group, "you must override modify_group_members in #{@provider.to_s}")
     end
   end
 

data/spec/unit/provider/group/usermod_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Provider::Group::Usermod do
     
       platforms.each do |platform, flags|
         it "should usermod each user when the append option is set on #{platform}" do
-          @node[:platform] = platform
+          @node.automatic_attrs[:platform] = platform
           @new_resource.stub!(:append).and_return(true)
           @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel all"})
           @provider.should_receive(:run_command).with({:command => "usermod #{flags} wheel your"})
@@ -76,7 +76,7 @@ describe Chef::Provider::Group::Usermod do
   end
 
   describe "when loading the current resource" do
-    before (:each) do
+    before(:each) do
       File.stub!(:exists?).and_return(false)
       @provider.define_resource_requirements
     end

data/spec/unit/provider/http_request_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.
@@ -26,13 +26,13 @@ describe Chef::Provider::HttpRequest do
 
     @new_resource = Chef::Resource::HttpRequest.new('adam')
     @new_resource.name "adam"
-    @new_resource.url "http://www.opscode.com"
+    @new_resource.url "http://www.opscode.com/"
     @new_resource.message "is cool"
 
     @provider = Chef::Provider::HttpRequest.new(@new_resource, @run_context)
   end
 
-  describe "load_current_resource" do  
+  describe "load_current_resource" do
 
     it "should set up a Chef::REST client, with no authentication" do
       Chef::REST.should_receive(:new).with(@new_resource.url, nil, nil)
@@ -45,91 +45,59 @@ describe Chef::Provider::HttpRequest do
       # run_action(x) forces load_current_resource to run;
       # that would overwrite our supplied mock Chef::Rest # object
       @provider.stub!(:load_current_resource).and_return(true)
-      @rest = mock("Chef::REST", :create_url => "http://www.opscode.com", :run_request => "you made it!" )
+      @rest = mock("Chef::REST")
       @provider.rest = @rest
     end
 
-    describe "action_get" do  
-      it "should create the url with a message argument" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=#{@new_resource.message}")
-        @provider.run_action(:get)
-      end
+    describe "action_get" do
 
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=return")
+        @new_resource.message { "return" }
+        @rest.should_receive(:get).with("http://www.opscode.com/?message=return", false, {})
         @provider.run_action(:get)
+        @new_resource.should be_updated
       end
 
       it "should run a GET request" do
-        @rest.should_receive(:run_request).with(:GET, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:get)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:get).with("http://www.opscode.com/?message=is cool", false, {})
         @provider.run_action(:get)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_put" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:put)
-      end
-
+    describe "action_put" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:run_request).with(:PUT, @rest.create_url, {}, @new_resource.message, 10, false)
+        @rest.should_receive(:put).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:put)
+        @new_resource.should be_updated
       end
 
       it "should inflate a message block at runtime" do
         @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:run_request).with(:PUT, @rest.create_url, {}, "return", 10, false)    
-        @provider.run_action(:put)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:put).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:put)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_post" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:post)
-      end
-  
+    describe "action_post" do
       it "should run a PUT request with the message as the payload" do
-        @rest.should_receive(:run_request).with(:POST, @rest.create_url, {}, @new_resource.message, 10, false)
+        @rest.should_receive(:post).with("http://www.opscode.com/", @new_resource.message, {})
         @provider.run_action(:post)
+        @new_resource.should be_updated
       end
-  
+
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:run_request).with(:POST, @rest.create_url, {}, "return", 10, false)    
-        @provider.run_action(:post)
-      end
-  
-      it "should update the resource" do
+        @new_resource.message { "return" }
+        @rest.should_receive(:post).with("http://www.opscode.com/", "return", {})
         @provider.run_action(:post)
         @new_resource.should be_updated
       end
     end
 
-    describe "action_delete" do  
-      it "should create the url" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}")
-        @provider.run_action(:delete)
-      end
-
+    describe "action_delete" do
       it "should run a DELETE request" do
-        @rest.should_receive(:run_request).with(:DELETE, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:delete)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:delete).with("http://www.opscode.com/", {})
         @provider.run_action(:delete)
         @new_resource.should be_updated
       end
@@ -137,39 +105,30 @@ describe Chef::Provider::HttpRequest do
 
     describe "action_head" do
       before do
-        @rest = mock("Chef::REST", :create_url => "http://www.opscode.com", :run_request => true)
         @provider.rest = @rest
       end
 
-      it "should create the url with a message argument" do
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=#{@new_resource.message}")
-        @provider.run_action(:head)
-      end
-
       it "should inflate a message block at runtime" do
-        @new_resource.stub!(:message).and_return(lambda { "return" })
-        @rest.should_receive(:create_url).with("#{@new_resource.url}?message=return")
+        @new_resource.message { "return" }
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=return", {}).and_return("")
         @provider.run_action(:head)
+        @new_resource.should be_updated
       end
 
       it "should run a HEAD request" do
-        @rest.should_receive(:run_request).with(:HEAD, @rest.create_url, {}, false, 10, false)
-        @provider.run_action(:head)
-      end
-
-      it "should update the resource" do
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", {}).and_return("")
         @provider.run_action(:head)
         @new_resource.should be_updated
       end
 
       it "should run a HEAD request with If-Modified-Since header" do
         @new_resource.headers "If-Modified-Since" => File.mtime(__FILE__).httpdate
-        @rest.should_receive(:run_request).with(:HEAD, @rest.create_url, @new_resource.headers, false, 10, false)
+        @rest.should_receive(:head).with("http://www.opscode.com/?message=is cool", @new_resource.headers)
         @provider.run_action(:head)
       end
 
       it "doesn't call converge_by if HEAD does not return modified" do
-        @rest.should_receive(:run_request).and_return(false)
+        @rest.should_receive(:head).and_return(false)
         @provider.should_not_receive(:converge_by)
         @provider.run_action(:head)
       end