1 files changed, 85 insertions, 85 deletions
diff --git a/spec/unit/knife/configure_spec.rb b/spec/unit/knife/configure_spec.rb
index c16019dcf7..e3ea1f052c 100644
--- a/spec/unit/knife/configure_spec.rb
+++ b/spec/unit/knife/configure_spec.rb
@@ -7,19 +7,19 @@ describe Chef::Knife::Configure do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::Configure.new
     @rest_client = double("null rest client", :post_rest => { :result => :true })
-    @knife.stub(:rest).and_return(@rest_client)
+    allow(@knife).to receive(:rest).and_return(@rest_client)
 
     @out = StringIO.new
-    @knife.ui.stub(:stdout).and_return(@out)
+    allow(@knife.ui).to receive(: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)
+    allow(@knife.ui).to receive(:stdin).and_return(@in)
 
     @err = StringIO.new
-    @knife.ui.stub(:stderr).and_return(@err)
+    allow(@knife.ui).to receive(:stderr).and_return(@err)
 
-    Ohai::System.stub(:new).and_return(ohai)
+    allow(Ohai::System).to receive(:new).and_return(ohai)
   end
 
 
@@ -27,8 +27,8 @@ describe Chef::Knife::Configure do
 
   let(:ohai) do
     o = {}
-    o.stub(:require_plugin)
-    o.stub(:load_plugins)
+    allow(o).to receive(:require_plugin)
+    allow(o).to receive(:load_plugins)
     o[:fqdn] = fqdn
     o
   end
@@ -44,63 +44,63 @@ describe Chef::Knife::Configure do
 
   it "asks the user for the URL of the chef server" do
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the chef server URL: [#{default_server_url}]"))
-    @knife.chef_server.should == default_server_url
+    expect(@out.string).to match(Regexp.escape("Please enter the chef server URL: [#{default_server_url}]"))
+    expect(@knife.chef_server).to eq(default_server_url)
   end
 
   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")
+    allow(Etc).to receive(: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
+    expect(@out.string).to match(Regexp.escape("Please enter a name for the new user: [a-new-user]"))
+    expect(@knife.new_client_name).to eq(Etc.getlogin)
   end
 
   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")
+    allow(Etc).to receive(: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'
+    expect(@out.string).not_to match(Regexp.escape("Please enter a name for the new user"))
+    expect(@knife.new_client_name).to eq('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")
+    allow(Etc).to receive(: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
+    expect(@out.string).to match(Regexp.escape("Please enter an existing username or clientname for the API: [a-new-user]"))
+    expect(@knife.new_client_name).to eq(Etc.getlogin)
   end
 
   it "asks the user for the existing admin client's name if -i is specified" do
     @knife.config[:initial] = true
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the existing admin name: [admin]"))
-    @knife.admin_client_name.should == 'admin'
+    expect(@out.string).to match(Regexp.escape("Please enter the existing admin name: [admin]"))
+    expect(@knife.admin_client_name).to eq('admin')
   end
 
   it "should not ask the user for the existing admin client's name if -i and --admin-client_name are specified" do
     @knife.config[:initial] = true
     @knife.config[:admin_client_name] = 'my-webui'
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the existing admin:"))
-    @knife.admin_client_name.should == 'my-webui'
+    expect(@out.string).not_to match(Regexp.escape("Please enter the existing admin:"))
+    expect(@knife.admin_client_name).to eq('my-webui')
   end
 
   it "should not ask the user for the existing admin client's name if -i is not specified" do
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the existing admin: [admin]"))
-    @knife.admin_client_name.should_not == 'admin'
+    expect(@out.string).not_to match(Regexp.escape("Please enter the existing admin: [admin]"))
+    expect(@knife.admin_client_name).not_to eq('admin')
   end
 
   it "asks the user for the location of the existing admin key if -i is specified" do
     @knife.config[:initial] = true
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the location of the existing admin's private key: [#{default_admin_key}]"))
+    expect(@out.string).to match(Regexp.escape("Please enter the location of the existing admin's private key: [#{default_admin_key}]"))
     if windows?
-      @knife.admin_client_key.capitalize.should == default_admin_key_win32.capitalize
+      expect(@knife.admin_client_key.capitalize).to eq(default_admin_key_win32.capitalize)
     else
-      @knife.admin_client_key.should == default_admin_key
+      expect(@knife.admin_client_key).to eq(default_admin_key)
     end
   end
 
@@ -108,61 +108,61 @@ describe Chef::Knife::Configure do
     @knife.config[:initial] = true
     @knife.config[:admin_client_key] = '/home/you/.chef/my-webui.pem'
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key:"))
+    expect(@out.string).not_to match(Regexp.escape("Please enter the location of the existing admin client's private key:"))
     if windows?
-      @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
+      expect(@knife.admin_client_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
     else
-      @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
+      expect(@knife.admin_client_key).to eq('/home/you/.chef/my-webui.pem')
     end
   end
 
   it "should not ask the user for the location of the existing admin key if -i is not specified" do
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key: [#{default_admin_key}]"))
+    expect(@out.string).not_to match(Regexp.escape("Please enter the location of the existing admin client's private key: [#{default_admin_key}]"))
     if windows?
-      @knife.admin_client_key.should_not == default_admin_key_win32
+      expect(@knife.admin_client_key).not_to eq(default_admin_key_win32)
     else
-      @knife.admin_client_key.should_not == default_admin_key
+      expect(@knife.admin_client_key).not_to eq(default_admin_key)
     end
   end
 
   it "asks the user for the location of a chef repo" do
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the path to a chef repository (or leave blank):"))
-    @knife.chef_repo.should == ''
+    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
-    @out.string.should match(Regexp.escape("Please enter the validation clientname: [chef-validator]"))
-    @knife.validation_client_name.should == 'chef-validator'
+    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
-    @out.string.should_not match(Regexp.escape("Please enter the validation clientname:"))
-    @knife.validation_client_name.should == 'my-validator'
+    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
-    @out.string.should match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
+    expect(@out.string).to match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
     if windows?
-      @knife.validation_key.capitalize.should == default_validator_key_win32.capitalize
+      expect(@knife.validation_key.capitalize).to eq(default_validator_key_win32.capitalize)
     else
-      @knife.validation_key.should == default_validator_key
+      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
-    @out.string.should_not match(Regexp.escape("Please enter the location of the validation key:"))
+    expect(@out.string).not_to match(Regexp.escape("Please enter the location of the validation key:"))
     if windows?
-      @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
+      expect(@knife.validation_key).to match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
     else
-      @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
+      expect(@knife.validation_key).to eq('/home/you/.chef/my-validation.pem')
     end
   end
 
@@ -176,68 +176,68 @@ 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')
+    allow(Etc).to receive(:getlogin).and_return('a-new-user')
 
     @knife.ask_user_for_config
-    @out.string.should match(/\s*/)
+    expect(@out.string).to match(/\s*/)
 
-    @knife.new_client_name.should == 'testnode'
-    @knife.chef_server.should == 'http://localhost:5000'
-    @knife.admin_client_name.should == 'my-webui'
+    expect(@knife.new_client_name).to eq('testnode')
+    expect(@knife.chef_server).to eq('http://localhost:5000')
+    expect(@knife.admin_client_name).to eq('my-webui')
     if windows?
-      @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
-      @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
-      @knife.new_client_key.should match %r{^[A-Za-z]:/home/you/a-new-user\.pem$}
+      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
-      @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
-      @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
-      @knife.new_client_key.should == '/home/you/a-new-user.pem'
+      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
-    @knife.validation_client_name.should == 'my-validator'
-    @knife.chef_repo.should == ''
+    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
-    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")
+    allow(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    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
-    ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
+    expect(::File).to receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
     @knife.config[:repository] = '/home/you/chef-repo'
     @knife.run
-    config_file.string.should match(/^node_name[\s]+'#{Etc.getlogin}'$/)
-    config_file.string.should match(%r{^client_key[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
-    config_file.string.should match(/^validation_client_name\s+'chef-validator'$/)
-    config_file.string.should match(%r{^validation_key\s+'#{default_validator_key}'$})
-    config_file.string.should match(%r{^chef_server_url\s+'#{default_server_url}'$})
-    config_file.string.should match(%r{cookbook_path\s+\[ '/home/you/chef-repo/cookbooks' \]})
+    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' \]})
   end
 
   it "creates a new client when given the --initial option" do
-    File.should_receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
-    File.should_receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
-    File.should_receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
-    File.should_receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
+    expect(File).to receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
+    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)
     Chef::Config[:node_name]  = "webmonkey.example.com"
 
     user_command = Chef::Knife::UserCreate.new
-    user_command.should_receive(:run)
+    expect(user_command).to receive(:run)
 
-    Etc.stub(:getlogin).and_return("a-new-user")
+    allow(Etc).to receive(:getlogin).and_return("a-new-user")
 
-    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")
+    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")
     @knife.config[:initial] = true
     @knife.config[:user_password] = "blah"
     @knife.run
-    user_command.name_args.should == Array("a-new-user")
-    user_command.config[:user_password].should == "blah"
-    user_command.config[:admin].should be_true
-    user_command.config[:file].should == "/home/you/.chef/a-new-user.pem"
-    user_command.config[:yes].should be_true
-    user_command.config[:disable_editing].should be_true
+    expect(user_command.name_args).to eq(Array("a-new-user"))
+    expect(user_command.config[:user_password]).to eq("blah")
+    expect(user_command.config[:admin]).to be_truthy
+    expect(user_command.config[:file]).to eq("/home/you/.chef/a-new-user.pem")
+    expect(user_command.config[:yes]).to be_truthy
+    expect(user_command.config[:disable_editing]).to be_truthy
   end
 end