1 files changed, 59 insertions, 43 deletions
diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb
index e29fcc9367..1785ecfc86 100644
--- a/spec/unit/application/solo_spec.rb
+++ b/spec/unit/application/solo_spec.rb
@@ -18,22 +18,35 @@
 require 'spec_helper'
 
 describe Chef::Application::Solo do
+
+  let(:app) { Chef::Application::Solo.new }
+
   before do
-    Kernel.stub(:trap).and_return(:ok)
-    @app = Chef::Application::Solo.new
-    @app.stub(:configure_opt_parser).and_return(true)
-    @app.stub(:configure_chef).and_return(true)
-    @app.stub(:configure_logging).and_return(true)
-    @app.stub(:trap)
+    allow(Kernel).to receive(:trap).and_return(:ok)
+    allow(app).to receive(:configure_opt_parser).and_return(true)
+    allow(app).to receive(:configure_chef).and_return(true)
+    allow(app).to receive(:configure_logging).and_return(true)
+    allow(app).to receive(:trap)
+
     Chef::Config[:recipe_url] = false
     Chef::Config[:json_attribs] = false
     Chef::Config[:solo] = true
   end
 
   describe "configuring the application" do
+    it 'should call set_specific_recipes' do
+      expect(app).to receive(:set_specific_recipes)
+      app.reconfigure
+    end
+
     it "should set solo mode to true" do
-      @app.reconfigure
-      Chef::Config[:solo].should be_true
+      app.reconfigure
+      expect(Chef::Config[:solo]).to be_truthy
+    end
+
+    it "should set audit-mode to :disabled" do
+      app.reconfigure
+      expect(Chef::Config[:audit_mode]).to be :disabled
     end
 
     describe "when configured to not fork the client process" do
@@ -50,13 +63,13 @@ describe Chef::Application::Solo do
         end
 
         it "should terminate with message" do
-          Chef::Application.should_receive(:fatal!).with(
+          expect(Chef::Application).to receive(:fatal!).with(
 "Unforked chef-client interval runs are disabled in Chef 12.
 Configuration settings:
   interval  = 600 seconds
 Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
           )
-          @app.reconfigure
+          app.reconfigure
         end
       end
     end
@@ -68,8 +81,8 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
 
       it "should set the interval to 1800" do
         Chef::Config[:interval] = nil
-        @app.reconfigure
-        Chef::Config[:interval].should == 1800
+        app.reconfigure
+        expect(Chef::Config[:interval]).to eq(1800)
       end
     end
 
@@ -80,48 +93,51 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
 
       before do
         Chef::Config[:json_attribs] = json_source
-        Chef::ConfigFetcher.should_receive(:new).with(json_source).
+        expect(Chef::ConfigFetcher).to receive(:new).with(json_source).
           and_return(config_fetcher)
       end
 
       it "reads the JSON attributes from the specified source" do
-        @app.reconfigure
-        @app.chef_client_json.should == json_attribs
+        app.reconfigure
+        expect(app.chef_client_json).to eq(json_attribs)
       end
     end
 
     describe "when the recipe_url configuration option is specified" do
+      let(:tarfile) { StringIO.new("remote_tarball_content") }
+      let(:target_file) { StringIO.new }
+
       before do
         Chef::Config[:cookbook_path] = "#{Dir.tmpdir}/chef-solo/cookbooks"
         Chef::Config[:recipe_url] = "http://junglist.gen.nz/recipes.tgz"
-        FileUtils.stub(:mkdir_p).and_return(true)
-        @tarfile = StringIO.new("remote_tarball_content")
-        @app.stub(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(@tarfile)
 
-        @target_file = StringIO.new
-        File.stub(:open).with("#{Dir.tmpdir}/chef-solo/recipes.tgz", "wb").and_yield(@target_file)
+        allow(FileUtils).to receive(:rm_rf).and_return(true)
+        allow(FileUtils).to receive(:mkdir_p).and_return(true)
+
+        allow(app).to receive(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(tarfile)
+        allow(File).to receive(:open).with("#{Dir.tmpdir}/chef-solo/recipes.tgz", "wb").and_yield(target_file)
 
-        Chef::Mixin::Command.stub(:run_command).and_return(true)
+        allow(Chef::Mixin::Command).to receive(:run_command).and_return(true)
       end
 
       it "should create the recipes path based on the parent of the cookbook path" do
-        FileUtils.should_receive(:mkdir_p).with("#{Dir.tmpdir}/chef-solo").and_return(true)
-        @app.reconfigure
+        expect(FileUtils).to receive(:mkdir_p).with("#{Dir.tmpdir}/chef-solo").and_return(true)
+        app.reconfigure
       end
 
       it "should download the recipes" do
-        @app.should_receive(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(@tarfile)
-        @app.reconfigure
+        expect(app).to receive(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(tarfile)
+        app.reconfigure
       end
 
       it "should write the recipes to the target path" do
-        @app.reconfigure
-        @target_file.string.should == "remote_tarball_content"
+        app.reconfigure
+        expect(target_file.string).to eq("remote_tarball_content")
       end
 
       it "should untar the target file to the parent of the cookbook path" do
-        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvf #{Dir.tmpdir}/chef-solo/recipes.tgz -C #{Dir.tmpdir}/chef-solo"}).and_return(true)
-        @app.reconfigure
+        expect(Chef::Mixin::Command).to receive(:run_command).with({:command => "tar zxvf #{Dir.tmpdir}/chef-solo/recipes.tgz -C #{Dir.tmpdir}/chef-solo"}).and_return(true)
+        app.reconfigure
       end
     end
   end
@@ -135,14 +151,15 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
       Chef::Config[:json_attribs] = json_source
       Chef::Config[:recipe_url] = "http://icanhas.cheezburger.com/lolcats"
       Chef::Config[:cookbook_path] = "#{Dir.tmpdir}/chef-solo/cookbooks"
-      FileUtils.stub(:mkdir_p).and_return(true)
-      Chef::Mixin::Command.stub(:run_command).and_return(true)
+      allow(FileUtils).to receive(:rm_rf).and_return(true)
+      allow(FileUtils).to receive(:mkdir_p).and_return(true)
+      allow(Chef::Mixin::Command).to receive(:run_command).and_return(true)
     end
 
     it "should fetch the recipe_url first" do
-      @app.should_receive(:fetch_recipe_tarball).ordered
-      Chef::ConfigFetcher.should_receive(:new).ordered.and_return(config_fetcher)
-      @app.reconfigure
+      expect(app).to receive(:fetch_recipe_tarball).ordered
+      expect(Chef::ConfigFetcher).to receive(:new).ordered.and_return(config_fetcher)
+      app.reconfigure
     end
   end
 
@@ -150,19 +167,18 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
     before do
       Chef::Config[:solo] = true
 
-      Chef::Daemon.stub(:change_privilege)
-      @chef_client = double("Chef::Client")
-      Chef::Client.stub(:new).and_return(@chef_client)
-      @app = Chef::Application::Solo.new
+      allow(Chef::Daemon).to receive(:change_privilege)
+      chef_client = double("Chef::Client")
+      allow(Chef::Client).to receive(:new).and_return(chef_client)
       # this is all stuff the reconfigure method needs
-      @app.stub(:configure_opt_parser).and_return(true)
-      @app.stub(:configure_chef).and_return(true)
-      @app.stub(:configure_logging).and_return(true)
+      allow(app).to receive(:configure_opt_parser).and_return(true)
+      allow(app).to receive(:configure_chef).and_return(true)
+      allow(app).to receive(:configure_logging).and_return(true)
     end
 
     it "should change privileges" do
-      Chef::Daemon.should_receive(:change_privilege).and_return(true)
-      @app.setup_application
+      expect(Chef::Daemon).to receive(:change_privilege).and_return(true)
+      app.setup_application
     end
   end