chef 12.0.0.alpha.1 → 12.0.0.alpha.2

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

@@ -301,7 +301,7 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
 
   def expect_commands(provider, commands)
     commands.each do |command|
-      provider.should_receive(:run_command).with({:command => command})
+      provider.should_receive(:shell_out!).with(command)
     end
   end
 

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

@@ -18,313 +18,531 @@
 
 require 'spec_helper'
 
+class Chef::Provider::Service::Freebsd
+  public :service_enable_variable_name
+  public :determine_enabled_status!
+  public :determine_current_status!
+end
+
 describe Chef::Provider::Service::Freebsd do
+  let(:node) do
+    node = Chef::Node.new
+    node.automatic_attrs[:command] = {:ps => "ps -ax"}
+    node
+  end
+
+  let(:new_resource) do
+    new_resource = Chef::Resource::Service.new("apache22")
+    new_resource.pattern("httpd")
+    new_resource.supports({:status => false})
+    new_resource
+  end
+
+  let(:current_resource) do
+    current_resource = Chef::Resource::Service.new("apache22")
+    current_resource
+  end
+
+  let(:provider) do
+    events = Chef::EventDispatch::Dispatcher.new
+    run_context = Chef::RunContext.new(node, {}, events)
+    provider = Chef::Provider::Service::Freebsd.new(new_resource,run_context)
+    provider.action = :start
+    provider
+  end
+
   before do
-    @node = Chef::Node.new
-    @node.automatic_attrs[:command] = {:ps => "ps -ax"}
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
+    allow(Chef::Resource::Service).to receive(:new).and_return(current_resource)
+  end
 
-    @new_resource = Chef::Resource::Service.new("apache22")
-    @new_resource.pattern("httpd")
-    @new_resource.supports({:status => false})
+  def stub_etc_rcd_script
+    allow(::File).to receive(:exist?).and_return(false)
+    expect(::File).to receive(:exist?).with("/etc/rc.d/#{new_resource.service_name}").and_return(true)
+  end
 
-    @current_resource = Chef::Resource::Service.new("apache22")
+  def stub_usr_local_rcd_script
+    allow(::File).to receive(:exist?).and_return(false)
+    expect(::File).to receive(:exist?).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_return(true)
+  end
 
-    @provider = Chef::Provider::Service::Freebsd.new(@new_resource,@run_context)
-    @provider.action = :start
-    @init_command = "/usr/local/etc/rc.d/apache22"
-    Chef::Resource::Service.stub(:new).and_return(@current_resource)
+  def run_load_current_resource
+    stub_usr_local_rcd_script
+    provider.load_current_resource
   end
 
-  describe "load_current_resource" do
-    before(:each) do
-      @stdout = StringIO.new(<<-PS_SAMPLE)
-413  ??  Ss     0:02.51 /usr/sbin/syslogd -s
-539  ??  Is     0:00.14 /usr/sbin/sshd
-545  ??  Ss     0:17.53 sendmail: accepting connections (sendmail)
-PS_SAMPLE
-      @status = double(:stdout => @stdout, :exitstatus => 0)
-      @provider.stub(:shell_out!).with(@node[:command][:ps]).and_return(@status)
-
-      ::File.stub(:exists?).and_return(false)
-      ::File.stub(:exists?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
-      @lines = double("lines")
-      @lines.stub(:each).and_yield("sshd_enable=\"YES\"").
-                          and_yield("#{@new_resource.name}_enable=\"YES\"")
-      ::File.stub(:open).and_return(@lines)
-
-      @rc_with_name = StringIO.new(<<-RC_SAMPLE)
-name="apache22"
-rcvar=`set_rcvar`
-RC_SAMPLE
-      ::File.stub(:open).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(@rc_with_name)
-      @provider.stub(:service_enable_variable_name).and_return nil
+  describe Chef::Provider::Service::Freebsd, "initialize" do
+    it "should default enabled_state_found to false" do
+      expect(provider.enabled_state_found).to be false
+    end
 
+    it "should find /usr/local/etc/rc.d init scripts" do
+      stub_usr_local_rcd_script
+      expect(provider.init_command).to eql "/usr/local/etc/rc.d/apache22"
     end
 
-    it "should create a current resource with the name of the new resource" do
-      Chef::Resource::Service.should_receive(:new).and_return(@current_resource)
-      @provider.load_current_resource
+    it "should find /etc/rc.d init scripts" do
+      stub_etc_rcd_script
+      expect(provider.init_command).to eql "/etc/rc.d/apache22"
     end
 
-    it "should set the current resources service name to the new resources service name" do
-      @provider.load_current_resource
-      @current_resource.service_name.should == @new_resource.service_name
+    it "should set init_command to nil if it can't find anything" do
+      allow(::File).to receive(:exist?).and_return(false)
+      expect(provider.init_command).to be nil
     end
+  end
 
-    it "should not raise an exception if the rcscript have a name variable" do
-      @provider.load_current_resource
-      lambda { @provider.service_enable_variable_name }.should_not raise_error
+  describe Chef::Provider::Service::Freebsd, "determine_current_status!" do
+    before do
+      stub_usr_local_rcd_script
+      provider.current_resource = current_resource
+      current_resource.service_name(new_resource.service_name)
     end
 
-    describe "when the service supports status" do
+    context "when a status command has been specified" do
+      let(:status) { double(:stdout => "", :exitstatus => 0) }
+
+      before do
+        new_resource.status_command("/bin/chefhasmonkeypants status")
+      end
+
+      it "should run the services status command if one has been specified" do
+        expect(provider).to receive(:shell_out).with("/bin/chefhasmonkeypants status").and_return(status)
+        provider.determine_current_status!
+      end
+    end
+
+    context "when the service supports status" do
+      let(:status) { double(:stdout => "", :exitstatus => 0) }
+
       before do
-        @new_resource.supports({:status => true})
+        new_resource.supports({:status => true})
       end
 
       it "should run '/etc/init.d/service_name status'" do
-        @provider.should_receive(:shell_out).with("/usr/local/etc/rc.d/#{@current_resource.service_name} status").and_return(@status)
-        @provider.load_current_resource
+        expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_return(status)
+        provider.determine_current_status!
       end
 
       it "should set running to true if the status command returns 0" do
-        @provider.should_receive(:shell_out).with("/usr/local/etc/rc.d/#{@current_resource.service_name} status").and_return(@status)
-        @current_resource.should_receive(:running).with(true)
-        @provider.load_current_resource
+        expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_return(status)
+        provider.determine_current_status!
+        expect(current_resource.running).to be true
       end
 
       it "should set running to false if the status command returns anything except 0" do
-        @provider.should_receive(:shell_out).with("/usr/local/etc/rc.d/#{@current_resource.service_name} status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
-        @current_resource.should_receive(:running).with(false)
-        @provider.load_current_resource
-       # @provider.current_resource.running.should be_false
+        expect(provider).to receive(:shell_out).with("/usr/local/etc/rc.d/#{new_resource.service_name} status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
+        provider.determine_current_status!
+        expect(current_resource.running).to be false
       end
     end
 
-    describe "when a status command has been specified" do
+    context "when we have a 'ps' attribute" do
+      let(:stdout) do
+        StringIO.new(<<-PS_SAMPLE)
+413  ??  Ss     0:02.51 /usr/sbin/syslogd -s
+539  ??  Is     0:00.14 /usr/sbin/sshd
+545  ??  Ss     0:17.53 sendmail: accepting connections (sendmail)
+PS_SAMPLE
+      end
+      let(:status) { double(:stdout => stdout, :exitstatus => 0) }
+
       before do
-        @new_resource.status_command("/bin/chefhasmonkeypants status")
+        node.automatic_attrs[:command] = {:ps => "ps -ax"}
       end
 
-      it "should run the services status command if one has been specified" do
-        @provider.should_receive(:shell_out).with("/bin/chefhasmonkeypants status").and_return(@status)
-        @provider.load_current_resource
+      it "should shell_out! the node's ps command" do
+        expect(provider).to receive(:shell_out!).with(node[:command][:ps]).and_return(status)
+        provider.determine_current_status!
+      end
+
+      it "should read stdout of the ps command" do
+        allow(provider).to receive(:shell_out!).and_return(status)
+        expect(stdout).to receive(:each_line).and_return(true)
+        provider.determine_current_status!
       end
 
+      context "when the regex matches the output" do
+        let(:stdout) do
+          StringIO.new(<<-PS_SAMPLE)
+555  ??  Ss     0:05.16 /usr/sbin/cron -s
+ 9881  ??  Ss     0:06.67 /usr/local/sbin/httpd -DNOHTTPACCEPT
+          PS_SAMPLE
+        end
+
+        it "should set running to true" do
+          allow(provider).to receive(:shell_out!).and_return(status)
+          provider.determine_current_status!
+          expect(current_resource.running).to be_true
+        end
+      end
+
+      it "should set running to false if the regex doesn't match" do
+        allow(provider).to receive(:shell_out!).and_return(status)
+        provider.determine_current_status!
+        expect(current_resource.running).to be_false
+      end
+
+      it "should set running to nil if ps fails" do
+        allow(provider).to receive(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
+        provider.determine_current_status!
+        expect(current_resource.running).to be_nil
+        expect(provider.status_load_success).to be_nil
+      end
+
+      context "when ps command is nil" do
+        before do
+          node.automatic_attrs[:command] = {:ps => nil}
+        end
+
+        it "should set running to nil" do
+          pending "superclass raises no conversion of nil to string which seems broken"
+          provider.determine_current_status!
+          expect(current_resource.running).to be_nil
+        end
+      end
+
+      context "when ps is empty string" do
+        before do
+          node.automatic_attrs[:command] = {:ps => ""}
+        end
+
+        it "should set running to nil" do
+          provider.determine_current_status!
+          expect(current_resource.running).to be_nil
+        end
+      end
     end
+  end
 
-    it "should raise error if the node has a nil ps attribute and no other means to get status" do
-      @node.automatic_attrs[:command] = {:ps => nil}
-      @provider.define_resource_requirements
-      lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
+  describe Chef::Provider::Service::Freebsd, "determine_enabled_status!" do
+    before do
+      stub_usr_local_rcd_script
+      provider.current_resource = current_resource
+      current_resource.service_name(new_resource.service_name)
+
+      allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable")
     end
 
-    it "should raise error if the node has an empty ps attribute and no other means to get status" do
-      @node.automatic_attrs[:command] = {:ps => ""}
-      @provider.define_resource_requirements
-      lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
+    context "when /etc/rc.conf does not exist" do
+      before do
+        expect(::File).to receive(:exist?).with("/etc/rc.conf").and_return(false)
+      end
+
+      it "sets enabled to false" do
+        provider.determine_enabled_status!
+        expect(current_resource.enabled).to be false
+      end
     end
 
-    describe "when executing assertions" do
-      it "should verify that /etc/rc.conf exists" do
-        ::File.should_receive(:exists?).with("/etc/rc.conf")
-        @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
-        @provider.load_current_resource
+    context "when /etc/rc.conf does exist" do
+      before do
+        expect(::File).to receive(:exist?).with("/etc/rc.conf").and_return(true)
+        expect(provider).to receive(:read_rc_conf).and_return(lines)
       end
 
-      context "and the init script is not found" do
-        [ "start", "reload", "restart", "enable" ].each do |action|
-          it "should raise an exception when the action is #{action}" do
-            ::File.stub(:exists?).and_return(false)
-            @provider.load_current_resource
-            @provider.define_resource_requirements
-            @provider.instance_variable_get("@rcd_script_found").should be_false
-            @provider.action = action
-            lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
+      %w{YES Yes yes yEs YeS}.each do |setting|
+        context "when the enable variable is set to #{setting}" do
+          let(:lines) { [ %Q{#{new_resource.service_name}_enable="#{setting}"} ] }
+          it "sets enabled to true" do
+            provider.determine_enabled_status!
+            expect(current_resource.enabled).to be true
           end
         end
+      end
 
-        [ "stop", "disable" ].each do |action|
-          it "should not raise an error when the action is #{action}" do
-            @provider.action = action
-            lambda { @provider.process_resource_requirements }.should_not raise_error
+      %w{No NO no nO None NONE none nOnE}.each do |setting|
+        context "when the enable variable is set to #{setting}" do
+          let(:lines) { [ %Q{#{new_resource.service_name}_enable="#{setting}"} ] }
+          it "sets enabled to false" do
+            provider.determine_enabled_status!
+            expect(current_resource.enabled).to be false
           end
         end
       end
 
-      it "update state when current resource enabled state could not be determined" do
-        ::File.should_receive(:exists?).with("/etc/rc.conf").and_return false
-        @provider.load_current_resource
-        @provider.instance_variable_get("@enabled_state_found").should be_false
+      context "when the enable variable is garbage" do
+        let(:lines) { [ %Q{#{new_resource.service_name}_enable="alskdjflasdkjflakdfj"} ] }
+        it "sets enabled to false" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
       end
 
-      it "update state when current resource enabled state could be determined" do
-        ::File.stub(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
-        ::File.should_receive(:exists?).with("/etc/rc.conf").and_return  true
-        @provider.load_current_resource
-        @provider.instance_variable_get("@enabled_state_found").should be_false
-        @provider.instance_variable_get("@rcd_script_found").should be_true
-        @provider.define_resource_requirements
-        lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service,
-          "Could not find the service name in /usr/local/etc/rc.d/#{@current_resource.service_name} and rcvar")
+      context "when the enable variable partial matches (left) some other service and we are disabled" do
+        let(:lines) { [
+          %Q{thing_#{new_resource.service_name}_enable="YES"},
+          %Q{#{new_resource.service_name}_enable="NO"},
+        ] }
+        it "sets enabled based on the exact match (false)" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
       end
 
-      it "should throw an exception if service line is missing from rc.d script" do
-          pending "not implemented" do
-            false.should be_true
-          end
+      context "when the enable variable partial matches (right) some other service and we are disabled" do
+        let(:lines) { [
+          %Q{#{new_resource.service_name}_thing_enable="YES"},
+          %Q{#{new_resource.service_name}_enable="NO"},
+        ] }
+        it "sets enabled based on the exact match (false)" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
+      end
+
+      context "when the enable variable partial matches (left) some other disabled service and we are enabled" do
+        let(:lines) { [
+          %Q{thing_#{new_resource.service_name}_enable="NO"},
+          %Q{#{new_resource.service_name}_enable="YES"},
+        ] }
+        it "sets enabled based on the exact match (true)" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be true
+        end
       end
 
+      context "when the enable variable partial matches (right) some other disabled service and we are enabled" do
+        let(:lines) { [
+          %Q{#{new_resource.service_name}_thing_enable="NO"},
+          %Q{#{new_resource.service_name}_enable="YES"},
+        ] }
+        it "sets enabled based on the exact match (true)" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be true
+        end
+      end
+
+      context "when the enable variable only partial matches (left) some other enabled service" do
+        let(:lines) { [ %Q{thing_#{new_resource.service_name}_enable="YES"} ] }
+        it "sets enabled to false" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
+      end
+
+      context "when the enable variable only partial matches (right) some other enabled service" do
+        let(:lines) { [ %Q{#{new_resource.service_name}_thing_enable="YES"} ] }
+        it "sets enabled to false" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
+      end
+
+      context "when nothing matches" do
+        let(:lines) { [] }
+        it "sets enabled to true" do
+          provider.determine_enabled_status!
+          expect(current_resource.enabled).to be false
+        end
+      end
     end
+  end
 
-    describe "when we have a 'ps' attribute" do
-      before do
-        @node.automatic_attrs[:command] = {:ps => "ps -ax"}
+  describe Chef::Provider::Service::Freebsd, "service_enable_variable_name" do
+    before do
+      stub_usr_local_rcd_script
+      provider.current_resource = current_resource
+      current_resource.service_name(new_resource.service_name)
+
+      expect(::File).to receive(:open).with("/usr/local/etc/rc.d/#{new_resource.service_name}").and_yield(rcscript)
+    end
+
+    context "when the rc script has a 'name' variable" do
+      let(:rcscript) do
+        StringIO.new(<<-EOF)
+name="#{new_resource.service_name}"
+rcvar=`set_rcvar`
+EOF
       end
 
-      it "should shell_out! the node's ps command" do
-        @provider.should_receive(:shell_out!).with(@node[:command][:ps]).and_return(@status)
-        @provider.load_current_resource
+      it "should not raise an exception if the rcscript have a name variable" do
+        expect { provider.service_enable_variable_name }.not_to raise_error
       end
 
-      it "should read stdout of the ps command" do
-        @provider.stub(:shell_out!).and_return(@status)
-        @stdout.should_receive(:each_line).and_return(true)
-        @provider.load_current_resource
+      it "should not run rcvar" do
+        expect(provider).not_to receive(:shell_out!)
+        provider.service_enable_variable_name
       end
 
-      it "should set running to true if the regex matches the output" do
-        @stdout.stub(:each_line).and_yield("555  ??  Ss     0:05.16 /usr/sbin/cron -s").
-                                  and_yield(" 9881  ??  Ss     0:06.67 /usr/local/sbin/httpd -DNOHTTPACCEPT")
-        @provider.load_current_resource
-        @current_resource.running.should be_true
+      it "should return the enable variable determined from the rcscript name" do
+        expect(provider.service_enable_variable_name).to eql "#{new_resource.service_name}_enable"
       end
+    end
 
-      it "should set running to false if the regex doesn't match" do
-        @provider.stub(:shell_out!).and_return(@status)
-        @provider.load_current_resource
-        @current_resource.running.should be_false
+    describe "when the rcscript does not have a name variable" do
+      let(:rcscript) do
+        StringIO.new <<-EOF
+rcvar=`set_rcvar`
+EOF
+      end
+
+      before do
+        status = double(:stdout => rcvar_stdout, :exitstatus => 0)
+        allow(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} rcvar").and_return(status)
+      end
+
+      describe "when rcvar returns foobar_enable" do
+        let(:rcvar_stdout) do
+          rcvar_stdout = <<-EOF
+# apache22
+#
+# #{new_resource.service_name}_enable="YES"
+#   (default: "")
+EOF
+        end
+
+        it "should get the service name from rcvar if the rcscript does not have a name variable" do
+          expect(provider.service_enable_variable_name).to eq("#{new_resource.service_name}_enable")
+        end
+
+        it "should not raise an exception if the rcscript does not have a name variable" do
+          expect { provider.service_enable_variable_name }.not_to raise_error
+        end
       end
 
-      it "should raise an exception if ps fails" do
-        @provider.stub(:shell_out!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
-        @provider.load_current_resource
-        @provider.define_resource_requirements
-        lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
+      describe "when rcvar does not return foobar_enable" do
+        let(:rcvar_stdout) do
+          rcvar_stdout = <<-EOF
+# service_with_noname
+#
+EOF
+        end
+
+        it "should return nil" do
+          expect(provider.service_enable_variable_name).to be nil
+        end
       end
     end
+  end
+
+  describe Chef::Provider::Service::Freebsd, "load_current_resource" do
+    before(:each) do
+      stub_usr_local_rcd_script
+      expect(provider).to receive(:determine_current_status!)
+      current_resource.running(false)
+      allow(provider).to receive(:service_enable_variable_name).and_return "#{new_resource.service_name}_enable"
+    end
+
+    it "should create a current resource with the name of the new resource" do
+      expect(Chef::Resource::Service).to receive(:new).and_return(current_resource)
+      provider.load_current_resource
+    end
+
+    it "should set the current resources service name to the new resources service name" do
+      provider.load_current_resource
+      expect(current_resource.service_name).to eq(new_resource.service_name)
+    end
 
     it "should return the current resource" do
-      @provider.load_current_resource.should eql(@current_resource)
+      expect(provider.load_current_resource).to eql(current_resource)
     end
 
-    describe "when starting the service" do
+  end
+
+  context "when testing actions" do
+    before(:each) do
+      stub_usr_local_rcd_script
+      expect(provider).to receive(:determine_current_status!)
+      current_resource.running(false)
+      expect(provider).to receive(:determine_enabled_status!)
+      current_resource.enabled(false)
+      provider.load_current_resource
+    end
+
+    describe Chef::Provider::Service::Freebsd, "start_service" do
       it "should call the start command if one is specified" do
-        @new_resource.start_command("/etc/rc.d/chef startyousillysally")
-        @provider.should_receive(:shell_out!).with("/etc/rc.d/chef startyousillysally")
-        @provider.load_current_resource
-        @provider.start_service()
+        new_resource.start_command("/etc/rc.d/chef startyousillysally")
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/etc/rc.d/chef startyousillysally")
+        provider.start_service()
       end
 
       it "should call '/usr/local/etc/rc.d/service_name faststart' if no start command is specified" do
-        @provider.should_receive(:shell_out!).with("/usr/local/etc/rc.d/#{@new_resource.service_name} faststart")
-        @provider.load_current_resource
-        @provider.start_service()
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststart")
+        provider.start_service()
       end
     end
 
-    describe Chef::Provider::Service::Init, "stop_service" do
+    describe Chef::Provider::Service::Freebsd, "stop_service" do
       it "should call the stop command if one is specified" do
-        @new_resource.stop_command("/etc/init.d/chef itoldyoutostop")
-        @provider.should_receive(:shell_out!).with("/etc/init.d/chef itoldyoutostop")
-        @provider.load_current_resource
-        @provider.stop_service()
+        new_resource.stop_command("/etc/init.d/chef itoldyoutostop")
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/etc/init.d/chef itoldyoutostop")
+        provider.stop_service()
       end
 
       it "should call '/usr/local/etc/rc.d/service_name faststop' if no stop command is specified" do
-        @provider.should_receive(:shell_out!).with("/usr/local/etc/rc.d/#{@new_resource.service_name} faststop")
-        @provider.load_current_resource
-        @provider.stop_service()
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststop")
+        provider.stop_service()
       end
     end
 
-    describe "when restarting a service" do
+    describe Chef::Provider::Service::Freebsd, "restart_service" do
       it "should call 'restart' on the service_name if the resource supports it" do
-        @new_resource.supports({:restart => true})
-        @provider.should_receive(:shell_out!).with("/usr/local/etc/rc.d/#{@new_resource.service_name} fastrestart")
-        @provider.load_current_resource
-        @provider.restart_service()
+        new_resource.supports({:restart => true})
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/usr/local/etc/rc.d/#{new_resource.service_name} fastrestart")
+        provider.restart_service()
       end
 
       it "should call the restart_command if one has been specified" do
-        @new_resource.restart_command("/etc/init.d/chef restartinafire")
-        @provider.should_receive(:shell_out!).with("/etc/init.d/chef restartinafire")
-        @provider.load_current_resource
-        @provider.restart_service()
+        new_resource.restart_command("/etc/init.d/chef restartinafire")
+        expect(provider).to receive(:shell_out_with_systems_locale!).with("/etc/init.d/chef restartinafire")
+        provider.restart_service()
+      end
+
+      it "otherwise it should call stop and start" do
+        expect(provider).to receive(:stop_service)
+        expect(provider).to receive(:start_service)
+        provider.restart_service()
       end
     end
+  end
 
-    describe "when the rcscript does not have a name variable" do
+  describe Chef::Provider::Service::Freebsd, "define_resource_requirements" do
+    before do
+      provider.current_resource = current_resource
+    end
+
+    context "when the init script is not found" do
       before do
-        @rc_without_name = StringIO.new(<<-RC_SAMPLE)
-rcvar=`set_rcvar`
-RC_SAMPLE
-        ::File.stub(:open).with("/usr/local/etc/rc.d/#{@current_resource.service_name}").and_return(@rc_with_noname)
-        @provider.current_resource = @current_resource
+        provider.init_command = nil
+        allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable")
       end
 
-      describe "when rcvar returns foobar_enable" do
-        before do
-          @rcvar_stdout = <<RCVAR_SAMPLE
-# apache22
-#
-# #{@current_resource.service_name}_enable="YES"
-#   (default: "")
-RCVAR_SAMPLE
-          @status = double(:stdout => @rcvar_stdout, :exitstatus => 0)
-          @provider.stub(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
-        end
-
-        it "should get the service name from rcvar if the rcscript does not have a name variable" do
-          @provider.load_current_resource
-          @provider.unstub(:service_enable_variable_name)
-          @provider.service_enable_variable_name.should == "#{@current_resource.service_name}_enable"
+      [ "start", "reload", "restart", "enable" ].each do |action|
+        it "should raise an exception when the action is #{action}" do
+          provider.define_resource_requirements
+          provider.action = action
+          expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
         end
+      end
 
-        it "should not raise an exception if the rcscript does not have a name variable" do
-          @provider.load_current_resource
-          lambda { @provider.service_enable_variable_name }.should_not raise_error
+      [ "stop", "disable" ].each do |action|
+        it "should not raise an error when the action is #{action}" do
+          provider.define_resource_requirements
+          provider.action = action
+          expect { provider.process_resource_requirements }.not_to raise_error
         end
       end
+    end
 
-      describe "when rcvar does not return foobar_enable" do
-        before do
-          @rcvar_stdout = <<RCVAR_SAMPLE
-# service_with_noname
-#
-RCVAR_SAMPLE
-          @status = double(:stdout => @rcvar_stdout, :exitstatus => 0)
-          @provider.stub(:shell_out!).with("/usr/local/etc/rc.d/#{@current_resource.service_name} rcvar").and_return(@status)
-        end
+    context "when the init script is found, but the service_enable_variable_name is nil" do
+      before do
+        provider.init_command = nil
+        allow(provider).to receive(:service_enable_variable_name).and_return(nil)
+      end
 
-        [ "start", "reload", "restart", "enable" ].each do |action|
-          it "should raise an exception when the action is #{action}" do
-            @provider.action = action
-            @provider.load_current_resource
-            @provider.define_resource_requirements
-            lambda { @provider.process_resource_requirements }.should raise_error(Chef::Exceptions::Service)
-          end
+      [ "start", "reload", "restart", "enable" ].each do |action|
+        it "should raise an exception when the action is #{action}" do
+          provider.action = action
+          provider.define_resource_requirements
+          expect { provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
         end
+      end
 
-        [ "stop", "disable" ].each do |action|
-          it "should not raise an error when the action is #{action}" do
-            ::File.stub(:exist?).with("/usr/local/etc/rc.d/#{@new_resource.service_name}").and_return(true)
-            @provider.action = action
-            @provider.load_current_resource
-            @provider.define_resource_requirements
-            lambda { @provider.process_resource_requirements }.should_not raise_error
-          end
+      [ "stop", "disable" ].each do |action|
+        it "should not raise an error when the action is #{action}" do
+          provider.action = action
+          provider.define_resource_requirements
+          expect { provider.process_resource_requirements }.not_to raise_error
         end
       end
     end
@@ -332,48 +550,62 @@ RCVAR_SAMPLE
 
   describe Chef::Provider::Service::Freebsd, "enable_service" do
     before do
-      @provider.current_resource = @current_resource
-      @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
+      provider.current_resource = current_resource
+      allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable")
     end
 
     it "should enable the service if it is not enabled" do
-      @current_resource.stub(:enabled).and_return(false)
-      @provider.should_receive(:read_rc_conf).and_return([ "foo", "#{@current_resource.service_name}_enable=\"NO\"", "bar" ])
-      @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"YES\""])
-      @provider.enable_service()
+      allow(current_resource).to receive(:enabled).and_return(false)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"NO\"", "bar" ])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
+      provider.enable_service()
+    end
+
+    it "should not partial match an already enabled service" do
+      allow(current_resource).to receive(:enabled).and_return(false)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "thing_#{new_resource.service_name}_enable=\"NO\"", "bar" ])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "thing_#{new_resource.service_name}_enable=\"NO\"", "bar", "#{new_resource.service_name}_enable=\"YES\""])
+      provider.enable_service()
     end
 
     it "should enable the service if it is not enabled and not already specified in the rc.conf file" do
-      @current_resource.stub(:enabled).and_return(false)
-      @provider.should_receive(:read_rc_conf).and_return([ "foo", "bar" ])
-      @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"YES\""])
-      @provider.enable_service()
+      allow(current_resource).to receive(:enabled).and_return(false)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar" ])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
+      provider.enable_service()
     end
 
     it "should not enable the service if it is already enabled" do
-      @current_resource.stub(:enabled).and_return(true)
-      @provider.should_not_receive(:write_rc_conf)
-      @provider.enable_service
+      allow(current_resource).to receive(:enabled).and_return(true)
+      expect(provider).not_to receive(:write_rc_conf)
+      provider.enable_service
     end
   end
 
   describe Chef::Provider::Service::Freebsd, "disable_service" do
     before do
-      @provider.current_resource = @current_resource
-      @provider.stub(:service_enable_variable_name).and_return("#{@current_resource.service_name}_enable")
+      provider.current_resource = current_resource
+      allow(provider).to receive(:service_enable_variable_name).and_return("#{new_resource.service_name}_enable")
+    end
+
+    it "should disable the service if it is not disabled" do
+      allow(current_resource).to receive(:enabled).and_return(true)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"YES\"", "bar" ])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"NO\""])
+      provider.disable_service()
     end
 
-    it "should should disable the service if it is not disabled" do
-      @current_resource.stub(:enabled).and_return(true)
-      @provider.should_receive(:read_rc_conf).and_return([ "foo", "#{@current_resource.service_name}_enable=\"YES\"", "bar" ])
-      @provider.should_receive(:write_rc_conf).with(["foo", "bar", "#{@current_resource.service_name}_enable=\"NO\""])
-      @provider.disable_service()
+    it "should not disable an enabled service that partially matches" do
+      allow(current_resource).to receive(:enabled).and_return(true)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "thing_#{new_resource.service_name}_enable=\"YES\"", "bar" ])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "thing_#{new_resource.service_name}_enable=\"YES\"", "bar", "#{new_resource.service_name}_enable=\"NO\""])
+      provider.disable_service()
     end
 
     it "should not disable the service if it is already disabled" do
-      @current_resource.stub(:enabled).and_return(false)
-      @provider.should_not_receive(:write_rc_conf)
-      @provider.disable_service()
+      allow(current_resource).to receive(:enabled).and_return(false)
+      expect(provider).not_to receive(:write_rc_conf)
+      provider.disable_service()
     end
   end
 end