chef 12.0.3-x86-mingw32 → 12.1.0.rc.0-x86-mingw32

data/spec/unit/application/apply_spec.rb

@@ -21,7 +21,7 @@ describe Chef::Application::Apply do
 
   before do
     @app = Chef::Application::Apply.new
-    @app.stub(:configure_logging).and_return(true)
+    allow(@app).to receive(:configure_logging).and_return(true)
     @recipe_text = "package 'nyancat'"
     Chef::Config[:solo] = true
   end
@@ -29,7 +29,7 @@ describe Chef::Application::Apply do
   describe "configuring the application" do
     it "should set solo mode to true" do
       @app.reconfigure
-      Chef::Config[:solo].should be_true
+      expect(Chef::Config[:solo]).to be_truthy
     end
   end
   describe "read_recipe_file" do
@@ -37,30 +37,30 @@ describe Chef::Application::Apply do
       @recipe_file_name = "foo.rb"
       @recipe_path = File.expand_path(@recipe_file_name)
       @recipe_file = double("Tempfile (mock)", :read => @recipe_text)
-      @app.stub(:open).with(@recipe_path).and_return(@recipe_file)
-      File.stub(:exist?).with(@recipe_path).and_return(true)
-      Chef::Application.stub(:fatal!).and_return(true)
+      allow(@app).to receive(:open).with(@recipe_path).and_return(@recipe_file)
+      allow(File).to receive(:exist?).with(@recipe_path).and_return(true)
+      allow(Chef::Application).to receive(:fatal!).and_return(true)
     end
 
     it "should read text properly" do
-      @app.read_recipe_file(@recipe_file_name)[0].should == @recipe_text
+      expect(@app.read_recipe_file(@recipe_file_name)[0]).to eq(@recipe_text)
     end
     it "should return a file_handle" do
-      @app.read_recipe_file(@recipe_file_name)[1].should be_instance_of(RSpec::Mocks::Mock)
+      expect(@app.read_recipe_file(@recipe_file_name)[1]).to be_instance_of(RSpec::Mocks::Double)
     end
 
     describe "when recipe is nil" do
       it "should raise a fatal with the missing filename message" do
-        Chef::Application.should_receive(:fatal!).with("No recipe file was provided", 1)
+        expect(Chef::Application).to receive(:fatal!).with("No recipe file was provided", 1)
         @app.read_recipe_file(nil)
       end
     end
     describe "when recipe doesn't exist" do
       before do
-        File.stub(:exist?).with(@recipe_path).and_return(false)
+        allow(File).to receive(:exist?).with(@recipe_path).and_return(false)
       end
       it "should raise a fatal with the file doesn't exist message" do
-        Chef::Application.should_receive(:fatal!).with(/^No file exists at/, 1)
+        expect(Chef::Application).to receive(:fatal!).with(/^No file exists at/, 1)
         @app.read_recipe_file(@recipe_file_name)
       end
     end
@@ -72,13 +72,13 @@ describe Chef::Application::Apply do
       @recipe_fh = @app.instance_variable_get(:@recipe_fh)
     end
     it "should open a tempfile" do
-      @recipe_fh.path.should match(/.*recipe-temporary-file.*/)
+      expect(@recipe_fh.path).to match(/.*recipe-temporary-file.*/)
     end
     it "should write recipe text to the tempfile" do
-      @recipe_fh.read.should == @recipe_text
+      expect(@recipe_fh.read).to eq(@recipe_text)
     end
     it "should save the filename for later use" do
-      @recipe_fh.path.should == @app.instance_variable_get(:@recipe_filename)
+      expect(@recipe_fh.path).to eq(@app.instance_variable_get(:@recipe_filename))
     end
   end
   describe "recipe_file_arg" do
@@ -86,9 +86,25 @@ describe Chef::Application::Apply do
       ARGV.clear
     end
     it "should exit and log message" do
-      Chef::Log.should_receive(:debug).with(/^No recipe file provided/)
-      lambda { @app.run }.should raise_error(SystemExit) { |e| e.status.should == 1 }
+      expect(Chef::Log).to receive(:debug).with(/^No recipe file provided/)
+      expect { @app.run }.to raise_error(SystemExit) { |e| expect(e.status).to eq(1) }
     end
 
   end
+  describe "when the json_attribs configuration option is specified" do
+    let(:json_attribs) { {"a" => "b"} }
+    let(:config_fetcher) { double(Chef::ConfigFetcher, :fetch_json => json_attribs) }
+    let(:json_source) { "https://foo.com/foo.json" }
+
+    before do
+      Chef::Config[:json_attribs] = 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
+      expect(@app.json_attribs).to eq(json_attribs)
+    end
+  end
 end

data/spec/unit/application/client_spec.rb

@@ -18,18 +18,21 @@
 require 'spec_helper'
 
 describe Chef::Application::Client, "reconfigure" do
+  let(:app) do
+    a = described_class.new
+    a.cli_arguments = []
+    a
+  end
+
   before do
-    Kernel.stub(:trap).and_return(:ok)
+    allow(Kernel).to receive(:trap).and_return(:ok)
+    allow(::File).to receive(:read).with(Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_return("")
 
     @original_argv = ARGV.dup
     ARGV.clear
 
-    @app = Chef::Application::Client.new
-    @app.stub(:trap)
-    @app.stub(:configure_opt_parser).and_return(true)
-    @app.stub(:configure_chef).and_return(true)
-    @app.stub(:configure_logging).and_return(true)
-    @app.cli_arguments = []
+    allow(app).to receive(:trap)
+    allow(app).to receive(:configure_logging).and_return(true)
     Chef::Config[:interval] = 10
 
     Chef::Config[:once] = false
@@ -39,6 +42,13 @@ describe Chef::Application::Client, "reconfigure" do
     ARGV.replace(@original_argv)
   end
 
+  describe 'parse cli_arguments' do
+    it 'should call set_specific_recipes' do
+      expect(app).to receive(:set_specific_recipes).and_return(true)
+      app.reconfigure
+    end
+  end
+
   describe "when configured to not fork the client process" do
     before do
       Chef::Config[:client_fork] = false
@@ -50,16 +60,17 @@ describe Chef::Application::Client, "reconfigure" do
     context "when interval is given" do
       before do
         Chef::Config[:interval] = 600
+        allow(Chef::Platform).to receive(:windows?).and_return(false)
       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
 
@@ -71,7 +82,7 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
 
       it "should not terminate" do
         expect(Chef::Application).not_to receive(:fatal!)
-        @app.reconfigure
+        app.reconfigure
       end
     end
 
@@ -82,8 +93,8 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
       end
 
       it "should reconfigure chef-client" do
-        @app.reconfigure
-        Chef::Config[:interval].should be_nil
+        app.reconfigure
+        expect(Chef::Config[:interval]).to be_nil
       end
     end
   end
@@ -95,8 +106,8 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
     end
 
     it "should set the interval to 1800" do
-      @app.reconfigure
-      Chef::Config.interval.should == 1800
+      app.reconfigure
+      expect(Chef::Config.interval).to eq(1800)
     end
   end
 
@@ -109,13 +120,13 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
     end
 
     it "ignores the splay" do
-      @app.reconfigure
-      Chef::Config.splay.should be_nil
+      app.reconfigure
+      expect(Chef::Config.splay).to be_nil
     end
 
     it "forces the interval to nil" do
-      @app.reconfigure
-      Chef::Config.interval.should be_nil
+      app.reconfigure
+      expect(Chef::Config.interval).to be_nil
     end
 
   end
@@ -127,29 +138,117 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
     let(:json_source) { "https://foo.com/foo.json" }
 
     before do
+      allow(app).to receive(:configure_chef).and_return(true)
       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 "audit mode" do
+    shared_examples "experimental feature" do
+      before do
+        allow(Chef::Log).to receive(:warn)
+      end
+
+      it "emits a warning that audit mode is an experimental feature" do
+        expect(Chef::Log).to receive(:warn).with(/Audit mode is an experimental feature/)
+        app.reconfigure
+      end
+    end
+
+    shared_examples "unrecognized setting" do
+      it "fatals with a message including the incorrect setting" do
+        expect(Chef::Application).to receive(:fatal!).with(/Unrecognized setting #{mode} for audit mode/)
+        app.reconfigure
+      end
+    end
+
+    shared_context "set via config file" do
+      before do
+        Chef::Config[:audit_mode] = mode
+      end
+    end
+
+    shared_context "set via command line" do
+      before do
+        ARGV.replace(["--audit-mode", mode])
+      end
+    end
+
+    describe "enabled via config file" do
+      include_context "set via config file" do
+        let(:mode) { :enabled }
+        include_examples "experimental feature"
+      end
+    end
+
+    describe "enabled via command line" do
+      include_context "set via command line" do
+        let(:mode) { "enabled" }
+        include_examples "experimental feature"
+      end
+    end
+
+    describe "audit_only via config file" do
+      include_context "set via config file" do
+        let(:mode) { :audit_only }
+        include_examples "experimental feature"
+      end
+    end
+
+    describe "audit-only via command line" do
+      include_context "set via command line" do
+        let(:mode) { "audit-only" }
+        include_examples "experimental feature"
+      end
+    end
+
+    describe "unrecognized setting via config file" do
+      include_context "set via config file" do
+        let(:mode) { :derp }
+        include_examples "unrecognized setting"
+      end
+    end
+
+    describe "unrecognized setting via command line" do
+      include_context "set via command line" do
+        let(:mode) { "derp" }
+        include_examples "unrecognized setting"
+      end
+    end
+  end
+
+  describe "when both the pidfile and lockfile opts are set to the same value" do
+
+    before do
+      Chef::Config[:pid_file] = "/path/to/file"
+      Chef::Config[:lockfile] = "/path/to/file"
+    end
+
+    it "should throw an exception" do
+      expect { @app.reconfigure }.to raise_error
     end
   end
 end
 
+
 describe Chef::Application::Client, "setup_application" do
   before do
     @app = Chef::Application::Client.new
     # 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)
+    expect(Chef::Daemon).to receive(:change_privilege).and_return(true)
     @app.setup_application
   end
   after do
@@ -158,11 +257,13 @@ describe Chef::Application::Client, "setup_application" do
 end
 
 describe Chef::Application::Client, "configure_chef" do
+  let(:app) { Chef::Application::Client.new }
+
   before do
     @original_argv = ARGV.dup
     ARGV.clear
-    @app = Chef::Application::Client.new
-    @app.configure_chef
+    allow(::File).to receive(:read).with(Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_return("")
+    app.configure_chef
   end
 
   after do
@@ -171,9 +272,9 @@ describe Chef::Application::Client, "configure_chef" do
 
   it "should set the colored output to false by default on windows and true otherwise" do
     if windows?
-      Chef::Config[:color].should be_false
+      expect(Chef::Config[:color]).to be_falsey
     else
-      Chef::Config[:color].should be_true
+      expect(Chef::Config[:color]).to be_truthy
     end
   end
 end
@@ -189,8 +290,8 @@ describe Chef::Application::Client, "run_application", :unix_only do
 
     @pipe = IO.pipe
     @client = Chef::Client.new
-    Chef::Client.stub(:new).and_return(@client)
-    @client.stub(:run) do
+    allow(Chef::Client).to receive(:new).and_return(@client)
+    allow(@client).to receive(:run) do
       @pipe[1].puts 'started'
       sleep 1
       @pipe[1].puts 'finished'
@@ -201,7 +302,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
     context "when converging in forked process" do
       before do
         Chef::Config[:daemonize] = true
-        Chef::Daemon.stub(:daemonize).and_return(true)
+        allow(Chef::Daemon).to receive(:daemonize).and_return(true)
       end
 
       it "should exit hard with exitstatus 3" do
@@ -210,19 +311,19 @@ describe Chef::Application::Client, "run_application", :unix_only do
         end
         Process.kill("TERM", pid)
         _pid, result = Process.waitpid2(pid)
-        result.exitstatus.should == 3
+        expect(result.exitstatus).to eq(3)
       end
 
       it "should allow child to finish converging" do
         pid = fork do
           @app.run_application
         end
-        @pipe[0].gets.should == "started\n"
+        expect(@pipe[0].gets).to eq("started\n")
         Process.kill("TERM", pid)
         Process.wait
         sleep 1 # Make sure we give the converging child process enough time to finish
-        IO.select([@pipe[0]], nil, nil, 0).should_not be_nil
-        @pipe[0].gets.should == "finished\n"
+        expect(IO.select([@pipe[0]], nil, nil, 0)).not_to be_nil
+        expect(@pipe[0].gets).to eq("finished\n")
       end
     end
 
@@ -236,12 +337,12 @@ describe Chef::Application::Client, "run_application", :unix_only do
         pid = fork do
           @app.run_application
         end
-        @pipe[0].gets.should == "started\n"
+        expect(@pipe[0].gets).to eq("started\n")
         Process.kill("TERM", pid)
         _pid, result = Process.waitpid2(pid)
-        result.exitstatus.should == 0
-        IO.select([@pipe[0]], nil, nil, 0).should_not be_nil
-        @pipe[0].gets.should == "finished\n"
+        expect(result.exitstatus).to eq(0)
+        expect(IO.select([@pipe[0]], nil, nil, 0)).not_to be_nil
+        expect(@pipe[0].gets).to eq("finished\n")
       end
 
       it "should exit hard when sent before converge" do
@@ -251,7 +352,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
         end
         Process.kill("TERM", pid)
         _pid, result = Process.waitpid2(pid)
-        result.exitstatus.should == 3
+        expect(result.exitstatus).to eq(3)
       end
     end
   end
@@ -267,7 +368,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
       # Chef::Log.init($stderr)
       # Chef::Log.level = :debug
 
-      @app.stub(:run_chef_client) do
+      allow(@app).to receive(:run_chef_client) do
 
         run_count += 1
         if run_count > 3
@@ -289,7 +390,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
       # We have to do it this way because the main loop of
       # Chef::Application::Client swallows most exceptions, and we need to be
       # able to expose our expectation failures to the parent process in the test.
-      @app.stub(:interval_sleep) do |arg|
+      allow(@app).to receive(:interval_sleep) do |arg|
         number_of_sleep_calls += 1
         if number_of_sleep_calls > 1
           exit 127
@@ -298,12 +399,12 @@ describe Chef::Application::Client, "run_application", :unix_only do
     end
 
     it "shouldn't sleep when sent USR1" do
-      @app.stub(:interval_sleep).with(0).and_call_original
+      allow(@app).to receive(:interval_sleep).with(0).and_call_original
       pid = fork do
         @app.run_application
       end
       _pid, result = Process.waitpid2(pid)
-      result.exitstatus.should == 0
+      expect(result.exitstatus).to eq(0)
     end
   end
 end