chef 11.18.12-x86-mingw32 → 12.0.0.alpha.0-x86-mingw32

data/spec/unit/node_spec.rb

@@ -762,10 +762,6 @@ describe Chef::Node do
       end
       serialized_node.run_list.should == node.run_list
     end
-
-    include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
-      let(:subject) { node.from_file(File.expand_path("nodes/test.example.com.rb", CHEF_SPEC_DATA)) }
-    end
   end
 
   describe "to_s" do

data/spec/unit/platform/query_helpers_spec.rb

@@ -30,26 +30,3 @@ describe "Chef::Platform#windows_server_2003?" do
     expect { Thread.fork { Chef::Platform.windows_server_2003? }.join }.not_to raise_error
   end
 end
-
-describe 'Chef::Platform#supports_dsc?' do 
-  it 'returns false if powershell is not present' do
-    node = Chef::Node.new
-    Chef::Platform.supports_dsc?(node).should be_false
-  end
-
-  ['1.0', '2.0', '3.0'].each do |version|
-    it "returns false for Powershell #{version}" do
-      node = Chef::Node.new
-      node.automatic[:languages][:powershell][:version] = version
-      Chef::Platform.supports_dsc?(node).should be_false
-    end
-  end
-
-  ['4.0', '5.0'].each do |version|
-    it "returns true for Powershell #{version}" do
-      node = Chef::Node.new
-      node.automatic[:languages][:powershell][:version] = version
-      Chef::Platform.supports_dsc?(node).should be_true
-    end
-  end
-end

data/spec/unit/provider/env/windows_spec.rb

@@ -19,85 +19,49 @@
 require 'spec_helper'
 
 describe Chef::Provider::Env::Windows, :windows_only do
-  let(:node) { Chef::Node.new }
-  let(:events) {Chef::EventDispatch::Dispatcher.new }
-  let(:run_context) { Chef::RunContext.new(node, {}, events) }
-
-  context 'when environment variable is not PATH' do
-    let(:new_resource) {
-      new_resource = Chef::Resource::Env.new("CHEF_WINDOWS_ENV_TEST")
-      new_resource.value("foo")
-      new_resource
-    }
-    let(:provider) { 
-      provider = Chef::Provider::Env::Windows.new(new_resource, run_context) 
-      provider.stub(:env_obj).and_return(double('null object').as_null_object)
-      provider
-    }
-
-    describe "action_create" do
-      before do
-        ENV.delete('CHEF_WINDOWS_ENV_TEST')
-        provider.key_exists = false
-      end
+  before do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Env.new("CHEF_WINDOWS_ENV_TEST")
+    @new_resource.value("foo")
+    @provider = Chef::Provider::Env::Windows.new(@new_resource, @run_context)
+    @provider.stub(:env_obj).and_return(double('null object').as_null_object)
+  end
 
-      it "should update the ruby ENV object when it creates the key" do
-        provider.action_create
-        expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql('foo')
-      end
+  describe "action_create" do
+    before do
+      ENV.delete('CHEF_WINDOWS_ENV_TEST')
+      @provider.key_exists = false
     end
 
-    describe "action_modify" do
-      before do
-        ENV['CHEF_WINDOWS_ENV_TEST'] = 'foo'
-      end
-
-      it "should update the ruby ENV object when it updates the value" do
-        provider.should_receive(:requires_modify_or_create?).and_return(true)
-        new_resource.value("foobar")
-        provider.action_modify
-        expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql('foobar')
-      end
-
-      describe "action_delete" do
-        before do
-          ENV['CHEF_WINDOWS_ENV_TEST'] = 'foo'
-        end
-
-        it "should update the ruby ENV object when it deletes the key" do
-          provider.action_delete
-          expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql(nil)
-        end
-      end
+    it "should update the ruby ENV object when it creates the key" do
+      @provider.action_create
+      expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql('foo')
     end
   end
 
-  context 'when environment is PATH' do
-    describe "for PATH" do
-      let(:system_root) {'%SystemRoot%'}
-      let(:system_root_value) { 'D:\Windows' }
-      let(:new_resource) {
-        new_resource = Chef::Resource::Env.new('PATH')
-        new_resource.value(system_root)
-        new_resource
-      }
-      let(:provider) { 
-        provider = Chef::Provider::Env::Windows.new(new_resource, run_context) 
-        provider.stub(:env_obj).and_return(double('null object').as_null_object)
-        provider
-      }
+  describe "action_modify" do
+    before do
+      ENV['CHEF_WINDOWS_ENV_TEST'] = 'foo'
+    end
 
-      before do
-        stub_const('ENV', {'PATH' => ''})
-      end
+    it "should update the ruby ENV object when it updates the value" do
+      @provider.should_receive(:compare_value).and_return(true)
+      @new_resource.value("foobar")
+      @provider.action_modify
+      expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql('foobar')
+    end
+  end
 
-      it "replaces Windows system variables" do
-        provider.should_receive(:requires_modify_or_create?).and_return(true)
-        provider.should_receive(:expand_path).with(system_root).and_return(system_root_value)
-        provider.action_modify
-        expect(ENV['PATH']).to eql(system_root_value)
-      end
+  describe "action_delete" do
+    before do
+      ENV['CHEF_WINDOWS_ENV_TEST'] = 'foo'
     end
 
+    it "should update the ruby ENV object when it deletes the key" do
+      @provider.action_delete
+      expect(ENV['CHEF_WINDOWS_ENV_TEST']).to eql(nil)
+    end
   end
 end

data/spec/unit/provider/env_spec.rb

@@ -88,20 +88,20 @@ describe Chef::Provider::Env do
 
     it "should check to see if the values are the same if the key exists" do
       @provider.key_exists = true
-      @provider.should_receive(:requires_modify_or_create?).and_return(false)
+      @provider.should_receive(:compare_value).and_return(false)
       @provider.action_create
     end
 
     it "should call modify_env if the key exists and values are not equal" do
       @provider.key_exists = true
-      @provider.stub(:requires_modify_or_create?).and_return(true)
+      @provider.stub(:compare_value).and_return(true)
       @provider.should_receive(:modify_env).and_return(true)
       @provider.action_create
     end
 
     it "should set the new_resources updated flag when it updates an existing value" do
       @provider.key_exists = true
-      @provider.stub(:requires_modify_or_create?).and_return(true)
+      @provider.stub(:compare_value).and_return(true)
       @provider.stub(:modify_env).and_return(true)
       @provider.action_create
       @new_resource.should be_updated
@@ -147,20 +147,20 @@ describe Chef::Provider::Env do
     end
 
     it "should call modify_group if the key exists and values are not equal" do
-      @provider.should_receive(:requires_modify_or_create?).and_return(true)
+      @provider.should_receive(:compare_value).and_return(true)
       @provider.should_receive(:modify_env).and_return(true)
       @provider.action_modify
     end
 
     it "should set the new resources updated flag to true if modify_env is called" do
-      @provider.stub(:requires_modify_or_create?).and_return(true)
+      @provider.stub(:compare_value).and_return(true)
       @provider.stub(:modify_env).and_return(true)
       @provider.action_modify
       @new_resource.should be_updated
     end
 
     it "should not call modify_env if the key exists but the values are equal" do
-      @provider.should_receive(:requires_modify_or_create?).and_return(false)
+      @provider.should_receive(:compare_value).and_return(false)
       @provider.should_not_receive(:modify_env)
       @provider.action_modify
     end
@@ -198,31 +198,9 @@ describe Chef::Provider::Env do
       @provider.delete_element.should eql(true)
       @new_resource.should be_updated
     end
-
-    context "when new_resource's value contains the delimiter"  do
-      it "should return false if all the elements are deleted" do
-        # This indicates that the entire key needs to be deleted
-        @new_resource.value("C:/foo/bin;C:/bar/bin")
-        @provider.delete_element.should eql(false)
-        @new_resource.should_not be_updated  # This will be updated in action_delete
-      end
-
-      it "should return true if any, but not all, of the elements are deleted" do
-        @new_resource.value("C:/foo/bin;C:/notbaz/bin")
-        @provider.should_receive(:create_env)
-        @provider.delete_element.should eql(true)
-        @new_resource.should be_updated
-      end
-
-      it "should return true if none of the elements are deleted" do
-        @new_resource.value("C:/notfoo/bin;C:/notbaz/bin")
-        @provider.delete_element.should eql(true)
-        @new_resource.should_not be_updated
-      end
-    end
   end
 
-  describe "requires_modify_or_create?" do
+  describe "compare_value" do
     before(:each) do
       @new_resource.value("C:/bar")
       @current_resource = @new_resource.clone
@@ -230,68 +208,25 @@ describe Chef::Provider::Env do
     end
 
     it "should return false if the values are equal" do
-      @provider.requires_modify_or_create?.should be_false
+      @provider.compare_value.should be_false
     end
 
     it "should return true if the values not are equal" do
       @new_resource.value("C:/elsewhere")
-      @provider.requires_modify_or_create?.should be_true
+      @provider.compare_value.should be_true
     end
 
     it "should return false if the current value contains the element" do
       @new_resource.delim(";")
       @current_resource.value("C:/bar;C:/foo;C:/baz")
 
-      @provider.requires_modify_or_create?.should be_false
+      @provider.compare_value.should be_false
     end
 
     it "should return true if the current value does not contain the element" do
       @new_resource.delim(";")
       @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-      @provider.requires_modify_or_create?.should be_true
-    end
-
-    context "when new_resource's value contains the delimiter"  do
-      it "should return false if all the current values are contained" do
-        @new_resource.value("C:/biz;C:/baz")
-        @new_resource.delim(";")
-        @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-        @provider.requires_modify_or_create?.should be_false
-      end
-
-      it "should return true if any of the new values are not contained" do
-        @new_resource.value("C:/biz;C:/baz;C:/bin")
-        @new_resource.delim(";")
-        @current_resource.value("C:/biz;C:/foo/bin;C:/baz")
-        @provider.requires_modify_or_create?.should be_true
-      end
-    end
-  end
-
-  describe "modify_env" do
-    before(:each) do
-      @provider.stub(:create_env).and_return(true)
-      @new_resource.delim ";"
-
-      @current_resource = Chef::Resource::Env.new("FOO")
-      @current_resource.value "C:/foo/bin"
-      @provider.current_resource = @current_resource
-    end
-
-    it "should not modify the variable passed to the resource" do
-      new_value = "C:/bar/bin"
-      passed_value = new_value.dup
-      @new_resource.value(passed_value)
-      @provider.modify_env
-      passed_value.should == new_value
-    end
-
-    it "should only add values not already contained when a delimiter is provided" do
-      @new_resource.value("C:/foo;C:/bar;C:/baz")
-      @new_resource.delim(";")
-      @current_resource.value("C:/foo/bar;C:/bar;C:/baz")
-      @provider.modify_env
-      @new_resource.value.should eq("C:/foo;C:/foo/bar;C:/bar;C:/baz")
+      @provider.compare_value.should be_true
     end
   end
 end

data/spec/unit/provider/group/dscl_spec.rb

@@ -240,7 +240,6 @@ describe Chef::Provider::Group::Dscl do
       @provider.load_current_resource
       @provider.define_resource_requirements
     end
-
     it "raises an error if the required binary /usr/bin/dscl doesn't exist" do
       File.should_receive(:exists?).with("/usr/bin/dscl").and_return(false)
 
@@ -252,7 +251,7 @@ describe Chef::Provider::Group::Dscl do
       lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
- 
+
   describe "when creating the group" do
     it "creates the group, password field, gid, and sets group membership" do
       @provider.should_receive(:set_gid).and_return(true)
@@ -295,39 +294,3 @@ describe Chef::Provider::Group::Dscl do
     end
   end
 end
-
-describe 'Test DSCL loading' do
-  before do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Group.new("aj")
-    @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
-    @output = <<-EOF
-AppleMetaNodeLocation: /Local/Default
-Comment:
- Test Group
-GeneratedUID: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
-NestedGroups: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAB
-Password: *
-PrimaryGroupID: 999
-RealName:
- TestGroup
-RecordName: com.apple.aj
-RecordType: dsRecTypeStandard:Groups
-GroupMembership: waka bar
-EOF
-    @provider.stub(:safe_dscl).with("read /Groups/aj").and_return(@output)
-    @current_resource = @provider.load_current_resource
-
-  end
-
-  it 'should parse gid properly' do
-    File.stub(:exists?).and_return(true)
-    @current_resource.gid.should eq("999")
-  end
-  it 'should parse members properly' do
-    File.stub(:exists?).and_return(true)
-    @current_resource.members.should eq(['waka', 'bar'])
-  end
-end

data/spec/unit/provider/log_spec.rb

@@ -78,4 +78,22 @@ describe Chef::Provider::Log::ChefLog do
       @provider.action_write
   end
 
+  it "should not update the resource if the message was not written to the log" do
+      Chef::Log.level = :fatal
+      @new_resource = Chef::Resource::Log.new(@log_str)
+      @new_resource.level :info
+      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
+      @provider.action_write
+      @new_resource.updated.should be_false
+  end
+
+  it "should update the resource if the message has been written to the log" do
+      Chef::Log.level = :debug
+      @new_resource = Chef::Resource::Log.new(@log_str)
+      @new_resource.level :info
+      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
+      @provider.action_write
+      @new_resource.updated.should be_true
+  end
+
 end

data/spec/unit/provider/package/rpm_spec.rb

@@ -80,18 +80,6 @@ describe Chef::Provider::Package::Rpm do
       @provider.stub(:popen4).and_return(status)
       lambda { @provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
-
-    it "should not detect the package name as version when not installed" do
-      @status = double("Status", :exitstatus => -1)
-      @stdout = StringIO.new("package openssh-askpass is not installed")
-      @new_resource = Chef::Resource::Package.new("openssh-askpass")
-      @new_resource.source 'openssh-askpass'
-      @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-      @provider.should_receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @provider.should_receive(:popen4).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(@status)
-      @provider.load_current_resource
-      @provider.current_resource.version.should be_nil
-    end
   end
 
   describe "after the current resource is loaded" do

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -85,7 +85,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       cache["etag"] = etag
       cache["mtime"] = mtime
       cache["checksum"] = last_fetched_checksum
-      Chef::JSONCompat.to_json(cache)
+      cache.to_json
     end
 
     before do

data/spec/unit/provider/service/systemd_service_spec.rb

@@ -25,6 +25,11 @@ describe Chef::Provider::Service::Systemd do
     @run_context = Chef::RunContext.new(@node, {}, @events)
     @new_resource = Chef::Resource::Service.new('rsyslog.service')
     @provider = Chef::Provider::Service::Systemd.new(@new_resource, @run_context)
+
+    @shell_out_success = double('shell_out_with_systems_locale',
+                                :exitstatus => 0, :error? => false)
+    @shell_out_failure = double('shell_out_with_systems_locale',
+                                :exitstatus => 1, :error? => true)
   end
 
   describe "load_current_resource" do
@@ -69,25 +74,25 @@ describe Chef::Provider::Service::Systemd do
       end
 
       it "should run the services status command if one has been specified" do
-        @provider.stub(:run_command_with_systems_locale).with({:command => "/bin/chefhasmonkeypants status"}).and_return(0)
+        @provider.stub(:shell_out_with_systems_locale).and_return(@shell_out_success)
         @current_resource.should_receive(:running).with(true)
         @provider.load_current_resource
       end
 
       it "should run the services status command if one has been specified and properly set status check state" do
-        @provider.stub(:run_command_with_systems_locale).with({:command => "/bin/chefhasmonkeypants status"}).and_return(0)
+        @provider.stub(:shell_out_with_systems_locale).with("/bin/chefhasmonkeypants status").and_return(@shell_out_success)
         @provider.load_current_resource
         @provider.instance_variable_get("@status_check_success").should be_true
       end
 
-      it "should set running to false if it catches a Chef::Exceptions::Exec when using a status command" do
-        @provider.stub(:run_command_with_systems_locale).and_raise(Chef::Exceptions::Exec)
+      it "should set running to false if a status command fails" do
+        @provider.stub(:shell_out_with_systems_locale).and_return(@shell_out_failure)
         @current_resource.should_receive(:running).with(false)
         @provider.load_current_resource
       end
 
-      it "should update state to indicate status check failed when an exception is thrown using a status command" do
-        @provider.stub(:run_command_with_systems_locale).and_raise(Chef::Exceptions::Exec)
+      it "should update state to indicate status check failed when a status command fails" do
+        @provider.stub(:shell_out_with_systems_locale).and_return(@shell_out_failure)
         @provider.load_current_resource
         @provider.instance_variable_get("@status_check_success").should be_false
       end
@@ -129,13 +134,13 @@ describe Chef::Provider::Service::Systemd do
     end
 
     it "should call '/bin/systemctl start service_name' if no start command is specified" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl start #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl start #{@new_resource.service_name}").and_return(@shell_out_success)
       @provider.start_service
     end
 
     it "should not call '/bin/systemctl start service_name' if it is already running" do
       @current_resource.stub(:running).and_return(true)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl start #{@new_resource.service_name}"})
+      @provider.should_not_receive(:shell_out_with_systems_locale).with("/bin/systemctl start #{@new_resource.service_name}")
       @provider.start_service
     end
 
@@ -148,21 +153,33 @@ describe Chef::Provider::Service::Systemd do
 
     it "should call '/bin/systemctl restart service_name' if no restart command is specified" do
       @current_resource.stub(:running).and_return(true)
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl restart #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl restart #{@new_resource.service_name}").and_return(@shell_out_success)
       @provider.restart_service
     end
 
-    it "should call the reload command if one is specified" do
-      @current_resource.stub(:running).and_return(true)
-      @new_resource.stub(:reload_command).and_return("/sbin/rsyslog reloadyousillysally")
-      @provider.should_receive(:shell_out!).with("/sbin/rsyslog reloadyousillysally")
-      @provider.reload_service
-    end
+    describe "reload service" do
+      context "when a reload command is specified" do
+        it "should call the reload command" do
+          @current_resource.stub(:running).and_return(true)
+          @new_resource.stub(:reload_command).and_return("/sbin/rsyslog reloadyousillysally")
+          @provider.should_receive(:shell_out!).with("/sbin/rsyslog reloadyousillysally")
+          @provider.reload_service
+        end
+      end
 
-    it "should call '/bin/systemctl reload service_name' if no reload command is specified" do
-      @current_resource.stub(:running).and_return(true)
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl reload #{@new_resource.service_name}"}).and_return(0)
-      @provider.reload_service
+      context "when a reload command is not specified" do
+        it "should call '/bin/systemctl reload service_name' if the service is running" do
+          @current_resource.stub(:running).and_return(true)
+          @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl reload #{@new_resource.service_name}").and_return(@shell_out_success)
+          @provider.reload_service
+        end
+
+        it "should start the service if the service is not running" do
+          @current_resource.stub(:running).and_return(false)
+          @provider.should_receive(:start_service).and_return(true)
+          @provider.reload_service
+        end
+      end
     end
 
     it "should call the stop command if one is specified" do
@@ -174,13 +191,13 @@ describe Chef::Provider::Service::Systemd do
 
     it "should call '/bin/systemctl stop service_name' if no stop command is specified" do
       @current_resource.stub(:running).and_return(true)
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl stop #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl stop #{@new_resource.service_name}").and_return(@shell_out_success)
       @provider.stop_service
     end
 
     it "should not call '/bin/systemctl stop service_name' if it is already stopped" do
       @current_resource.stub(:running).and_return(false)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl stop #{@new_resource.service_name}"})
+      @provider.should_not_receive(:shell_out_with_systems_locale).with("/bin/systemctl stop #{@new_resource.service_name}")
       @provider.stop_service
     end
   end
@@ -193,12 +210,12 @@ describe Chef::Provider::Service::Systemd do
     end
 
     it "should call '/bin/systemctl enable service_name' to enable the service" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl enable #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl enable #{@new_resource.service_name}").and_return(@shell_out_success)
       @provider.enable_service
     end
 
     it "should call '/bin/systemctl disable service_name' to disable the service" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl disable #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with("/bin/systemctl disable #{@new_resource.service_name}").and_return(@shell_out_success)
       @provider.disable_service
     end
   end
@@ -210,12 +227,12 @@ describe Chef::Provider::Service::Systemd do
     end
 
     it "should return true if '/bin/systemctl is-active service_name' returns 0" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => '/bin/systemctl is-active rsyslog.service', :ignore_failure => true}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with('/bin/systemctl is-active rsyslog.service --quiet').and_return(@shell_out_success)
       @provider.is_active?.should be_true
     end
 
     it "should return false if '/bin/systemctl is-active service_name' returns anything except 0" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => '/bin/systemctl is-active rsyslog.service', :ignore_failure => true}).and_return(1)
+      @provider.should_receive(:shell_out_with_systems_locale).with('/bin/systemctl is-active rsyslog.service --quiet').and_return(@shell_out_failure)
       @provider.is_active?.should be_false
     end
   end
@@ -227,12 +244,12 @@ describe Chef::Provider::Service::Systemd do
     end
 
     it "should return true if '/bin/systemctl is-enabled service_name' returns 0" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => '/bin/systemctl is-enabled rsyslog.service', :ignore_failure => true}).and_return(0)
+      @provider.should_receive(:shell_out_with_systems_locale).with('/bin/systemctl is-enabled rsyslog.service --quiet').and_return(@shell_out_success)
       @provider.is_enabled?.should be_true
     end
 
     it "should return false if '/bin/systemctl is-enabled service_name' returns anything except 0" do
-      @provider.should_receive(:run_command_with_systems_locale).with({:command => '/bin/systemctl is-enabled rsyslog.service', :ignore_failure => true}).and_return(1)
+      @provider.should_receive(:shell_out_with_systems_locale).with('/bin/systemctl is-enabled rsyslog.service --quiet').and_return(@shell_out_failure)
       @provider.is_enabled?.should be_false
     end
   end