chef 11.10.0.rc.0-x86-mingw32 → 11.10.0.rc.1-x86-mingw32

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
       @response_body = %Q({"error": [{"message": "gtfo"}])
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
@@ -55,7 +55,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
       @response_body = "{\"error\":[\"{\\\"non_existent_cookbooks\\\":[\\\"apache2\\\"],\\\"cookbooks_with_no_versions\\\":[\\\"users\\\"],\\\"message\\\":\\\"Run list contains invalid items: no such cookbook nope.\\\"}\"]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
@@ -83,7 +83,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
       @response_body = "{\"error\":[{\"non_existent_cookbooks\":[],\"cookbooks_with_no_versions\":[],\"message\":\"unable to solve dependencies in alotted time.\"}]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
@@ -106,7 +106,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
       @response_body = "{\"error\":[{\"non_existent_cookbooks\":[\"apache2\"],\"cookbooks_with_no_versions\":[\"users\"],\"message\":\"Run list contains invalid items: no such cookbook nope.\"}]}"
       @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)

data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb

@@ -29,7 +29,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookSyncErrorInspector do
     before do
       @response_body = "sad trombone orchestra"
       @response = Net::HTTPBadGateway.new("1.1", "502", "(response) bad gateway")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPFatalError.new("(exception) bad gateway", @response)
       @inspector = described_class.new({}, @exception)
       @inspector.add_explanation(@description)

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     @outputter = Chef::Formatters::Outputter.new(@stdout, STDERR)
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
 
-    Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache" ])
+    Chef::Config.stub(:cookbook_path).and_return([ "/var/chef/cache" ])
   end
 
   describe "when explaining an error converging a resource" do
@@ -112,8 +112,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       before do
         # fake code to run through #recipe_snippet
         source_file = [ "if true", "var = non_existant", "end" ]
-        IO.stub!(:readlines).and_return(source_file)
-        File.stub!(:exists?).and_return(true)
+        IO.stub(:readlines).and_return(source_file)
+        File.stub(:exists?).and_return(true)
       end
 
       it "parses a Windows path" do
@@ -132,8 +132,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
 
       context "when the recipe file does not exist" do
         before do
-          File.stub!(:exists?).and_return(false)
-          IO.stub!(:readlines).and_raise(Errno::ENOENT)
+          File.stub(:exists?).and_return(false)
+          IO.stub(:readlines).and_raise(Errno::ENOENT)
         end
 
         it "does not try to parse a recipe in chef-shell/irb (CHEF-3411)" do
@@ -172,7 +172,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       end
 
       it "does not generate an error" do
-        lambda { @inspector.add_explanation(@description) }.should_not raise_error(TypeError)
+        lambda { @inspector.add_explanation(@description) }.should_not raise_error
         @description.display(@outputter)
       end
     end

data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb

@@ -55,10 +55,10 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
 
       @response_body = "forbidden"
       @response = Net::HTTPForbidden.new("1.1", "403", "(response) forbidden")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
-      @inspector.stub!(:config).and_return(:node_name => "unit-test.example.com")
+      @inspector.stub(:config).and_return(:node_name => "unit-test.example.com")
 
       @inspector.add_explanation(@description)
     end
@@ -73,11 +73,11 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
     before do
       @response_body = "check your key and node name"
       @response = Net::HTTPUnauthorized.new("1.1", "401", "(response) unauthorized")
-      @response.stub!(:body).and_return(@response_body)
+      @response.stub(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
-      @inspector.stub!(:config).and_return(:node_name => "unit-test.example.com",
+      @inspector.stub(:config).and_return(:node_name => "unit-test.example.com",
                                            :client_key => "/etc/chef/client.pem",
                                            :chef_server_url => "http://chef.example.com")
 

data/spec/unit/handler/json_file_spec.rb

@@ -46,7 +46,7 @@ describe Chef::Handler::JsonFile do
       @run_status.run_context = @run_context
       @run_status.exception = Exception.new("Boy howdy!")
       @file_mock = StringIO.new
-      File.stub!(:open).and_yield(@file_mock)
+      File.stub(:open).and_yield(@file_mock)
     end
 
 

data/spec/unit/handler_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Handler do
       @run_status.run_context = @run_context
       @start_time = Time.now
       @end_time = @start_time + 4.2
-      Time.stub!(:now).and_return(@start_time, @end_time)
+      Time.stub(:now).and_return(@start_time, @end_time)
       @run_status.start_clock
       @run_status.stop_clock
     end
@@ -124,7 +124,7 @@ describe Chef::Handler do
       @run_status.run_context = @run_context
       @start_time = Time.now
       @end_time = @start_time + 4.2
-      Time.stub!(:now).and_return(@start_time, @end_time)
+      Time.stub(:now).and_return(@start_time, @end_time)
       @run_status.start_clock
       @run_status.stop_clock
     end
@@ -171,7 +171,7 @@ describe Chef::Handler do
   describe "when running a start handler" do
     before do
       @start_time = Time.now
-      Time.stub!(:now).and_return(@start_time)
+      Time.stub(:now).and_return(@start_time)
       @run_status.start_clock
     end
 

data/spec/unit/knife/bootstrap_spec.rb

@@ -29,9 +29,9 @@ describe Chef::Knife::Bootstrap do
     @knife.merge_configs
     @knife.config[:template_file] = File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "test.erb"))
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
     @stderr = StringIO.new
-    @knife.ui.stub!(:stderr).and_return(@stderr)
+    @knife.ui.stub(:stderr).and_return(@stderr)
   end
 
   it "should return a name of default bootstrap template" do
@@ -47,8 +47,8 @@ describe Chef::Knife::Bootstrap do
   it "should look for templates early in the run" do
     File.stub(:exists?).and_return(true)
     @knife.name_args = ['shatner']
-    @knife.stub!(:read_template).and_return("")
-    @knife.stub!(:knife_ssh).and_return(true)
+    @knife.stub(:read_template).and_return("")
+    @knife.stub(:knife_ssh).and_return(true)
     @knife_ssh = @knife.knife_ssh
     @knife.should_receive(:find_template).ordered
     @knife.should_receive(:knife_ssh).ordered
@@ -110,10 +110,10 @@ describe Chef::Knife::Bootstrap do
   it "should populate a hint file with JSON when given a file to read" do
     @knife.stub(:find_template).and_return(true)
     @knife.config[:template_file] = File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "test-hints.erb"))
-    ::File.stub!(:read).and_return('{ "foo" : "bar" }')
+    ::File.stub(:read).and_return('{ "foo" : "bar" }')
     @knife.instance_variable_set("@template_file", @knife.config[:template_file])
     template_string = @knife.read_template
-    @knife.stub!(:read_template).and_return('{ "foo" : "bar" }')
+    @knife.stub(:read_template).and_return('{ "foo" : "bar" }')
     @knife.parse_options(["--hint", "openstack=hints/openstack.json"])
     @knife.render_template(template_string).should match /\{\"foo\":\"bar\"\}/
   end
@@ -214,7 +214,7 @@ describe Chef::Knife::Bootstrap do
         Chef::Config[:knife][:ssh_port] = nil
         @knife.config[:forward_agent] = true
         @knife.config[:identity_file] = "~/.ssh/me.rsa"
-        @knife.stub!(:read_template).and_return("")
+        @knife.stub(:read_template).and_return("")
         @knife_ssh = @knife.knife_ssh
       end
 
@@ -282,7 +282,7 @@ describe Chef::Knife::Bootstrap do
         Chef::Config[:knife][:identity_file] = "~/.ssh/you.rsa"
         Chef::Config[:knife][:ssh_gateway] = "towel.blinkenlights.nl"
         Chef::Config[:knife][:host_key_verify] = true
-        @knife.stub!(:read_template).and_return("")
+        @knife.stub(:read_template).and_return("")
         @knife_ssh = @knife.knife_ssh
       end
 
@@ -316,20 +316,20 @@ describe Chef::Knife::Bootstrap do
         @knife.name_args = ["foo.example.com"]
         @knife.config[:ssh_user]      = "rooty"
         @knife.config[:identity_file] = "~/.ssh/me.rsa"
-        @knife.stub!(:read_template).and_return("")
+        @knife.stub(:read_template).and_return("")
         @knife_ssh = @knife.knife_ssh
       end
 
       it "prompts the user for a password " do
-        @knife.stub!(:knife_ssh).and_return(@knife_ssh)
-        @knife_ssh.stub!(:get_password).and_return('typed_in_password')
+        @knife.stub(:knife_ssh).and_return(@knife_ssh)
+        @knife_ssh.stub(:get_password).and_return('typed_in_password')
         alternate_knife_ssh = @knife.knife_ssh_with_password_auth
         alternate_knife_ssh.config[:ssh_password].should == 'typed_in_password'
       end
 
       it "configures knife not to use the identity file that didn't work previously" do
-        @knife.stub!(:knife_ssh).and_return(@knife_ssh)
-        @knife_ssh.stub!(:get_password).and_return('typed_in_password')
+        @knife.stub(:knife_ssh).and_return(@knife_ssh)
+        @knife_ssh.stub(:get_password).and_return('typed_in_password')
         alternate_knife_ssh = @knife.knife_ssh_with_password_auth
         alternate_knife_ssh.config[:identity_file].should be_nil
       end
@@ -341,9 +341,9 @@ describe Chef::Knife::Bootstrap do
       @knife.name_args = ["foo.example.com"]
       @knife.config[:ssh_user]      = "rooty"
       @knife.config[:identity_file] = "~/.ssh/me.rsa"
-      @knife.stub!(:read_template).and_return("")
+      @knife.stub(:read_template).and_return("")
       @knife_ssh = @knife.knife_ssh
-      @knife.stub!(:knife_ssh).and_return(@knife_ssh)
+      @knife.stub(:knife_ssh).and_return(@knife_ssh)
     end
 
     it "verifies that a server to bootstrap was given as a command line arg" do
@@ -358,11 +358,11 @@ describe Chef::Knife::Bootstrap do
     end
 
     it "falls back to password based auth when auth fails the first time" do
-      @knife.stub!(:puts)
+      @knife.stub(:puts)
 
       @fallback_knife_ssh = @knife_ssh.dup
       @knife_ssh.should_receive(:run).and_raise(Net::SSH::AuthenticationFailed.new("no ssh for you"))
-      @knife.stub!(:knife_ssh_with_password_auth).and_return(@fallback_knife_ssh)
+      @knife.stub(:knife_ssh_with_password_auth).and_return(@fallback_knife_ssh)
       @fallback_knife_ssh.should_receive(:run)
       @knife.run
     end

data/spec/unit/knife/client_bulk_delete_spec.rb

@@ -26,16 +26,16 @@ describe Chef::Knife::ClientBulkDelete do
     @knife = Chef::Knife::ClientBulkDelete.new
     @knife.name_args = ["."]
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
-    @knife.ui.stub!(:confirm).and_return(true)
+    @knife.ui.stub(:stdout).and_return(@stdout)
+    @knife.ui.stub(:confirm).and_return(true)
     @clients = Hash.new
     %w{tim dan stephen}.each do |client_name|
       client = Chef::ApiClient.new()
       client.name(client_name)
-      client.stub!(:destroy).and_return(true)
+      client.stub(:destroy).and_return(true)
       @clients[client_name] = client
     end
-    Chef::ApiClient.stub!(:list).and_return(@clients)
+    Chef::ApiClient.stub(:list).and_return(@clients)
   end
 
   describe "run" do

data/spec/unit/knife/client_create_spec.rb

@@ -29,12 +29,12 @@ describe Chef::Knife::ClientCreate do
     }
     @knife.name_args = [ "adam" ]
     @client = Chef::ApiClient.new
-    @client.stub!(:save).and_return({ 'private_key' => '' })
-    @knife.stub!(:edit_data).and_return(@client)
-    @knife.stub!(:puts)
-    Chef::ApiClient.stub!(:new).and_return(@client)
+    @client.stub(:save).and_return({ 'private_key' => '' })
+    @knife.stub(:edit_data).and_return(@client)
+    @knife.stub(:puts)
+    Chef::ApiClient.stub(:new).and_return(@client)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do
@@ -62,8 +62,8 @@ describe Chef::Knife::ClientCreate do
     describe "with -f or --file" do
       it "should write the private key to a file" do
         @knife.config[:file] = "/tmp/monkeypants"
-        @client.stub!(:save).and_return({ 'private_key' => "woot" })
-        filehandle = mock("Filehandle")
+        @client.stub(:save).and_return({ 'private_key' => "woot" })
+        filehandle = double("Filehandle")
         filehandle.should_receive(:print).with('woot')
         File.should_receive(:open).with("/tmp/monkeypants", "w").and_yield(filehandle)
         @knife.run

data/spec/unit/knife/client_reregister_spec.rb

@@ -22,9 +22,9 @@ describe Chef::Knife::ClientReregister do
   before(:each) do
     @knife = Chef::Knife::ClientReregister.new
     @knife.name_args = [ 'adam' ]
-    @client_mock = mock('client_mock', :private_key => "foo_key")
+    @client_mock = double('client_mock', :private_key => "foo_key")
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   context "when no client name is given on the command line" do

data/spec/unit/knife/client_show_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Knife::ClientShow do
   before(:each) do
     @knife = Chef::Knife::ClientShow.new
     @knife.name_args = [ 'adam' ]
-    @client_mock = mock('client_mock')
+    @client_mock = double('client_mock')
   end
 
   describe 'run' do

data/spec/unit/knife/config_file_selection_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Knife do
   end
 
   before :each do
-    Chef::Config.stub!(:from_file).and_return(true)
+    Chef::Config.stub(:from_file).and_return(true)
     Chef::ConfigFetcher.stub(:new).and_return(missing_config_fetcher)
   end
 
@@ -72,7 +72,7 @@ describe Chef::Knife do
     upward_dir = File.expand_path "#{Dir.pwd}/.chef"
     upward_config = File.expand_path "#{upward_dir}/knife.rb"
     have_config_file(upward_config)
-    Chef::Knife.stub!(:chef_config_dir).and_return(upward_dir)
+    Chef::Knife.stub(:chef_config_dir).and_return(upward_dir)
 
     @knife = Chef::Knife.new
     @knife.configure_chef
@@ -89,7 +89,7 @@ describe Chef::Knife do
   end
 
   it "configure knife from nothing" do
-    ::File.stub!(:exist?).and_return(false)
+    ::File.stub(:exist?).and_return(false)
     @knife = Chef::Knife.new
     @knife.ui.should_receive(:warn).with("No knife configuration file found")
     @knife.configure_chef
@@ -104,7 +104,7 @@ describe Chef::Knife do
     home_config = File.expand_path(File.join("#{ENV['HOME']}", "/.chef/knife.rb"))
     configs = [ env_config, pwd_config, upward_config, home_config ]
 
-    Chef::Knife.stub!(:chef_config_dir).and_return(upward_dir)
+    Chef::Knife.stub(:chef_config_dir).and_return(upward_dir)
     ENV['KNIFE_HOME'] = Dir.tmpdir
 
     @knife = Chef::Knife.new

data/spec/unit/knife/configure_client_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Knife::ConfigureClient do
     Chef::Config[:validation_key] = '/etc/chef/validation.pem'
 
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe 'run' do
@@ -56,7 +56,7 @@ describe Chef::Knife::ConfigureClient do
       end
 
       it 'should write out the config file' do
-        FileUtils.stub!(:mkdir_p)
+        FileUtils.stub(:mkdir_p)
         @knife.run
         @client_file.string.should match /log_level\s+\:info/
         @client_file.string.should match /log_location\s+STDOUT/
@@ -65,13 +65,13 @@ describe Chef::Knife::ConfigureClient do
       end
 
       it 'should write out the validation.pem file' do
-        FileUtils.stub!(:mkdir_p)
+        FileUtils.stub(:mkdir_p)
         @knife.run
         @validation_file.string.should match /foo_bar_baz/
       end
 
       it 'should print information on what is being configured' do
-        FileUtils.stub!(:mkdir_p)
+        FileUtils.stub(:mkdir_p)
         @knife.run
         @stdout.string.should match /creating client configuration/i
         @stdout.string.should match /writing client\.rb/i

data/spec/unit/knife/configure_spec.rb

@@ -6,20 +6,20 @@ describe Chef::Knife::Configure do
 
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::Configure.new
-    @rest_client = mock("null rest client", :post_rest => { :result => :true })
-    @knife.stub!(:rest).and_return(@rest_client)
+    @rest_client = double("null rest client", :post_rest => { :result => :true })
+    @knife.stub(:rest).and_return(@rest_client)
 
     @out = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@out)
+    @knife.ui.stub(:stdout).and_return(@out)
     @knife.config[:config_file] = '/home/you/.chef/knife.rb'
 
     @in = StringIO.new("\n" * 7)
-    @knife.ui.stub!(:stdin).and_return(@in)
+    @knife.ui.stub(:stdin).and_return(@in)
 
     @err = StringIO.new
-    @knife.ui.stub!(:stderr).and_return(@err)
+    @knife.ui.stub(:stderr).and_return(@err)
 
-    Ohai::System.stub!(:new).and_return(ohai)
+    Ohai::System.stub(:new).and_return(ohai)
   end
 
 
@@ -49,7 +49,7 @@ describe Chef::Knife::Configure do
 
   it "asks the user for the clientname they want for the new client if -i is specified" do
     @knife.config[:initial] = true
-    Etc.stub!(:getlogin).and_return("a-new-user")
+    Etc.stub(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
     @out.string.should match(Regexp.escape("Please enter a name for the new user: [a-new-user]"))
     @knife.new_client_name.should == Etc.getlogin
@@ -58,14 +58,14 @@ describe Chef::Knife::Configure do
   it "should not ask the user for the clientname they want for the new client if -i and --node_name are specified" do
     @knife.config[:initial] = true
     @knife.config[:node_name] = 'testnode'
-    Etc.stub!(:getlogin).and_return("a-new-user")
+    Etc.stub(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
     @out.string.should_not match(Regexp.escape("Please enter a name for the new user"))
     @knife.new_client_name.should == 'testnode'
   end
 
   it "asks the user for the existing API username or clientname if -i is not specified" do
-    Etc.stub!(:getlogin).and_return("a-new-user")
+    Etc.stub(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
     @out.string.should match(Regexp.escape("Please enter an existing username or clientname for the API: [a-new-user]"))
     @knife.new_client_name.should == Etc.getlogin
@@ -175,7 +175,7 @@ describe Chef::Knife::Configure do
     @knife.config[:validation_key] = '/home/you/.chef/my-validation.pem'
     @knife.config[:repository] = ''
     @knife.config[:client_key] = '/home/you/a-new-user.pem'
-    Etc.stub!(:getlogin).and_return('a-new-user')
+    Etc.stub(:getlogin).and_return('a-new-user')
 
     @knife.ask_user_for_config
     @out.string.should match(/\s*/)
@@ -197,10 +197,10 @@ describe Chef::Knife::Configure do
   end
 
   it "writes the new data to a config file" do
-    File.stub!(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
-    File.stub!(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
-    File.stub!(:expand_path).with(default_validator_key).and_return(default_validator_key)
-    File.stub!(:expand_path).with(default_admin_key).and_return(default_admin_key)
+    File.stub(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    File.stub(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
+    File.stub(:expand_path).with(default_validator_key).and_return(default_validator_key)
+    File.stub(:expand_path).with(default_admin_key).and_return(default_admin_key)
     FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
     config_file = StringIO.new
     ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
@@ -224,9 +224,9 @@ describe Chef::Knife::Configure do
     user_command = Chef::Knife::UserCreate.new
     user_command.should_receive(:run)
 
-    Etc.stub!(:getlogin).and_return("a-new-user")
+    Etc.stub(:getlogin).and_return("a-new-user")
 
-    Chef::Knife::UserCreate.stub!(:new).and_return(user_command)
+    Chef::Knife::UserCreate.stub(:new).and_return(user_command)
     FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
     ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w")
     @knife.config[:initial] = true