chef 14.2.0 → 14.3.37

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

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,8 +45,8 @@ describe Chef::Provider::RemoteFile::CacheControlData do
   context "when loading data for an unknown URI" do
 
     before do
-      expect(Chef::FileCache).to receive(:has_key?).with(cache_path).and_return(false)
-      expect(Chef::FileCache).to receive(:has_key?).with(old_cache_path).and_return(false)
+      expect(Chef::FileCache).to receive(:key?).with(cache_path).and_return(false)
+      expect(Chef::FileCache).to receive(:key?).with(old_cache_path).and_return(false)
     end
 
     context "and there is no current copy of the file" do
@@ -93,7 +93,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
 
     context "when the cache control data uses sha256 for its name" do
       before do
-        expect(Chef::FileCache).to receive(:has_key?).with(cache_path).and_return(true)
+        expect(Chef::FileCache).to receive(:key?).with(cache_path).and_return(true)
         expect(Chef::FileCache).to receive(:load).with(cache_path).and_return(cache_json_data)
       end
 
@@ -118,7 +118,7 @@ describe Chef::Provider::RemoteFile::CacheControlData do
       context "and the cached checksum matches the on-disk copy" do
         context "when the filename uses sha256" do
           before do
-            expect(Chef::FileCache).not_to receive(:has_key?).with(old_cache_path)
+            expect(Chef::FileCache).not_to receive(:key?).with(old_cache_path)
           end
           it "populates the cache control data" do
             expect(cache_control_data.etag).to eq(etag)
@@ -148,8 +148,8 @@ describe Chef::Provider::RemoteFile::CacheControlData do
 
     context "when the filename uses md5" do
       before do
-        expect(Chef::FileCache).to receive(:has_key?).with(cache_path).and_return(false)
-        expect(Chef::FileCache).to receive(:has_key?).with(old_cache_path).and_return(true)
+        expect(Chef::FileCache).to receive(:key?).with(cache_path).and_return(false)
+        expect(Chef::FileCache).to receive(:key?).with(old_cache_path).and_return(true)
         expect(Chef::FileCache).to receive(:load).with(old_cache_path).and_return(cache_json_data)
       end
 

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

@@ -84,7 +84,7 @@ describe Chef::Provider::RemoteFile::Content do
 
     describe "when the fetcher returns nil for the tempfile" do
       before do
-        http_fetcher = double("Chef::Provider::RemoteFile::HTTP", :fetch => nil)
+        http_fetcher = double("Chef::Provider::RemoteFile::HTTP", fetch: nil)
         expect(Chef::Provider::RemoteFile::Fetcher).to receive(:for_resource).with(@uri, new_resource, current_resource).and_return(http_fetcher)
       end
 
@@ -97,7 +97,7 @@ describe Chef::Provider::RemoteFile::Content do
 
       let(:mtime) { Time.now }
       let(:tempfile) { double("Tempfile") }
-      let(:http_fetcher) { double("Chef::Provider::RemoteFile::HTTP", :fetch => tempfile) }
+      let(:http_fetcher) { double("Chef::Provider::RemoteFile::HTTP", fetch: tempfile) }
 
       before do
         expect(Chef::Provider::RemoteFile::Fetcher).to receive(:for_resource).with(@uri, new_resource, current_resource).and_return(http_fetcher)
@@ -199,7 +199,7 @@ describe Chef::Provider::RemoteFile::Content do
           before do
             @tempfile = double("Tempfile")
             mtime = Time.now
-            http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
+            http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", fetch: @tempfile)
             expect(Chef::Provider::RemoteFile::Fetcher).to receive(:for_resource).with(@uri1, new_resource, current_resource).and_return(http_fetcher_works)
           end
 
@@ -236,7 +236,7 @@ describe Chef::Provider::RemoteFile::Content do
       expect(URI).not_to receive(:parse).with(new_resource.source[1])
       @tempfile = double("Tempfile")
       mtime = Time.now
-      http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", :fetch => @tempfile)
+      http_fetcher_works = double("Chef::Provider::RemoteFile::HTTP", fetch: @tempfile)
       expect(Chef::Provider::RemoteFile::Fetcher).to receive(:for_resource).with(@uri0, new_resource, current_resource).and_return(http_fetcher_works)
     end
 

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

@@ -46,7 +46,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed an http url" do
-    let(:uri) { double("uri", :scheme => "http" ) }
+    let(:uri) { double("uri", scheme: "http" ) }
     before do
       expect(Chef::Provider::RemoteFile::HTTP).to receive(:new).and_return(fetcher_instance)
     end
@@ -56,7 +56,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed an https url" do
-    let(:uri) { double("uri", :scheme => "https" ) }
+    let(:uri) { double("uri", scheme: "https" ) }
     before do
       expect(Chef::Provider::RemoteFile::HTTP).to receive(:new).and_return(fetcher_instance)
     end
@@ -66,7 +66,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed an ftp url" do
-    let(:uri) { double("uri", :scheme => "ftp" ) }
+    let(:uri) { double("uri", scheme: "ftp" ) }
     before do
       expect(Chef::Provider::RemoteFile::FTP).to receive(:new).and_return(fetcher_instance)
     end
@@ -76,7 +76,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed a file url" do
-    let(:uri) { double("uri", :scheme => "file" ) }
+    let(:uri) { double("uri", scheme: "file" ) }
     before do
       expect(Chef::Provider::RemoteFile::LocalFile).to receive(:new).and_return(fetcher_instance)
     end
@@ -86,7 +86,7 @@ describe Chef::Provider::RemoteFile::Fetcher do
   end
 
   describe "when passed a url we do not recognize" do
-    let(:uri) { double("uri", :scheme => "xyzzy" ) }
+    let(:uri) { double("uri", scheme: "xyzzy" ) }
     it "throws an ArgumentError exception" do
       expect { described_class.for_resource(uri, new_resource, current_resource) }.to raise_error(ArgumentError)
     end

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

@@ -108,7 +108,7 @@ describe Chef::Provider::RemoteFile::FTP do
 
     before do
       current_resource.checksum(current_resource_checksum)
-      #Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
+      # Chef::Provider::RemoteFile::CacheControlData.should_receive(:load_and_validate).with(uri, current_resource_checksum).and_return(cache_control_data)
     end
 
     it "should connect to the host from the uri on the default port 21" do

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

@@ -292,7 +292,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       context "and the target file is a tarball [CHEF-3140]" do
 
         let(:uri) { URI.parse("http://opscode.com/tarball.tgz") }
-        let(:expected_http_opts) { { :disable_gzip => true } }
+        let(:expected_http_opts) { { disable_gzip: true } }
 
         # CHEF-3140
         # Some servers return tarballs as content type tar and encoding gzip, which

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

@@ -84,8 +84,8 @@ describe Chef::Provider::RemoteFile::LocalFile do
 
   describe "when fetching the object" do
 
-    let(:tempfile) { double("Tempfile", :path => "/tmp/foo/bar/nyan.png", :close => nil) }
-    let(:chef_tempfile) { double("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
+    let(:tempfile) { double("Tempfile", path: "/tmp/foo/bar/nyan.png", close: nil) }
+    let(:chef_tempfile) { double("Chef::FileContentManagement::Tempfile", tempfile: tempfile) }
 
     before do
       current_resource.source("file:///nyan_cat.png")

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

@@ -28,9 +28,9 @@ describe Chef::Provider::RemoteFile::NetworkFile do
 
   describe "when fetching the object" do
 
-    let(:tempfile) { double("Tempfile", :path => "/tmp/foo/bar/Foo.tar.gz", :close => nil) }
-    let(:chef_tempfile) { double("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
-    let(:source_file) { double("::File", :read => nil) }
+    let(:tempfile) { double("Tempfile", path: "/tmp/foo/bar/Foo.tar.gz", close: nil) }
+    let(:chef_tempfile) { double("Chef::FileContentManagement::Tempfile", tempfile: tempfile) }
+    let(:source_file) { double("::File", read: nil) }
 
     before do
       allow(Chef::Platform).to receive(:windows?).and_return(true)

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

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 describe Chef::Provider::RemoteFile::SFTP do
-  #built out dependencies
+  # built out dependencies
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end
@@ -120,7 +120,7 @@ describe Chef::Provider::RemoteFile::SFTP do
       let(:uri) { URI.parse("sftp://conan:cthu1hu@opscode.com:8021/seattle.txt") }
 
       it "should connect on an alternate port when one is provided" do
-        expect(Net::SFTP).to receive(:start).with("opscode.com:8021", "conan", :password => "cthu1hu")
+        expect(Net::SFTP).to receive(:start).with("opscode.com:8021", "conan", password: "cthu1hu")
         fetcher.fetch
       end
 

data/spec/unit/provider/remote_file_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Provider::RemoteFile do
   let(:node) { double("Chef::Node") }
   let(:events) { double("Chef::Events").as_null_object } # mock all the methods
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
-  let(:run_context) { double("Chef::RunContext", :node => node, :events => events, :logger => logger) }
+  let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
   let(:enclosing_directory) do
     canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
   end

data/spec/unit/provider/script_spec.rb

@@ -93,7 +93,7 @@ describe Chef::Provider::Script, "action_run" do
       end
 
       context "when an alternate user is specified" do
-        let(:security_descriptor) { instance_double("Chef::ReservedNames::Win32::Security::SecurityDescriptor", :dacl => []) }
+        let(:security_descriptor) { instance_double("Chef::ReservedNames::Win32::Security::SecurityDescriptor", dacl: []) }
         let(:securable_object) { instance_double("Chef::ReservedNames::Win32::Security::SecurableObject", :security_descriptor => security_descriptor, :dacl= => nil) }
         it "sets the script file's security descriptor" do
           new_resource.user("toor")

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

@@ -33,7 +33,7 @@ describe Chef::Provider::Service::Aix do
 
   describe "load current resource" do
     it "should create a current resource with the name of the new resource and determine the status" do
-      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+      @status = double("Status", exitstatus: 0, stdout: @stdout)
       allow(@provider).to receive(:shell_out!).and_return(@status)
 
       expect(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
@@ -47,7 +47,7 @@ describe Chef::Provider::Service::Aix do
   describe "determine current status" do
     context "when the service is active" do
       before do
-        @status = double("Status", :exitstatus => 0, :stdout => "chef chef 12345 active\n")
+        @status = double("Status", exitstatus: 0, stdout: "chef chef 12345 active\n")
       end
 
       it "current resource is running" do
@@ -61,7 +61,7 @@ describe Chef::Provider::Service::Aix do
 
     context "when the service is inoperative" do
       before do
-        @status = double("Status", :exitstatus => 0, :stdout => "chef chef inoperative\n")
+        @status = double("Status", exitstatus: 0, stdout: "chef chef inoperative\n")
       end
 
       it "current resource is not running" do
@@ -75,7 +75,7 @@ describe Chef::Provider::Service::Aix do
 
     context "when there is no such service" do
       before do
-        @status = double("Status", :exitstatus => 1, :stdout => "0513-085 The chef Subsystem is not on file.\n")
+        @status = double("Status", exitstatus: 1, stdout: "0513-085 The chef Subsystem is not on file.\n")
       end
       it "current resource is not running" do
         expect(@provider).to receive(:shell_out!).with("lssrc -s chef").and_return(@status)
@@ -90,7 +90,7 @@ describe Chef::Provider::Service::Aix do
   describe "is resource group" do
     context "when there are multiple subsystems associated with group" do
       before do
-        @status = double("Status", :exitstatus => 0, :stdout => "chef1 chef 12345 active\nchef2 chef 12334 active\nchef3 chef inoperative")
+        @status = double("Status", exitstatus: 0, stdout: "chef1 chef 12345 active\nchef2 chef 12334 active\nchef3 chef inoperative")
       end
 
       it "service is a group" do
@@ -102,7 +102,7 @@ describe Chef::Provider::Service::Aix do
 
     context "when there is a single subsystem in the group" do
       before do
-        @status = double("Status", :exitstatus => 0, :stdout => "chef1 chef inoperative\n")
+        @status = double("Status", exitstatus: 0, stdout: "chef1 chef inoperative\n")
       end
 
       it "service is a group" do
@@ -114,8 +114,8 @@ describe Chef::Provider::Service::Aix do
 
     context "when the service is a subsystem" do
       before do
-        @group_status = double("Status", :exitstatus => 1, :stdout => "0513-086 The chef Group is not on file.\n")
-        @service_status = double("Status", :exitstatus => 0, :stdout => "chef chef inoperative\n")
+        @group_status = double("Status", exitstatus: 1, stdout: "0513-086 The chef Group is not on file.\n")
+        @service_status = double("Status", exitstatus: 0, stdout: "chef chef inoperative\n")
       end
 
       it "service is a subsystem" do

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

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Chef::Provider::Service::AixInit do
   before(:each) do
     @node = Chef::Node.new
-    @node.automatic_attrs[:command] = { :ps => "fuuuu" }
+    @node.automatic_attrs[:command] = { ps: "fuuuu" }
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -209,7 +209,7 @@ describe Chef::Provider::Service::AixInit do
       before do
         @files = ["/etc/rc.d/rc2.d/S20apache", "/etc/rc.d/rc2.d/K80apache"]
         # FIXME: this is clearly buggy the duplicated keys do not work
-        #@priority = {2 => [:start, 20], 2 => [:stop, 80]}
+        # @priority = {2 => [:start, 20], 2 => [:stop, 80]}
         @priority = { 2 => [:stop, 80] }
 
         allow(Dir).to receive(:glob).with(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]chef"]).and_return(@files)
@@ -256,7 +256,7 @@ describe Chef::Provider::Service::AixInit do
       before do
         files = ["/etc/rc.d/rc2.d/Sapache", "/etc/rc.d/rc2.d/Kapache"]
         # FIXME: this is clearly buggy the duplicated keys do not work
-        #@priority = {2 => [:start, ''], 2 => [:stop, '']}
+        # @priority = {2 => [:start, ''], 2 => [:stop, '']}
         @priority = { 2 => [:stop, ""] }
 
         allow(Dir).to receive(:glob).with(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).and_return(files)

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

@@ -26,14 +26,14 @@ require "ostruct"
 describe Chef::Provider::Service::Arch, "load_current_resource" do
   before(:each) do
     @node = Chef::Node.new
-    @node.automatic_attrs[:command] = { :ps => "ps -ef" }
+    @node.automatic_attrs[:command] = { ps: "ps -ef" }
 
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
     @new_resource = Chef::Resource::Service.new("chef")
     @new_resource.pattern("chef")
-    @new_resource.supports({ :status => false })
+    @new_resource.supports({ status: false })
 
     @provider = Chef::Provider::Service::Arch.new(@new_resource, @run_context)
 
@@ -43,7 +43,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
   describe "when first created" do
     it "should set the current resources service name to the new resources service name" do
-      allow(@provider).to receive(:shell_out).and_return(OpenStruct.new(:exitstatus => 0, :stdout => ""))
+      allow(@provider).to receive(:shell_out).and_return(OpenStruct.new(exitstatus: 0, stdout: ""))
       @provider.load_current_resource
       expect(@provider.current_resource.service_name).to eq("chef")
     end
@@ -51,22 +51,22 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
   describe "when the service supports status" do
     before do
-      @new_resource.supports({ :status => true })
+      @new_resource.supports({ status: true })
     end
 
     it "should run '/etc/rc.d/service_name status'" do
-      expect(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
+      expect(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(exitstatus: 0))
       @provider.load_current_resource
     end
 
     it "should set running to true if the status command returns 0" do
-      allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
+      allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(exitstatus: 0))
       @provider.load_current_resource
       expect(@provider.current_resource.running).to be_truthy
     end
 
     it "should set running to false if the status command returns anything except 0" do
-      allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 1))
+      allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(exitstatus: 1))
       @provider.load_current_resource
       expect(@provider.current_resource.running).to be_falsey
     end
@@ -85,21 +85,21 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
     end
 
     it "should run the services status command if one has been specified" do
-      expect(@provider).to receive(:shell_out).with("/etc/rc.d/chefhasmonkeypants status").and_return(OpenStruct.new(:exitstatus => 0))
+      expect(@provider).to receive(:shell_out).with("/etc/rc.d/chefhasmonkeypants status").and_return(OpenStruct.new(exitstatus: 0))
       @provider.load_current_resource
     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 }
+    @node.automatic_attrs[:command] = { ps: nil }
     @provider.define_resource_requirements
     @provider.action = :start
     expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
   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 => "" }
+    @node.automatic_attrs[:command] = { ps: "" }
     @provider.define_resource_requirements
     @provider.action = :start
     expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Service)
@@ -117,21 +117,21 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
 
   describe "when discovering service status with ps" do
     before do
-      @stdout = StringIO.new(<<-DEFAULT_PS)
-aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
-aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
-aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
+      @stdout = StringIO.new(<<~DEFAULT_PS)
+        aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
+        aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
+        aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
 DEFAULT_PS
-      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+      @status = double("Status", exitstatus: 0, stdout: @stdout)
       allow(@provider).to receive(:shell_out!).and_return(@status)
 
-      @node.automatic_attrs[:command] = { :ps => "ps -ef" }
+      @node.automatic_attrs[:command] = { ps: "ps -ef" }
     end
 
     it "determines the service is running when it appears in ps" do
-      @stdout = StringIO.new(<<-RUNNING_PS)
-aj        7842  5057  0 21:26 pts/2    00:00:06 chef
-aj        7842  5057  0 21:26 pts/2    00:00:06 poos
+      @stdout = StringIO.new(<<~RUNNING_PS)
+        aj        7842  5057  0 21:26 pts/2    00:00:06 chef
+        aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 RUNNING_PS
       allow(@status).to receive(:stdout).and_return(@stdout)
       @provider.load_current_resource
@@ -274,7 +274,7 @@ RUNNING_PS
       # end
 
       it "should call 'restart' on the service_name if the resource supports it" do
-        @new_resource.supports({ :restart => true })
+        @new_resource.supports({ restart: true })
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} restart", default_env: false)
         @provider.restart_service()
       end
@@ -309,7 +309,7 @@ RUNNING_PS
       # end
 
       it "should call 'reload' on the service if it supports it" do
-        @new_resource.supports({ :reload => true })
+        @new_resource.supports({ reload: true })
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} reload", default_env: false)
         @provider.reload_service()
       end

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

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Chef::Provider::Service::Debian do
   before(:each) do
     @node = Chef::Node.new
-    @node.automatic_attrs[:command] = { :ps => "fuuuu" }
+    @node.automatic_attrs[:command] = { ps: "fuuuu" }
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
 
@@ -88,7 +88,7 @@ describe Chef::Provider::Service::Debian do
             "5" => [:start, "20"],
             "0" => [:stop, "20"],
             "1" => [:stop, "20"],
-            "6" => [:stop, "20"]
+            "6" => [:stop, "20"],
           })
       end
     end

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

@@ -27,14 +27,14 @@ end
 describe Chef::Provider::Service::Freebsd do
   let(:node) do
     node = Chef::Node.new
-    node.automatic_attrs[:command] = { :ps => "ps -ax" }
+    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.supports({ status: false })
     new_resource
   end
 
@@ -99,7 +99,7 @@ describe Chef::Provider::Service::Freebsd do
     end
 
     context "when a status command has been specified" do
-      let(:status) { double(:stdout => "", :exitstatus => 0) }
+      let(:status) { double(stdout: "", exitstatus: 0) }
 
       before do
         new_resource.status_command("/bin/chefhasmonkeypants status")
@@ -112,10 +112,10 @@ describe Chef::Provider::Service::Freebsd do
     end
 
     context "when the service supports status" do
-      let(:status) { double(:stdout => "", :exitstatus => 0) }
+      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
@@ -138,16 +138,16 @@ describe Chef::Provider::Service::Freebsd 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)
+        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) }
+      let(:status) { double(stdout: stdout, exitstatus: 0) }
 
       before do
-        node.automatic_attrs[:command] = { :ps => "ps -ax" }
+        node.automatic_attrs[:command] = { ps: "ps -ax" }
       end
 
       it "should shell_out! the node's ps command" do
@@ -163,9 +163,9 @@ PS_SAMPLE
 
       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
+          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
 
@@ -191,7 +191,7 @@ PS_SAMPLE
 
       context "when ps is empty string" do
         before do
-          node.automatic_attrs[:command] = { :ps => "" }
+          node.automatic_attrs[:command] = { ps: "" }
         end
 
         it "should set running to nil" do
@@ -341,9 +341,9 @@ PS_SAMPLE
 
     context "when the rc script has a 'name' variable" do
       let(:rcscript) do
-        StringIO.new(<<-EOF)
-name="#{new_resource.service_name}"
-rcvar=`set_rcvar`
+        StringIO.new(<<~EOF)
+          name="#{new_resource.service_name}"
+          rcvar=`set_rcvar`
 EOF
       end
 
@@ -363,23 +363,23 @@ EOF
 
     describe "when the rcscript does not have a name variable" do
       let(:rcscript) do
-        StringIO.new <<-EOF
-rcvar=`set_rcvar`
+        StringIO.new <<~EOF
+          rcvar=`set_rcvar`
 EOF
       end
 
       before do
-        status = double(:stdout => rcvar_stdout, :exitstatus => 0)
+        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: "")
+          rcvar_stdout = <<~EOF
+            # apache22
+            #
+            # #{new_resource.service_name}_enable="YES"
+            #   (default: "")
 EOF
         end
 
@@ -394,9 +394,9 @@ EOF
 
       describe "when rcvar does not return foobar_enable" do
         let(:rcvar_stdout) do
-          rcvar_stdout = <<-EOF
-# service_with_noname
-#
+          rcvar_stdout = <<~EOF
+            # service_with_noname
+            #
 EOF
         end
 
@@ -469,7 +469,7 @@ EOF
 
     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 })
+        new_resource.supports({ restart: true })
         expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} fastrestart", default_env: false)
         provider.restart_service()
       end