chef 11.10.0.rc.0 → 11.10.0.rc.1

data/spec/unit/knife/data_bag_show_spec.rb

@@ -29,10 +29,10 @@ describe Chef::Knife::DataBagShow do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::DataBagShow.new
     @knife.config[:format] = 'json'
-    @rest = mock("Chef::REST")
-    @knife.stub!(:rest).and_return(@rest)
+    @rest = double("Chef::REST")
+    @knife.stub(:rest).and_return(@rest)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
 
@@ -83,7 +83,7 @@ describe Chef::Knife::DataBagShow do
     end
 
     it "prints the decrypted contents of an item when given --secret" do
-      @knife.stub!(:config).and_return({:secret => @secret})
+      @knife.stub(:config).and_return({:secret => @secret})
       Chef::EncryptedDataBagItem.should_receive(:load).
         with('bag_name', 'item_name', @secret).
         and_return(Chef::EncryptedDataBagItem.new(@enc_data, @secret))
@@ -92,7 +92,7 @@ describe Chef::Knife::DataBagShow do
     end
 
     it "prints the decrypted contents of an item when given --secret_file" do
-      @knife.stub!(:config).and_return({:secret_file => @secret_file.path})
+      @knife.stub(:config).and_return({:secret_file => @secret_file.path})
       Chef::EncryptedDataBagItem.should_receive(:load).
         with('bag_name', 'item_name', @secret).
         and_return(Chef::EncryptedDataBagItem.new(@enc_data, @secret))

data/spec/unit/knife/environment_create_spec.rb

@@ -21,16 +21,16 @@ require 'spec_helper'
 describe Chef::Knife::EnvironmentCreate do
   before(:each) do
     @knife = Chef::Knife::EnvironmentCreate.new
-    @knife.stub!(:msg).and_return true
-    @knife.stub!(:output).and_return true
-    @knife.stub!(:show_usage).and_return true
+    @knife.stub(:msg).and_return true
+    @knife.stub(:output).and_return true
+    @knife.stub(:show_usage).and_return true
     @knife.name_args = [ "production" ]
 
     @environment = Chef::Environment.new
-    @environment.stub!(:save)
+    @environment.stub(:save)
 
-    Chef::Environment.stub!(:new).and_return @environment
-    @knife.stub!(:edit_data).and_return @environment
+    Chef::Environment.stub(:new).and_return @environment
+    @knife.stub(:edit_data).and_return @environment
   end
 
   describe "run" do

data/spec/unit/knife/environment_delete_spec.rb

@@ -21,17 +21,17 @@ require 'spec_helper'
 describe Chef::Knife::EnvironmentDelete do
   before(:each) do
     @knife = Chef::Knife::EnvironmentDelete.new
-    @knife.stub!(:msg).and_return true
-    @knife.stub!(:output).and_return true
-    @knife.stub!(:show_usage).and_return true
-    @knife.stub!(:confirm).and_return true
+    @knife.stub(:msg).and_return true
+    @knife.stub(:output).and_return true
+    @knife.stub(:show_usage).and_return true
+    @knife.stub(:confirm).and_return true
     @knife.name_args = [ "production" ]
 
     @environment = Chef::Environment.new
     @environment.name("production")
     @environment.description("Please delete me")
-    @environment.stub!(:destroy).and_return true
-    Chef::Environment.stub!(:load).and_return @environment
+    @environment.stub(:destroy).and_return true
+    Chef::Environment.stub(:load).and_return @environment
   end
 
   it "should confirm that you want to delete" do

data/spec/unit/knife/environment_edit_spec.rb

@@ -21,16 +21,16 @@ require 'spec_helper'
 describe Chef::Knife::EnvironmentEdit do
   before(:each) do
     @knife = Chef::Knife::EnvironmentEdit.new
-    @knife.ui.stub!(:msg).and_return true
-    @knife.ui.stub!(:output).and_return true
-    @knife.ui.stub!(:show_usage).and_return true
+    @knife.ui.stub(:msg).and_return true
+    @knife.ui.stub(:output).and_return true
+    @knife.ui.stub(:show_usage).and_return true
     @knife.name_args = [ "production" ]
 
     @environment = Chef::Environment.new
     @environment.name("production")
     @environment.description("Please edit me")
-    @environment.stub!(:save).and_return true
-    Chef::Environment.stub!(:load).and_return @environment
+    @environment.stub(:save).and_return true
+    Chef::Environment.stub(:load).and_return @environment
     @knife.ui.stub(:edit_data).and_return @environment
   end
 

data/spec/unit/knife/environment_from_file_spec.rb

@@ -25,15 +25,15 @@ describe Chef::Knife::EnvironmentFromFile do
   before(:each) do
     @knife = Chef::Knife::EnvironmentFromFile.new
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
     @knife.name_args = [ "spec.rb" ]
 
     @environment = Chef::Environment.new
     @environment.name("spec")
     @environment.description("runs the unit tests")
     @environment.cookbook_versions({"apt" => "= 1.2.3"})
-    @environment.stub!(:save).and_return true
-    @knife.loader.stub!(:load_from).and_return @environment
+    @environment.stub(:save).and_return true
+    @knife.loader.stub(:load_from).and_return @environment
   end
 
   describe "run" do
@@ -47,7 +47,7 @@ describe Chef::Knife::EnvironmentFromFile do
       before(:each) do
         @env_apple = @environment.dup
         @env_apple.name("apple")
-        @knife.loader.stub!(:load_from).with("apple.rb").and_return @env_apple
+        @knife.loader.stub(:load_from).with("apple.rb").and_return @env_apple
       end
 
       it "loads multiple environments if given" do
@@ -57,10 +57,10 @@ describe Chef::Knife::EnvironmentFromFile do
       end
 
       it "loads all environments with -a" do
-        File.stub!(:expand_path).with("./environments/*.{json,rb}").and_return("/tmp/environments")
-        Dir.stub!(:glob).with("/tmp/environments").and_return(["spec.rb", "apple.rb"])
+        File.stub(:expand_path).with("./environments/*.{json,rb}").and_return("/tmp/environments")
+        Dir.stub(:glob).with("/tmp/environments").and_return(["spec.rb", "apple.rb"])
         @knife.name_args = []
-        @knife.stub!(:config).and_return({:all => true})
+        @knife.stub(:config).and_return({:all => true})
         @environment.should_receive(:save).twice
         @knife.run
       end

data/spec/unit/knife/environment_list_spec.rb

@@ -21,16 +21,16 @@ require 'spec_helper'
 describe Chef::Knife::EnvironmentList do
   before(:each) do
     @knife = Chef::Knife::EnvironmentList.new
-    @knife.stub!(:msg).and_return true
-    @knife.stub!(:output).and_return true
-    @knife.stub!(:show_usage).and_return true
+    @knife.stub(:msg).and_return true
+    @knife.stub(:output).and_return true
+    @knife.stub(:show_usage).and_return true
 
     @environments = {
       "production" => "http://localhost:4000/environments/production",
       "development" => "http://localhost:4000/environments/development",
       "testing" => "http://localhost:4000/environments/testing"
     }
-    Chef::Environment.stub!(:list).and_return @environments
+    Chef::Environment.stub(:list).and_return @environments
   end
 
   it "should make an api call to list the environments" do

data/spec/unit/knife/environment_show_spec.rb

@@ -21,15 +21,15 @@ require 'spec_helper'
 describe Chef::Knife::EnvironmentShow do
   before(:each) do
     @knife = Chef::Knife::EnvironmentShow.new
-    @knife.stub!(:msg).and_return true
-    @knife.stub!(:output).and_return true
-    @knife.stub!(:show_usage).and_return true
+    @knife.stub(:msg).and_return true
+    @knife.stub(:output).and_return true
+    @knife.stub(:show_usage).and_return true
     @knife.name_args = [ "production" ]
 
     @environment = Chef::Environment.new
     @environment.name("production")
     @environment.description("Look at me!")
-    Chef::Environment.stub!(:load).and_return @environment
+    Chef::Environment.stub(:load).and_return @environment
   end
 
   it "should load the environment" do

data/spec/unit/knife/index_rebuild_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::Knife::IndexRebuild do
 
   let(:knife){Chef::Knife::IndexRebuild.new}
-  let(:rest_client){mock(Chef::REST)}
+  let(:rest_client){double(Chef::REST)}
 
   let(:stub_rest!) do
     knife.should_receive(:rest).and_return(rest_client)
@@ -29,7 +29,7 @@ describe Chef::Knife::IndexRebuild do
 
   before :each do
     # This keeps the test output clean
-    knife.ui.stub!(:stdout).and_return(StringIO.new)
+    knife.ui.stub(:stdout).and_return(StringIO.new)
   end
 
   context "#grab_api_info" do

data/spec/unit/knife/knife_help.rb

@@ -37,10 +37,10 @@ describe Chef::Knife::Help do
 
   it "should suggest topics" do
     @knife.name_args = [ "list" ]
-    @knife.ui.stub!(:msg)
+    @knife.ui.stub(:msg)
     @knife.ui.should_receive(:info).with("Available help topics are: ")
     @knife.ui.should_receive(:msg).with(/knife/)
-    @knife.stub!(:exec)
+    @knife.stub(:exec)
     @knife.should_receive(:exit).with(1)
     @knife.run
   end
@@ -57,9 +57,9 @@ describe Chef::Knife::Help do
 
   describe "find_manpages_for_query" do
     it "should error if it does not find a match" do
-      @knife.ui.stub!(:error)
-      @knife.ui.stub!(:info)
-      @knife.ui.stub!(:msg)
+      @knife.ui.stub(:error)
+      @knife.ui.stub(:info)
+      @knife.ui.stub(:msg)
       @knife.should_receive(:exit).with(1)
       @knife.ui.should_receive(:error).with("No help found for 'chickens'")
       @knife.ui.should_receive(:msg).with(/knife/)
@@ -69,22 +69,22 @@ describe Chef::Knife::Help do
 
   describe "print_help_topics" do
     it "should print the known help topics" do
-      @knife.ui.stub!(:msg)
-      @knife.ui.stub!(:info)
+      @knife.ui.stub(:msg)
+      @knife.ui.stub(:info)
       @knife.ui.should_receive(:msg).with(/knife/)
       @knife.print_help_topics
     end
 
     it "should shorten topics prefixed by knife-" do
-      @knife.ui.stub!(:msg)
-      @knife.ui.stub!(:info)
+      @knife.ui.stub(:msg)
+      @knife.ui.stub(:info)
       @knife.ui.should_receive(:msg).with(/node/)
       @knife.print_help_topics
     end
 
     it "should not leave topics prefixed by knife-" do
-      @knife.ui.stub!(:msg)
-      @knife.ui.stub!(:info)
+      @knife.ui.stub(:msg)
+      @knife.ui.stub(:info)
       @knife.ui.should_not_receive(:msg).with(/knife-node/)
       @knife.print_help_topics
     end

data/spec/unit/knife/node_bulk_delete_spec.rb

@@ -26,8 +26,8 @@ describe Chef::Knife::NodeBulkDelete do
     @knife = Chef::Knife::NodeBulkDelete.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)
     @nodes = Hash.new
     %w{adam brent jacob}.each do |node_name|
       @nodes[node_name] = "http://localhost:4000/nodes/#{node_name}"
@@ -53,11 +53,11 @@ describe Chef::Knife::NodeBulkDelete do
       @inflatedish_list = @nodes.keys.inject({}) do |nodes_by_name, name|
         node = Chef::Node.new()
         node.name(name)
-        node.stub!(:destroy).and_return(true)
+        node.stub(:destroy).and_return(true)
         nodes_by_name[name] = node
         nodes_by_name
       end
-      @knife.stub!(:all_nodes).and_return(@inflatedish_list)
+      @knife.stub(:all_nodes).and_return(@inflatedish_list)
     end
 
     it "should print the nodes you are about to delete" do

data/spec/unit/knife/node_delete_spec.rb

@@ -26,13 +26,13 @@ describe Chef::Knife::NodeDelete do
       :print_after => nil
     }
     @knife.name_args = [ "adam" ]
-    @knife.stub!(:output).and_return(true)
-    @knife.stub!(:confirm).and_return(true)
+    @knife.stub(:output).and_return(true)
+    @knife.stub(:confirm).and_return(true)
     @node = Chef::Node.new()
-    @node.stub!(:destroy).and_return(true)
-    Chef::Node.stub!(:load).and_return(@node)
+    @node.stub(:destroy).and_return(true)
+    Chef::Node.stub(:load).and_return(@node)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/node_edit_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Knife::NodeEdit do
 
   describe "after loading the node" do
     before do
-      @knife.stub!(:node).and_return(@node)
+      @knife.stub(:node).and_return(@node)
       @node.automatic_attrs = {:go => :away}
       @node.default_attrs = {:hide => :me}
       @node.override_attrs = {:dont => :show}
@@ -94,7 +94,7 @@ describe Chef::Knife::NodeEdit do
   describe "edit_node" do
 
     before do
-      @knife.stub!(:node).and_return(@node)
+      @knife.stub(:node).and_return(@node)
     end
 
     let(:subject) { @knife.node_editor.edit_node }

data/spec/unit/knife/node_from_file_spec.rb

@@ -28,13 +28,13 @@ describe Chef::Knife::NodeFromFile do
       :print_after => nil
     }
     @knife.name_args = [ "adam.rb" ]
-    @knife.stub!(:output).and_return(true)
-    @knife.stub!(:confirm).and_return(true)
+    @knife.stub(:output).and_return(true)
+    @knife.stub(:confirm).and_return(true)
     @node = Chef::Node.new()
-    @node.stub!(:save)
-    @knife.loader.stub!(:load_from).and_return(@node)
+    @node.stub(:save)
+    @knife.loader.stub(:load_from).and_return(@node)
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do

data/spec/unit/knife/node_list_spec.rb

@@ -23,13 +23,13 @@ describe Chef::Knife::NodeList do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     Chef::Config[:environment] = nil # reset this value each time, as it is not reloaded
     @knife = Chef::Knife::NodeList.new
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @list = {
       "foo" => "http://example.com/foo",
       "bar" => "http://example.com/foo"
     }
-    Chef::Node.stub!(:list).and_return(@list)
-    Chef::Node.stub!(:list_by_environment).and_return(@list)
+    Chef::Node.stub(:list).and_return(@list)
+    Chef::Node.stub(:list_by_environment).and_return(@list)
   end
 
   describe "run" do

data/spec/unit/knife/node_run_list_add_spec.rb

@@ -26,10 +26,10 @@ describe Chef::Knife::NodeRunListAdd do
       :after => nil
     }
     @knife.name_args = [ "adam", "role[monkey]" ]
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @node = Chef::Node.new()
-    @node.stub!(:save).and_return(true)
-    Chef::Node.stub!(:load).and_return(@node)
+    @node.stub(:save).and_return(true)
+    Chef::Node.stub(:load).and_return(@node)
   end
 
   describe "run" do

data/spec/unit/knife/node_run_list_remove_spec.rb

@@ -27,12 +27,12 @@ describe Chef::Knife::NodeRunListRemove do
     @node = Chef::Node.new()
     @node.name("knifetest-node")
     @node.run_list << "role[monkey]"
-    @node.stub!(:save).and_return(true)
+    @node.stub(:save).and_return(true)
 
-    @knife.ui.stub!(:output).and_return(true)
-    @knife.ui.stub!(:confirm).and_return(true)
+    @knife.ui.stub(:output).and_return(true)
+    @knife.ui.stub(:confirm).and_return(true)
 
-    Chef::Node.stub!(:load).and_return(@node)
+    Chef::Node.stub(:load).and_return(@node)
   end
 
   describe "run" do

data/spec/unit/knife/node_run_list_set_spec.rb

@@ -24,10 +24,10 @@ describe Chef::Knife::NodeRunListSet do
     @knife = Chef::Knife::NodeRunListSet.new
     @knife.config = {}
     @knife.name_args = [ "adam", "role[monkey]" ]
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @node = Chef::Node.new()
-    @node.stub!(:save).and_return(true)
-    Chef::Node.stub!(:load).and_return(@node)
+    @node.stub(:save).and_return(true)
+    Chef::Node.stub(:load).and_return(@node)
   end
 
   describe "run" do
@@ -117,8 +117,8 @@ describe Chef::Knife::NodeRunListSet do
         @stdout = StringIO.new
         @stderr = StringIO.new
 
-        @knife.ui.stub!(:stdout).and_return(@stdout)
-        @knife.ui.stub!(:stderr).and_return(@stderr)
+        @knife.ui.stub(:stdout).and_return(@stdout)
+        @knife.ui.stub(:stderr).and_return(@stderr)
       end
 
       it "should exit" do

data/spec/unit/knife/node_show_spec.rb

@@ -28,9 +28,9 @@ describe Chef::Knife::NodeShow do
       :environment => nil
     }
     @knife.name_args = [ "adam" ]
-    @knife.stub!(:output).and_return(true)
+    @knife.stub(:output).and_return(true)
     @node = Chef::Node.new()
-    Chef::Node.stub!(:load).and_return(@node)
+    Chef::Node.stub(:load).and_return(@node)
   end
 
   describe "run" do

data/spec/unit/knife/role_bulk_delete_spec.rb

@@ -27,16 +27,16 @@ describe Chef::Knife::RoleBulkDelete do
     }
     @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)
     @roles = Hash.new
     %w{dev staging production}.each do |role_name|
       role = Chef::Role.new()
       role.name(role_name)
-      role.stub!(:destroy).and_return(true)
+      role.stub(:destroy).and_return(true)
       @roles[role_name] = role
     end
-    Chef::Role.stub!(:list).and_return(@roles)
+    Chef::Role.stub(:list).and_return(@roles)
   end
 
   describe "run" do