Unit tests for audit-mode in chef-solo.mcquin/solo-spec

* Audits are disabled by default.
* Also, updated spec file to use RSpec :let.

1 files changed, 38 insertions, 29 deletions

diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb
index 80f0bead8b..2a07ff38ad 100644
--- a/spec/unit/application/solo_spec.rb
+++ b/spec/unit/application/solo_spec.rb
@@ -18,13 +18,16 @@
 require 'spec_helper'
 
 describe Chef::Application::Solo do
+
+  let(:app) { Chef::Application::Solo.new }
+
   before do
     allow(Kernel).to receive(:trap).and_return(:ok)
-    @app = Chef::Application::Solo.new
-    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)
+    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
@@ -32,10 +35,15 @@ describe Chef::Application::Solo do
 
   describe "configuring the application" do
     it "should set solo mode to true" do
-      @app.reconfigure
+      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
       before do
         Chef::Config[:client_fork] = false
@@ -56,7 +64,7 @@ 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,7 +76,7 @@ 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
+        app.reconfigure
         expect(Chef::Config[:interval]).to eq(1800)
       end
     end
@@ -85,44 +93,46 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
       end
 
       it "reads the JSON attributes from the specified source" do
-        @app.reconfigure
-        expect(@app.chef_client_json).to eq(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"
+
         allow(FileUtils).to receive(:rm_rf).and_return(true)
         allow(FileUtils).to receive(:mkdir_p).and_return(true)
-        @tarfile = StringIO.new("remote_tarball_content")
-        allow(@app).to receive(:open).with("http://junglist.gen.nz/recipes.tgz").and_yield(@tarfile)
 
-        @target_file = StringIO.new
-        allow(File).to receive(:open).with("#{Dir.tmpdir}/chef-solo/recipes.tgz", "wb").and_yield(@target_file)
+        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)
 
         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
         expect(FileUtils).to receive(:mkdir_p).with("#{Dir.tmpdir}/chef-solo").and_return(true)
-        @app.reconfigure
+        app.reconfigure
       end
 
       it "should download the recipes" do
-        expect(@app).to 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
-        expect(@target_file.string).to eq("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
         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
+        app.reconfigure
       end
     end
   end
@@ -142,9 +152,9 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
     end
 
     it "should fetch the recipe_url first" do
-      expect(@app).to receive(:fetch_recipe_tarball).ordered
+      expect(app).to receive(:fetch_recipe_tarball).ordered
       expect(Chef::ConfigFetcher).to receive(:new).ordered.and_return(config_fetcher)
-      @app.reconfigure
+      app.reconfigure
     end
   end
 
@@ -153,18 +163,17 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
       Chef::Config[:solo] = true
 
       allow(Chef::Daemon).to receive(:change_privilege)
-      @chef_client = double("Chef::Client")
-      allow(Chef::Client).to receive(:new).and_return(@chef_client)
-      @app = Chef::Application::Solo.new
+      chef_client = double("Chef::Client")
+      allow(Chef::Client).to receive(:new).and_return(chef_client)
       # this is all stuff the reconfigure method needs
-      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(: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
       expect(Chef::Daemon).to receive(:change_privilege).and_return(true)
-      @app.setup_application
+      app.setup_application
     end
   end