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

data/spec/unit/knife/cookbook_test_spec.rb

@@ -26,25 +26,25 @@ describe Chef::Knife::CookbookTest do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::CookbookTest.new
     @knife.config[:cookbook_path] = File.join(CHEF_SPEC_DATA,'cookbooks')
-    @knife.cookbook_loader.stub!(:cookbook_exists?).and_return(true)
+    @knife.cookbook_loader.stub(:cookbook_exists?).and_return(true)
     @cookbooks = []
     %w{tats central_market jimmy_johns pho}.each do |cookbook_name|
       @cookbooks << Chef::CookbookVersion.new(cookbook_name)
     end
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
   end
 
   describe "run" do
     it "should test the cookbook" do
-      @knife.stub!(:test_cookbook).and_return(true)
+      @knife.stub(:test_cookbook).and_return(true)
       @knife.name_args = ["italian"]
       @knife.should_receive(:test_cookbook).with("italian")
       @knife.run
     end
 
     it "should test multiple cookbooks when provided" do
-      @knife.stub!(:test_cookbook).and_return(true)
+      @knife.stub(:test_cookbook).and_return(true)
       @knife.name_args = ["tats", "jimmy_johns"]
       @knife.should_receive(:test_cookbook).with("tats")
       @knife.should_receive(:test_cookbook).with("jimmy_johns")
@@ -65,14 +65,14 @@ describe Chef::Knife::CookbookTest do
 
     describe "with -a or --all" do
       it "should test all of the cookbooks" do
-        @knife.stub!(:test_cookbook).and_return(true)
+        @knife.stub(:test_cookbook).and_return(true)
         @knife.config[:all] = true
         @loader = {}
-        @loader.stub!(:load_cookbooks).and_return(@loader)
+        @loader.stub(:load_cookbooks).and_return(@loader)
         @cookbooks.each do |cookbook|
           @loader[cookbook.name] = cookbook
         end
-        @knife.stub!(:cookbook_loader).and_return(@loader)
+        @knife.stub(:cookbook_loader).and_return(@loader)
         @loader.each do |key, cookbook|
           @knife.should_receive(:test_cookbook).with(cookbook.name)
         end

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -30,24 +30,24 @@ describe Chef::Knife::CookbookUpload do
     @cookbook = Chef::CookbookVersion.new('test_cookbook')
 
     @cookbook_loader = {}
-    @cookbook_loader.stub!(:[]).and_return(@cookbook)
-    @cookbook_loader.stub!(:merged_cookbooks).and_return([])
-    @cookbook_loader.stub!(:load_cookbooks).and_return(@cookbook_loader)
-    Chef::CookbookLoader.stub!(:new).and_return(@cookbook_loader)
+    @cookbook_loader.stub(:[]).and_return(@cookbook)
+    @cookbook_loader.stub(:merged_cookbooks).and_return([])
+    @cookbook_loader.stub(:load_cookbooks).and_return(@cookbook_loader)
+    Chef::CookbookLoader.stub(:new).and_return(@cookbook_loader)
 
     @output = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@output)
-    @knife.ui.stub!(:stderr).and_return(@output)
+    @knife.ui.stub(:stdout).and_return(@output)
+    @knife.ui.stub(:stderr).and_return(@output)
   end
 
   describe 'with --concurrency' do
     it 'should upload cookbooks with predefined concurrency' do
-      @cookbook_uploader = stub(:upload_cookbooks => nil)
+      @cookbook_uploader = double(:upload_cookbooks => nil)
       Chef::CookbookVersion.stub(:list_all_versions).and_return({})
       @knife.config[:concurrency] = 3
       @test_cookbook = Chef::CookbookVersion.new('test_cookbook')
-      @cookbook_loader.stub!(:each).and_yield("test_cookbook", @test_cookbook)
-      @cookbook_loader.stub!(:cookbook_names).and_return(["test_cookbook"])
+      @cookbook_loader.stub(:each).and_yield("test_cookbook", @test_cookbook)
+      @cookbook_loader.stub(:cookbook_names).and_return(["test_cookbook"])
       Chef::CookbookUploader.should_receive(:new).with( kind_of(Array),  kind_of(Array),
         {:force=>nil, :concurrency => 3}).and_return(double("Chef::CookbookUploader", :upload_cookbooks=> true))
       @knife.run
@@ -56,7 +56,7 @@ describe Chef::Knife::CookbookUpload do
 
   describe 'run' do
     before(:each) do
-      @cookbook_uploader = stub(:upload_cookbooks => nil)
+      @cookbook_uploader = double(:upload_cookbooks => nil)
       Chef::CookbookUploader.stub(:new => @cookbook_uploader)
       Chef::CookbookVersion.stub(:list_all_versions).and_return({})
     end
@@ -98,9 +98,9 @@ describe Chef::Knife::CookbookUpload do
           'test_cookbook3' => Chef::CookbookVersion.new('test_cookbook3')
         }
         @cookbook_loader = {}
-        @cookbook_loader.stub!(:merged_cookbooks).and_return([])
+        @cookbook_loader.stub(:merged_cookbooks).and_return([])
         @cookbook_loader.stub(:[]) { |ckbk| @cookbooks[ckbk] }
-        Chef::CookbookLoader.stub!(:new).and_return(@cookbook_loader)
+        Chef::CookbookLoader.stub(:new).and_return(@cookbook_loader)
       end
 
       it "should read only one cookbook" do
@@ -130,16 +130,16 @@ describe Chef::Knife::CookbookUpload do
         @test_cookbook2.metadata.depends("test_cookbook3")
         @test_cookbook3.metadata.depends("test_cookbook1")
         @test_cookbook3.metadata.depends("test_cookbook2")
-        @cookbook_loader.stub!(:[])  do |ckbk|
+        @cookbook_loader.stub(:[])  do |ckbk|
           { "test_cookbook1" =>  @test_cookbook1,
             "test_cookbook2" =>  @test_cookbook2,
             "test_cookbook3" => @test_cookbook3 }[ckbk]
         end
-        @knife.stub!(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2", "test_cookbook3"])
+        @knife.stub(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2", "test_cookbook3"])
         @knife.should_receive(:upload).exactly(3).times
         Timeout::timeout(5) do
           @knife.run
-        end.should_not raise_error(Timeout::Error)
+        end.should_not raise_error
       end
     end
 
@@ -154,8 +154,8 @@ describe Chef::Knife::CookbookUpload do
         @knife.config[:all] = true
         @test_cookbook1 = Chef::CookbookVersion.new('test_cookbook1')
         @test_cookbook2 = Chef::CookbookVersion.new('test_cookbook2')
-        @cookbook_loader.stub!(:each).and_yield("test_cookbook1", @test_cookbook1).and_yield("test_cookbook2", @test_cookbook2)
-        @cookbook_loader.stub!(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2"])
+        @cookbook_loader.stub(:each).and_yield("test_cookbook1", @test_cookbook1).and_yield("test_cookbook2", @test_cookbook2)
+        @cookbook_loader.stub(:cookbook_names).and_return(["test_cookbook1", "test_cookbook2"])
       end
 
       it 'should upload all cookbooks' do
@@ -170,7 +170,7 @@ describe Chef::Knife::CookbookUpload do
       end
 
       it 'should update the version constraints for an environment' do
-        @knife.stub!(:assert_environment_valid!).and_return(true)
+        @knife.stub(:assert_environment_valid!).and_return(true)
         @knife.config[:environment] = "production"
         @knife.should_receive(:update_version_constraints).once
         @knife.run
@@ -188,9 +188,9 @@ describe Chef::Knife::CookbookUpload do
       end
 
       it 'should not update the version constraints for an environment' do
-        @knife.stub!(:assert_environment_valid!).and_return(true)
+        @knife.stub(:assert_environment_valid!).and_return(true)
         @knife.config[:environment] = "production"
-        @knife.stub!(:upload).and_raise(Chef::Exceptions::CookbookFrozen)
+        @knife.stub(:upload).and_raise(Chef::Exceptions::CookbookFrozen)
         @knife.ui.should_receive(:error).with(/Failed to upload 1 cookbook/)
         @knife.ui.should_receive(:warn).with(/Not updating version constraints/)
         @knife.should_not_receive(:update_version_constraints)

data/spec/unit/knife/core/cookbook_scm_repo_spec.rb

@@ -54,17 +54,17 @@ BRANCHES
 
     describe "and the repo dir exists" do
       before do
-        ::File.stub!(:directory?).with(@repo_path).and_return(true)
+        ::File.stub(:directory?).with(@repo_path).and_return(true)
       end
 
       it "exits when there is no git repo" do
-        ::File.stub!(:directory?).with(/.*\.git/).and_return(false)
+        ::File.stub(:directory?).with(/.*\.git/).and_return(false)
         lambda {@cookbook_repo.sanity_check}.should raise_error(SystemExit)
       end
 
       describe "and the repo is a git repo" do
         before do
-          ::File.stub!(:directory?).with(File.join(@repo_path, '.git')).and_return(true)
+          ::File.stub(:directory?).with(File.join(@repo_path, '.git')).and_return(true)
         end
 
         it "exits when the default branch doesn't exist" do
@@ -92,7 +92,7 @@ DIRTY
           describe "and the repo is clean" do
             before do
               @clean_status = Mixlib::ShellOut.new.tap {|s| s.stdout.replace("\n")}
-              @cookbook_repo.stub!(:shell_out!).with('git status --porcelain', :cwd => @repo_path).and_return(@clean_status)
+              @cookbook_repo.stub(:shell_out!).with('git status --porcelain', :cwd => @repo_path).and_return(@clean_status)
             end
 
             it "passes the sanity check" do
@@ -143,7 +143,7 @@ DIRTY
     before do
       @updates = Mixlib::ShellOut.new
       @updates.stdout.replace("\n")
-      @cookbook_repo.stub!(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
+      @cookbook_repo.stub(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
     end
 
     it "shows no changes in the pristine copy" do
@@ -159,7 +159,7 @@ DIRTY
     before do
       @updates = Mixlib::ShellOut.new
       @updates.stdout.replace(" M cookbooks/apache2/recipes/default.rb\n")
-      @cookbook_repo.stub!(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
+      @cookbook_repo.stub(:shell_out!).with('git status --porcelain -- apache2', :cwd => @repo_path).and_return(@updates)
     end
 
     it "shows changes in the pristine copy" do

data/spec/unit/knife/core/object_loader_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Knife::Core::ObjectLoader do
   before(:each) do
     @knife = Chef::Knife.new
     @stdout = StringIO.new
-    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub(:stdout).and_return(@stdout)
     Dir.chdir(File.join(CHEF_SPEC_DATA, 'object_loader'))
   end
 

data/spec/unit/knife/core/ui_spec.rb

@@ -24,7 +24,11 @@ require 'spec_helper'
 describe Chef::Knife::UI do
   before do
     @out, @err, @in = StringIO.new, StringIO.new, StringIO.new
-    @config = {}
+    @config = {
+      :verbosity => 0,
+      :yes => nil,
+      :format => "summary",
+    }
     @ui = Chef::Knife::UI.new(@out, @err, @in, @config)
   end
 
@@ -62,7 +66,7 @@ describe Chef::Knife::UI do
       before do
         @ui.config[:disable_editing] = false
         @ui.config[:editor] = my_editor
-        @mock = mock('Tempfile')
+        @mock = double('Tempfile')
         @mock.should_receive(:sync=).with(true)
         @mock.should_receive(:puts).with(json_from_ruby)
         @mock.should_receive(:close)
@@ -168,7 +172,7 @@ describe Chef::Knife::UI do
     it "should ignore Errno::EPIPE exceptions (CHEF-3516)" do
       @out.stub(:puts).and_raise(Errno::EPIPE)
       @err.stub(:puts).and_raise(Errno::EPIPE)
-      lambda {@ui.send(method, "hi")}.should_not raise_error(Errno::EPIPE)
+      lambda {@ui.send(method, "hi")}.should raise_error(SystemExit)
     end
 
     it "should throw Errno::EPIPE exceptions with -VV (CHEF-3516)" do
@@ -298,15 +302,9 @@ EOM
 
     it "formats hashes with nested array values appropriately" do
       @ui.output({ 'a' => [ [ 'foo', 'bar' ], [ 'baz', 'bjork' ] ], 'b' => 'c' })
-      @out.string.should == <<EOM
-a:
-  foo
-  bar
-  
-  baz
-  bjork
-b: c
-EOM
+      # XXX: using a HEREDOC at this point results in a line with required spaces which auto-whitespace removal settings
+      # on editors will remove and will break this test.
+      @out.string.should == "a:\n  foo\n  bar\n  \n  baz\n  bjork\nb: c\n"
     end
 
     it "formats hashes with hash values appropriately" do
@@ -412,28 +410,28 @@ EOM
       @question = "monkeys rule"
       @stdout = StringIO.new
       @ui.stub(:stdout).and_return(@stdout)
-      @ui.stdin.stub!(:readline).and_return("y")
+      @ui.stdin.stub(:readline).and_return("y")
     end
 
     it "should return true if you answer Y" do
-      @ui.stdin.stub!(:readline).and_return("Y")
+      @ui.stdin.stub(:readline).and_return("Y")
       @ui.confirm(@question).should == true
     end
 
     it "should return true if you answer y" do
-      @ui.stdin.stub!(:readline).and_return("y")
+      @ui.stdin.stub(:readline).and_return("y")
       @ui.confirm(@question).should == true
     end
 
     it "should exit 3 if you answer N" do
-      @ui.stdin.stub!(:readline).and_return("N")
+      @ui.stdin.stub(:readline).and_return("N")
       lambda {
         @ui.confirm(@question)
       }.should raise_error(SystemExit) { |e| e.status.should == 3 }
     end
 
     it "should exit 3 if you answer n" do
-      @ui.stdin.stub!(:readline).and_return("n")
+      @ui.stdin.stub(:readline).and_return("n")
       lambda {
         @ui.confirm(@question)
       }.should raise_error(SystemExit) { |e| e.status.should == 3 }
@@ -449,16 +447,16 @@ EOM
     describe "when asking for free-form user input" do
       it "asks a question and returns the answer provided by the user" do
         out = StringIO.new
-        @ui.stub!(:stdout).and_return(out)
-        @ui.stub!(:stdin).and_return(StringIO.new("http://mychefserver.example.com\n"))
+        @ui.stub(:stdout).and_return(out)
+        @ui.stub(:stdin).and_return(StringIO.new("http://mychefserver.example.com\n"))
         @ui.ask_question("your chef server URL?").should == "http://mychefserver.example.com"
         out.string.should == "your chef server URL?"
       end
 
       it "suggests a default setting and returns the default when the user's response only contains whitespace" do
         out = StringIO.new
-        @ui.stub!(:stdout).and_return(out)
-        @ui.stub!(:stdin).and_return(StringIO.new(" \n"))
+        @ui.stub(:stdout).and_return(out)
+        @ui.stub(:stdin).and_return(StringIO.new(" \n"))
         @ui.ask_question("your chef server URL? ", :default => 'http://localhost:4000').should == "http://localhost:4000"
         out.string.should == "your chef server URL? [http://localhost:4000] "
       end

data/spec/unit/knife/data_bag_create_spec.rb

@@ -39,9 +39,9 @@ describe Chef::Knife::DataBagCreate do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::DataBagCreate.new
     @rest = ChefSpecs::ChefRest.new
-    @knife.stub!(:rest).and_return(@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
 
 
@@ -101,7 +101,7 @@ describe Chef::Knife::DataBagCreate do
     end
 
     it "creates an encrypted data bag item via --secret" do
-      @knife.stub!(:config).and_return({:secret => @secret})
+      @knife.stub(:config).and_return({:secret => @secret})
       @knife.run
     end
 
@@ -109,7 +109,7 @@ describe Chef::Knife::DataBagCreate do
       secret_file = Tempfile.new("encrypted_data_bag_secret_file_test")
       secret_file.puts(@secret)
       secret_file.flush
-      @knife.stub!(:config).and_return({:secret_file => secret_file.path})
+      @knife.stub(:config).and_return({:secret_file => secret_file.path})
       @knife.run
     end
   end

data/spec/unit/knife/data_bag_edit_spec.rb

@@ -29,11 +29,11 @@ describe Chef::Knife::DataBagEdit do
     Chef::Config[:node_name]  = "webmonkey.example.com"
 
     @knife = Chef::Knife::DataBagEdit.new
-    @rest = mock('chef-rest-mock')
-    @knife.stub!(:rest).and_return(@rest)
+    @rest = double('chef-rest-mock')
+    @knife.stub(:rest).and_return(@rest)
 
     @stdout = StringIO.new
-    @knife.stub!(:stdout).and_return(@stdout)
+    @knife.stub(:stdout).and_return(@stdout)
     @log = Chef::Log
     @knife.name_args = ['bag_name', 'item_name']
   end
@@ -45,7 +45,7 @@ describe Chef::Knife::DataBagEdit do
   end
 
   it "saves edits on a data bag item" do
-    Chef::DataBagItem.stub!(:load).with('bag_name', 'item_name').and_return(@plain_data)
+    Chef::DataBagItem.stub(:load).with('bag_name', 'item_name').and_return(@plain_data)
     @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
     @rest.should_receive(:put_rest).with("data/bag_name/item_name", @edited_data).ordered
     @knife.run
@@ -58,7 +58,7 @@ describe Chef::Knife::DataBagEdit do
                                                                    @secret)
       @enc_edited_data = Chef::EncryptedDataBagItem.encrypt_data_bag_item(@edited_data,
                                                                           @secret)
-      Chef::DataBagItem.stub!(:load).with('bag_name', 'item_name').and_return(@enc_data)
+      Chef::DataBagItem.stub(:load).with('bag_name', 'item_name').and_return(@enc_data)
 
       # Random IV is used each time the data bag item is encrypted, so values
       # will not be equal if we encrypt same value twice.
@@ -75,7 +75,7 @@ describe Chef::Knife::DataBagEdit do
     end
 
     it "decrypts and encrypts via --secret" do
-      @knife.stub!(:config).and_return({:secret => @secret})
+      @knife.stub(:config).and_return({:secret => @secret})
       @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
       @rest.should_receive(:put_rest).with("data/bag_name/item_name", @enc_edited_data).ordered
 
@@ -83,7 +83,7 @@ describe Chef::Knife::DataBagEdit do
     end
 
     it "decrypts and encrypts via --secret_file" do
-      @knife.stub!(:config).and_return({:secret_file => @secret_file.path})
+      @knife.stub(:config).and_return({:secret_file => @secret_file.path})
       @knife.should_receive(:edit_data).with(@plain_data).and_return(@edited_data)
       @rest.should_receive(:put_rest).with("data/bag_name/item_name", @enc_edited_data).ordered
 

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -29,10 +29,10 @@ describe Chef::Knife::DataBagFromFile do
   before :each do
     Chef::Config[:node_name]  = "webmonkey.example.com"
     @knife = Chef::Knife::DataBagFromFile.new
-    @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)
     @tmp_dir = Dir.mktmpdir
     @db_folder = File.join(@tmp_dir, 'data_bags', 'bag_name')
     FileUtils.mkdir_p(@db_folder)
@@ -64,7 +64,7 @@ describe Chef::Knife::DataBagFromFile do
   it "loads from a file and saves" do
     @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
     dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub!(:new).and_return(dbag)
+    Chef::DataBagItem.stub(:new).and_return(dbag)
     dbag.should_receive(:save)
     @knife.run
 
@@ -77,7 +77,7 @@ describe Chef::Knife::DataBagFromFile do
     @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
     @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file2.path).and_return(@plain_data)
     dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub!(:new).and_return(dbag)
+    Chef::DataBagItem.stub(:new).and_return(dbag)
     dbag.should_receive(:save).twice
     @knife.run
 
@@ -91,7 +91,7 @@ describe Chef::Knife::DataBagFromFile do
     @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
     @knife.loader.should_receive(:load_from).with("data_bags", 'bag_name', @db_file2.path).and_return(@plain_data)
     dbag = Chef::DataBagItem.new
-    Chef::DataBagItem.stub!(:new).and_return(dbag)
+    Chef::DataBagItem.stub(:new).and_return(dbag)
     dbag.should_receive(:save).twice
     @knife.run
   end
@@ -109,7 +109,7 @@ describe Chef::Knife::DataBagFromFile do
 
     it "loads all data bags when -a or --all options is provided" do
       @knife.name_args = []
-      @knife.stub!(:config).and_return({:all => true})
+      @knife.stub(:config).and_return({:all => true})
       @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", File.basename(@db_file.path)).
         and_return(@plain_data)
       @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", File.basename(@db_file2.path)).
@@ -117,18 +117,18 @@ describe Chef::Knife::DataBagFromFile do
       @knife.loader.should_receive(:load_from).with("data_bags", "bag_name2", File.basename(@db_file3.path)).
         and_return(@plain_data)
       dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub!(:new).and_return(dbag)
+      Chef::DataBagItem.stub(:new).and_return(dbag)
       dbag.should_receive(:save).exactly(3).times
       @knife.run
     end
 
     it "loads all data bags items when -a or --all options is provided" do
       @knife.name_args = ["bag_name2"]
-      @knife.stub!(:config).and_return({:all => true})
+      @knife.stub(:config).and_return({:all => true})
       @knife.loader.should_receive(:load_from).with("data_bags", "bag_name2", File.basename(@db_file3.path)).
         and_return(@plain_data)
       dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub!(:new).and_return(dbag)
+      Chef::DataBagItem.stub(:new).and_return(dbag)
       dbag.should_receive(:save)
       @knife.run
       dbag.data_bag.should == 'bag_name2'
@@ -158,11 +158,11 @@ describe Chef::Knife::DataBagFromFile do
     end
 
     it "encrypts values when given --secret" do
-      @knife.stub!(:config).and_return({:secret => @secret})
+      @knife.stub(:config).and_return({:secret => @secret})
 
       @knife.loader.should_receive(:load_from).with("data_bags", "bag_name", @db_file.path).and_return(@plain_data)
       dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub!(:new).and_return(dbag)
+      Chef::DataBagItem.stub(:new).and_return(dbag)
       dbag.should_receive(:save)
       @knife.run
       dbag.data_bag.should == 'bag_name'
@@ -170,11 +170,11 @@ describe Chef::Knife::DataBagFromFile do
     end
 
     it "encrypts values 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})
 
-      @knife.loader.stub!(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
+      @knife.loader.stub(:load_from).with("data_bags", 'bag_name', @db_file.path).and_return(@plain_data)
       dbag = Chef::DataBagItem.new
-      Chef::DataBagItem.stub!(:new).and_return(dbag)
+      Chef::DataBagItem.stub(:new).and_return(dbag)
       dbag.should_receive(:save)
       @knife.run
       dbag.data_bag.should == 'bag_name'