chef 13.6.4 → 13.7.16

data/spec/integration/recipes/resource_action_spec.rb

@@ -229,7 +229,7 @@ module ResourceActionSpec
       end
 
       context "And 'action_jackgrandson' inheriting from ActionJackson and changing nothing" do
-        before(:context) do
+        before(:each) do
           class ActionJackgrandson < ActionJackson
             use_automatic_resource_name
           end
@@ -509,7 +509,7 @@ module ResourceActionSpec
         Chef::Config[:treat_deprecation_warnings_as_errors] = false
         expect_converge do
           has_property_named_template "hi"
-        end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block.  Possible property-resource collision.  To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
+        end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block. Possible property-resource collision. To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
       end
     end
 

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -17,7 +17,7 @@ describe "Resource::ActionClass#converge_if_changed" do
   before { Namer.current_index += 1 }
   before { Namer.incrementing_value = 0 }
 
-  context "when the resource has identity, state and control properties" do
+  context "when the resource has identity, state, control, and sensitive properties" do
     let(:resource_name) { :"converge_if_changed_dsl#{Namer.current_index}" }
     let(:resource_class) do
       result = Class.new(Chef::Resource) do
@@ -28,6 +28,7 @@ describe "Resource::ActionClass#converge_if_changed" do
         property :control1, desired_state: false, default: "default_control1"
         property :state1, default: "default_state1"
         property :state2, default: "default_state2"
+        property :sensitive1, default: "default_dontprintme", sensitive: true
         attr_accessor :converged
         def initialize(*args)
           super
@@ -54,6 +55,7 @@ describe "Resource::ActionClass#converge_if_changed" do
           resource_class.load_current_value do
             state1 "current_state1"
             state2 "current_state2"
+            sensitive1 "current_dontprintme"
           end
         end
 
@@ -134,6 +136,26 @@ EOM
           end
         end
 
+        context "and sensitive1 is set to a new value" do
+          let(:converge_recipe) do
+            <<-EOM
+              #{resource_name} 'blah' do
+                sensitive1 'new_dontprintme'
+              end
+            EOM
+          end
+
+          it "the resource updates sensitive1" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set sensitive1 to (suppressed sensitive property)
+EOM
+          end
+        end
+
         context "and state1 is set to its current value but state2 is set to a new value" do
           let(:converge_recipe) do
             <<-EOM
@@ -244,19 +266,21 @@ EOM
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
   - create default_identity1
-  -   set identity1 to "default_identity1" (default value)
-  -   set state1    to "default_state1" (default value)
-  -   set state2    to "default_state2" (default value)
+  -   set identity1  to "default_identity1" (default value)
+  -   set state1     to "default_state1" (default value)
+  -   set state2     to "default_state2" (default value)
+  -   set sensitive1 to (suppressed sensitive property) (default value)
 EOM
           end
         end
 
-        context "and state1 and state2 are set" do
+        context "and state1, state2, and sensitive1 are set" do
           let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
+                sensitive1 'new_dontprintme'
               end
             EOM
           end
@@ -267,9 +291,10 @@ EOM
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
   - create default_identity1
-  -   set identity1 to "default_identity1" (default value)
-  -   set state1    to "new_state1"
-  -   set state2    to "new_state2"
+  -   set identity1  to "default_identity1" (default value)
+  -   set state1     to "new_state1"
+  -   set state2     to "new_state2"
+  -   set sensitive1 to (suppressed sensitive property)
 EOM
           end
         end
@@ -291,9 +316,10 @@ EOM
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
   - create default_identity1
-  -   set identity1 to (suppressed sensitive property) (default value)
-  -   set state1    to (suppressed sensitive property)
-  -   set state2    to (suppressed sensitive property)
+  -   set identity1  to (suppressed sensitive property) (default value)
+  -   set state1     to (suppressed sensitive property)
+  -   set state2     to (suppressed sensitive property)
+  -   set sensitive1 to (suppressed sensitive property) (default value)
 EOM
           end
         end
@@ -309,6 +335,9 @@ EOM
           converge_if_changed :state2 do
             new_resource.converged += 1
           end
+          converge_if_changed :sensitive1 do
+            new_resource.converged += 1
+          end
         end
       end
 
@@ -412,6 +441,26 @@ EOM
             expect(resource.updated?).to  be_falsey
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create (up to date)
+EOM
+          end
+        end
+
+        context "and sensitive1 is set to a new value" do
+          let(:converge_recipe) do
+            <<-EOM
+              #{resource_name} 'blah' do
+                sensitive1 'new_dontprintme'
+              end
+            EOM
+          end
+
+          it "the resource updates sensitive1" do
+            expect(resource.converged).to eq 1
+            expect(resource.updated?).to be_truthy
+            expect(converged_recipe.stdout).to eq <<-EOM
+* #{resource_name}[blah] action create
+  - update default_identity1
+  -   set sensitive1 to (suppressed sensitive property)
 EOM
           end
         end
@@ -430,7 +479,7 @@ EOM
           end
 
           it "the resource is created" do
-            expect(resource.converged).to eq 2
+            expect(resource.converged).to eq 3
             expect(resource.updated?).to  be_truthy
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
@@ -438,22 +487,25 @@ EOM
   -   set state1 to "default_state1" (default value)
   - create default_identity1
   -   set state2 to "default_state2" (default value)
+  - create default_identity1
+  -   set sensitive1 to (suppressed sensitive property) (default value)
 EOM
           end
         end
 
-        context "and state1 and state2 are set to new values" do
+        context "and state1, state2, and sensitive1 are set to new values" do
           let(:converge_recipe) do
             <<-EOM
               #{resource_name} 'blah' do
                 state1 'new_state1'
                 state2 'new_state2'
+                sensitive1 'new_dontprintme'
               end
             EOM
           end
 
           it "the resource is created" do
-            expect(resource.converged).to eq 2
+            expect(resource.converged).to eq 3
             expect(resource.updated?).to  be_truthy
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
@@ -461,6 +513,8 @@ EOM
   -   set state1 to "new_state1"
   - create default_identity1
   -   set state2 to "new_state2"
+  - create default_identity1
+  -   set sensitive1 to (suppressed sensitive property)
 EOM
           end
         end
@@ -477,7 +531,7 @@ EOM
           end
 
           it "the resource is created" do
-            expect(resource.converged).to eq 2
+            expect(resource.converged).to eq 3
             expect(resource.updated?).to be_truthy
             expect(converged_recipe.stdout).to eq <<-EOM
 * #{resource_name}[blah] action create
@@ -485,6 +539,8 @@ EOM
   -   set state1 to (suppressed sensitive property)
   - create default_identity1
   -   set state2 to (suppressed sensitive property)
+  - create default_identity1
+  -   set sensitive1 to (suppressed sensitive property) (default value)
 EOM
           end
         end

data/spec/spec_helper.rb

@@ -111,6 +111,11 @@ TEST_PLATFORM = TEST_NODE["platform"]
 TEST_PLATFORM_VERSION = TEST_NODE["platform_version"]
 TEST_PLATFORM_FAMILY = TEST_NODE["platform_family"]
 
+provider_priority_map ||= nil
+resource_priority_map ||= nil
+provider_handler_map ||= nil
+resource_handler_map ||= nil
+
 RSpec.configure do |config|
   config.include(Matchers)
   config.include(MockShellout::RSpec)
@@ -233,6 +238,20 @@ RSpec.configure do |config|
 
     # Set environment variable so the setting persists in child processes
     ENV["CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS"] = "1"
+
+    # we don't perfectly reset the priority/handler maps here, but by dup'ing the top level hash we
+    # throw away all the garbage resources and providers that we setup.  if we mutate something like
+    # :package then that'll carry over from test-to-test, but the solution would be to deep-dup on every
+    # single test we run which is much more expensive.  by throwing away the garbage top level keys we
+    # significantly speed up test runs.
+    provider_handler_map ||= Chef.provider_handler_map.send(:map).dup
+    resource_handler_map ||= Chef.resource_handler_map.send(:map).dup
+    provider_priority_map ||= Chef.provider_priority_map.send(:map).dup
+    resource_priority_map ||= Chef.resource_priority_map.send(:map).dup
+    Chef.provider_handler_map.instance_variable_set(:@map, provider_handler_map.dup)
+    Chef.resource_handler_map.instance_variable_set(:@map, resource_handler_map.dup)
+    Chef.provider_priority_map.instance_variable_set(:@map, provider_priority_map.dup)
+    Chef.resource_priority_map.instance_variable_set(:@map, resource_priority_map.dup)
   end
 
   # raise if anyone commits any test to CI with :focus set on it

data/spec/support/shared/functional/execute_resource.rb

@@ -63,7 +63,7 @@ shared_context "a command that can be executed as an alternate user" do
 
   after do
     File.delete(script_output_path) if File.exists?(script_output_path)
-    Dir.rmdir(script_output_dir) if Dir.exists?(script_output_dir)
+    Dir.rmdir(script_output_dir) if Dir.exist?(script_output_dir)
   end
 end
 

data/spec/support/shared/unit/application_dot_d.rb

@@ -38,9 +38,11 @@ shared_examples_for "an application that loads a dot d" do
     it "loads the configuration in order" do
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_return("foo 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_return("bar 0")
+      expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_return("strings 0")
       allow(app).to receive(:apply_config).with(anything(), Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_call_original.ordered
       expect(app).to receive(:apply_config).with("foo 0", Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("bar 0", Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_call_original.ordered
+      expect(app).to receive(:apply_config).with("strings 0", Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_call_original.ordered
       app.reconfigure
     end
   end

data/spec/support/shared/unit/execute_resource.rb

@@ -139,7 +139,14 @@ shared_examples_for "an execute resource" do
     it "should be true if the password is non-nil but the value is explicitly set to false" do
       @resource.password("we.funk!")
       @resource.sensitive false
-      expect(@resource.sensitive).to eq(true)
+      expect(@resource.sensitive).to eq(false)
+    end
+
+    # added this test to ensure setting of password property after or before sensitive does not matter
+    it "should be false if the sensitive is set before password property" do
+      @resource.sensitive false
+      @resource.password("we.funk!")
+      expect(@resource.sensitive).to eq(false)
     end
 
   end

data/spec/support/shared/unit/provider/file.rb

@@ -476,7 +476,15 @@ shared_examples_for Chef::Provider::File do
           allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
           provider.new_resource.verify windows? ? "REM" : "true"
           provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
-          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed)
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, "Proposed content for #{provider.new_resource.path} failed verification #{windows? ? "cmd.exe /c exit 1" : "false"}")
+        end
+
+        it "does not show verification for sensitive resources" do
+          allow(File).to receive(:directory?).with("C:\\Windows\\system32/cmd.exe").and_return(false)
+          provider.new_resource.verify windows? ? "REM" : "true"
+          provider.new_resource.verify windows? ? "cmd.exe /c exit 1" : "false"
+          provider.new_resource.sensitive true
+          expect { provider.send(:do_validate_content) }.to raise_error(Chef::Exceptions::ValidationFailed, "Proposed content for #{provider.new_resource.path} failed verification [sensitive]")
         end
       end
     end

data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -66,14 +66,17 @@ describe Chef::ChefFS::DataHandler::DataBagItemDataHandler do
       end
     end
 
-    context "valid data" do
-      let(:entry) { TestDataBagItem.new("luggage", "bag") }
-      let(:object) do
-        { "raw_data" => { "id" => "bag" } }
-      end
-      it "validates the data bag item" do
-        expect(handler.verify_integrity(object, entry)).to be_nil
+    context "using a reserved word as part of the data bag name" do
+      %w{xnode rolex xenvironmentx xclientx}.each do |bag_name|
+        let(:entry) { TestDataBagItem.new("#{bag_name}", "bag") }
+        let(:object) do
+          { "raw_data" => { "id" => "bag" } }
+        end
+        it "allows the data bag name '#{bag_name}'" do
+          expect(handler.verify_integrity(object, entry)).to be_nil
+        end
       end
     end
+
   end
 end

data/spec/unit/chef_fs/file_system/repository/directory_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Thom May (<thom@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -152,7 +152,7 @@ describe Chef::ChefFS::FileSystem::Repository::Directory do
     end
 
     after do
-      FileUtils.rmdir(tmp_dir)
+      FileUtils.rm_rf(tmp_dir)
     end
   end
 

data/spec/unit/client_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Client do
     end
 
     it "runs ohai with only the minimum required plugins" do
-      expected_filter = %w{fqdn machinename hostname platform platform_version os os_version}
+      expected_filter = %w{fqdn machinename hostname platform platform_version ohai_time os os_version}
       expect(ohai_system).to receive(:all_plugins).with(expected_filter)
       client.run_ohai
     end

data/spec/unit/deprecated_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@ describe Chef::Deprecated do
 
   context "loading a deprecation class" do
     it "loads the correct class" do
-      expect(Chef::Deprecated.create(:test_deprecation)).to be_an_instance_of(Chef::Deprecated::TestDeprecation)
+      expect(Chef::Deprecated.create(:test_deprecation)).to be_an_instance_of(TestDeprecation)
     end
 
     it "optionally sets a message" do
@@ -49,11 +49,11 @@ describe Chef::Deprecated do
     let(:location) { "the location" }
 
     it "displays the full URL" do
-      expect(Chef::Deprecated::TestDeprecation.new().url).to eql("#{base_url}test.html")
+      expect(TestDeprecation.new().url).to eql("#{base_url}test.html")
     end
 
     it "formats a complete deprecation message" do
-      expect(Chef::Deprecated::TestDeprecation.new(message, location).inspect).to eql("#{message} (CHEF-999)#{location}.\nhttps://docs.chef.io/deprecations_test.html")
+      expect(TestDeprecation.new(message, location).inspect).to eql("#{message} (CHEF-999)#{location}.\nhttps://docs.chef.io/deprecations_test.html")
     end
   end
 end

data/spec/unit/http_spec.rb

@@ -93,6 +93,15 @@ describe Chef::HTTP do
       expect { http.send(:stream_to_tempfile, uri, resp) }.to raise_error("TestError")
     end
 
+    it "accepts a tempfile" do
+      resp = Net::HTTPOK.new("1.1", 200, "OK")
+      http = Chef::HTTP.new(uri)
+      tempfile = Tempfile.open("tempy-mctempfile")
+      expect(Tempfile).not_to receive(:open)
+      expect(resp).to receive(:read_body).and_yield("conty-mccontent")
+      http.send(:stream_to_tempfile, uri, resp, tempfile)
+      expect(IO.read(tempfile.path)).to eql("conty-mccontent")
+    end
   end
 
   describe "head" do

data/spec/unit/knife/bootstrap_spec.rb

@@ -516,6 +516,11 @@ describe Chef::Knife::Bootstrap do
       end
 
       context "a flat directory structure" do
+        it "escapes single-quotes" do
+          expect(rendered_template).to match("cat > /etc/chef/client.d/02-strings.rb <<'EOP'")
+          expect(rendered_template).to match("something '\\\\''/foo/bar'\\\\''")
+        end
+
         it "creates a file 00-foo.rb" do
           expect(rendered_template).to match("cat > /etc/chef/client.d/00-foo.rb <<'EOP'")
           expect(rendered_template).to match("d6f9b976-289c-4149-baf7-81e6ffecf228")

data/spec/unit/knife/configure_spec.rb

@@ -124,55 +124,12 @@ describe Chef::Knife::Configure do
     end
   end
 
-  it "asks the user for the location of a chef repo" do
-    @knife.ask_user_for_config
-    expect(@out.string).to match(Regexp.escape("Please enter the path to a chef repository (or leave blank):"))
-    expect(@knife.chef_repo).to eq("")
-  end
-
-  it "asks the users for the name of the validation client" do
-    @knife.ask_user_for_config
-    expect(@out.string).to match(Regexp.escape("Please enter the validation clientname: [chef-validator]"))
-    expect(@knife.validation_client_name).to eq("chef-validator")
-  end
-
-  it "should not ask the users for the name of the validation client if --validation_client_name is specified" do
-    @knife.config[:validation_client_name] = "my-validator"
-    @knife.ask_user_for_config
-    expect(@out.string).not_to match(Regexp.escape("Please enter the validation clientname:"))
-    expect(@knife.validation_client_name).to eq("my-validator")
-  end
-
-  it "asks the users for the location of the validation key" do
-    @knife.ask_user_for_config
-    expect(@out.string).to match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
-    if windows?
-      expect(@knife.validation_key.capitalize).to eq(default_validator_key_win32.capitalize)
-    else
-      expect(@knife.validation_key).to eq(default_validator_key)
-    end
-  end
-
-  it "should not ask the users for the location of the validation key if --validation_key is specified" do
-    @knife.config[:validation_key] = "/home/you/.chef/my-validation.pem"
-    @knife.ask_user_for_config
-    expect(@out.string).not_to match(Regexp.escape("Please enter the location of the validation key:"))
-    if windows?
-      expect(@knife.validation_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
-    else
-      expect(@knife.validation_key).to eq("/home/you/.chef/my-validation.pem")
-    end
-  end
-
   it "should not ask the user for anything if -i and all other properties are specified" do
     @knife.config[:initial] = true
     @knife.config[:chef_server_url] = "http://localhost:5000"
     @knife.config[:node_name] = "testnode"
     @knife.config[:admin_client_name] = "my-webui"
     @knife.config[:admin_client_key] = "/home/you/.chef/my-webui.pem"
-    @knife.config[:validation_client_name] = "my-validator"
-    @knife.config[:validation_key] = "/home/you/.chef/my-validation.pem"
-    @knife.config[:repository] = ""
     @knife.config[:client_key] = "/home/you/a-new-user.pem"
     allow(Etc).to receive(:getlogin).and_return("a-new-user")
 
@@ -184,40 +141,33 @@ describe Chef::Knife::Configure do
     expect(@knife.admin_client_name).to eq("my-webui")
     if windows?
       expect(@knife.admin_client_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
-      expect(@knife.validation_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
       expect(@knife.new_client_key).to match %r{^[A-Za-z]:/home/you/a-new-user\.pem$}
     else
       expect(@knife.admin_client_key).to eq("/home/you/.chef/my-webui.pem")
-      expect(@knife.validation_key).to eq("/home/you/.chef/my-validation.pem")
       expect(@knife.new_client_key).to eq("/home/you/a-new-user.pem")
     end
-    expect(@knife.validation_client_name).to eq("my-validator")
-    expect(@knife.chef_repo).to eq("")
   end
 
   it "writes the new data to a config file" do
-    allow(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    allow(Chef::Util::PathHelper).to receive(:home).with(".chef").and_return("/home/you/.chef")
+    allow(File).to receive(:expand_path).with("/home/you/.chef/credentials").and_return("/home/you/.chef/credentials")
     allow(File).to receive(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
-    allow(File).to receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
     allow(File).to receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
     expect(FileUtils).to receive(:mkdir_p).with("/home/you/.chef")
     config_file = StringIO.new
-    expect(::File).to receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
+    expect(::File).to receive(:open).with("/home/you/.chef/credentials", "w").and_yield config_file
     @knife.config[:repository] = "/home/you/chef-repo"
     @knife.run
-    expect(config_file.string).to match(/^node_name[\s]+'#{Etc.getlogin}'$/)
-    expect(config_file.string).to match(%r{^client_key[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
-    expect(config_file.string).to match(/^validation_client_name\s+'chef-validator'$/)
-    expect(config_file.string).to match(%r{^validation_key\s+'#{default_validator_key}'$})
-    expect(config_file.string).to match(%r{^chef_server_url\s+'#{default_server_url}'$})
-    expect(config_file.string).to match(%r{cookbook_path\s+\[ '/home/you/chef-repo/cookbooks' \]})
+    expect(config_file.string).to match(/^client_name[\s]+=[\s]+'#{Etc.getlogin}'$/)
+    expect(config_file.string).to match(%r{^client_key[\s]+=[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
+    expect(config_file.string).to match(%r{^chef_server_url\s+=[\s]+'#{default_server_url}'$})
   end
 
   it "creates a new client when given the --initial option" do
-    expect(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    allow(Chef::Util::PathHelper).to receive(:home).with(".chef").and_return("/home/you/.chef")
+    expect(File).to receive(:expand_path).with("/home/you/.chef/credentials").and_return("/home/you/.chef/credentials")
     expect(File).to receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
-    expect(File).to receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
-    expect(File).to receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
+    allow(File).to receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
     Chef::Config[:node_name] = "webmonkey.example.com"
 
     user_command = Chef::Knife::UserCreate.new
@@ -227,7 +177,7 @@ describe Chef::Knife::Configure do
 
     allow(Chef::Knife::UserCreate).to receive(:new).and_return(user_command)
     expect(FileUtils).to receive(:mkdir_p).with("/home/you/.chef")
-    expect(::File).to receive(:open).with("/home/you/.chef/knife.rb", "w")
+    expect(::File).to receive(:open).with("/home/you/.chef/credentials", "w")
     @knife.config[:initial] = true
     @knife.config[:user_password] = "blah"
     @knife.run