chef 14.14.29 → 14.15.6

data/spec/unit/provider/link_spec.rb

@@ -259,7 +259,8 @@ describe Chef::Resource::Link do
       allow(stat).to receive(:gid).and_return(501)
       allow(stat).to receive(:mode).and_return(0755)
       allow(provider.file_class).to receive(:stat).with(
-        "#{CHEF_SPEC_DATA}/fofile-link").and_return(stat)
+        "#{CHEF_SPEC_DATA}/fofile-link"
+      ).and_return(stat)
 
       provider.load_current_resource
     end
@@ -267,7 +268,8 @@ describe Chef::Resource::Link do
     shared_context "delete link to directories on Windows" do
       before do
         allow(::File).to receive(:directory?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(true)
       end
 
       it "invokes Dir.delete method to delete the link" do
@@ -280,7 +282,8 @@ describe Chef::Resource::Link do
     shared_context "delete link to directories on Linux" do
       before do
         allow(::File).to receive(:directory?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(true)
       end
 
       it "invokes File.delete method to delete the link" do
@@ -293,7 +296,8 @@ describe Chef::Resource::Link do
     shared_context "delete link to files" do
       before do
         allow(::File).to receive(:directory?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(false)
       end
 
       it "invokes File.delete method to delete the link" do
@@ -306,9 +310,11 @@ describe Chef::Resource::Link do
     shared_context "soft links prerequisites" do
       before(:each) do
         allow(provider.file_class).to receive(:symlink?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(true)
         allow(provider.file_class).to receive(:readlink).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return("#{CHEF_SPEC_DATA}/fofile")
       end
     end
 
@@ -327,15 +333,19 @@ describe Chef::Resource::Link do
         allow(stat).to receive(:mode).and_return(0644)
 
         allow(provider.file_class).to receive(:symlink?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(false)
 
         allow(File).to receive(:exists?).with(
-          "#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+          "#{CHEF_SPEC_DATA}/fofile-link"
+        ).and_return(true)
         allow(File).to receive(:exists?).with(
-          "#{CHEF_SPEC_DATA}/fofile").and_return(true)
+          "#{CHEF_SPEC_DATA}/fofile"
+        ).and_return(true)
 
         allow(provider.file_class).to receive(:stat).with(
-          "#{CHEF_SPEC_DATA}/fofile").and_return(stat)
+          "#{CHEF_SPEC_DATA}/fofile"
+        ).and_return(stat)
       end
     end
 
@@ -346,7 +356,8 @@ describe Chef::Resource::Link do
 
       before(:each) do
         allow(Chef::Resource::Link).to receive(:new).with(
-          provider.new_resource.name).and_return(resource_link)
+          provider.new_resource.name
+        ).and_return(resource_link)
         allow(resource_link).to receive(:verify_links_supported!)
         allow(Chef::Platform).to receive(:windows?).and_return(true)
       end

data/spec/unit/provider/mount/aix_spec.rb

@@ -26,29 +26,29 @@ describe Chef::Provider::Mount::Aix do
         node       mounted        mounted over    vfs       date        options
       -------- ---------------  ---------------  ------ ------------ ---------------
                /dev/sdz1         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
-MOUNT
+    MOUNT
 
     @unmounted_output = <<~UNMOUNTED
         node       mounted        mounted over    vfs       date        options
       -------- ---------------  ---------------  ------ ------------ ---------------
                /dev/sdz2         /                jfs2   Jul 17 13:22 rw,log=/dev/hd8
-UNMOUNTED
+    UNMOUNTED
 
     @conflict_mounted_output = <<~MOUNT
         node       mounted        mounted over    vfs       date        options
       -------- ---------------  ---------------  ------ ------------ ---------------
                /dev/sdz3         /tmp/foo         jfs2   Jul 17 13:22 rw,log=/dev/hd8
-MOUNT
+    MOUNT
 
     @enabled_output = <<~ENABLED
       #MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
       /tmp/foo:/dev/sdz1:jfs2::bootfs:10485760:rw:yes:no
-ENABLED
+    ENABLED
 
     @test_wrong_output = <<~WRONG
       #MountPoint:Device:Vfs:Nodename:Type:Size:Options:AutoMount:Acct
       /tmp/foo::/dev/sdz1:jfs2:bootfs:10485760:rw:yes:no
-WRONG
+    WRONG
   end
 
   before(:each) do
@@ -256,7 +256,7 @@ WRONG
           vfs   = jfs2
           mount   = true
           options   = rw
-ETCFILESYSTEMS
+      ETCFILESYSTEMS
 
       filesystems = StringIO.new
       allow(::File).to receive(:open).with("/etc/filesystems", "w").and_yield(filesystems)

data/spec/unit/provider/mount/mount_spec.rb

@@ -67,23 +67,23 @@ describe Chef::Provider::Mount::Mount do
     describe "when dealing with network mounts" do
       { "nfs" => "nfsserver:/vol/path",
         "cifs" => "//cifsserver/share" }.each do |type, fs_spec|
-        it "should detect network fs_spec (#{type})" do
-          @new_resource.device fs_spec
-          expect(@provider.network_device?).to be_truthy
+          it "should detect network fs_spec (#{type})" do
+            @new_resource.device fs_spec
+            expect(@provider.network_device?).to be_truthy
+          end
+
+          it "should ignore trailing slash and set mounted to true for network mount (#{type})" do
+            @new_resource.device fs_spec
+            allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
+            @provider.load_current_resource
+            expect(@provider.current_resource.mounted).to be_truthy
+          end
         end
-
-        it "should ignore trailing slash and set mounted to true for network mount (#{type})" do
-          @new_resource.device fs_spec
-          allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
-          @provider.load_current_resource
-          expect(@provider.current_resource.mounted).to be_truthy
-        end
-      end
     end
 
     it "should raise an error if the mount device does not exist" do
       allow(::File).to receive(:exists?).with("/dev/sdz1").and_return false
-      expect { @provider.load_current_resource(); @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
+      expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
     it "should not call mountable? with load_current_resource - CHEF-1565" do
@@ -100,36 +100,36 @@ describe Chef::Provider::Mount::Mount do
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
       expect(@provider).to receive(:shell_out_compacted).with("/sbin/findfs", "UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
       expect(::File).to receive(:exists?).with("").and_return(false)
-      expect { @provider.load_current_resource(); @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
+      expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
     it "should raise an error if the mount point does not exist" do
       allow(::File).to receive(:exists?).with("/tmp/foo").and_return false
-      expect { @provider.load_current_resource(); @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
+      expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
     %w{tmpfs fuse cgroup vboxsf zfs}.each do |fstype|
       it "does not expect the device to exist for #{fstype}" do
         @new_resource.fstype(fstype)
         @new_resource.device("whatever")
-        expect { @provider.load_current_resource(); @provider.mountable? }.not_to raise_error
+        expect { @provider.load_current_resource; @provider.mountable? }.not_to raise_error
       end
     end
 
     it "does not expect the device to exist if it's none" do
       @new_resource.device("none")
-      expect { @provider.load_current_resource(); @provider.mountable? }.not_to raise_error
+      expect { @provider.load_current_resource; @provider.mountable? }.not_to raise_error
     end
 
     it "should set mounted true if the mount point is found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdz1 on /tmp/foo type ext3 (rw)\n"))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdz1 on /tmp/foobar type ext3 (rw)\n"))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_falsey
     end
 
@@ -141,7 +141,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{target} on /tmp/foo type ext3 (rw)\n"))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_truthy
     end
 
@@ -155,7 +155,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:readlink).with((@new_resource.device).to_s).and_return(target)
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "#{absolute_target} on /tmp/foo type ext3 (rw)\n"))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_truthy
     end
 
@@ -164,7 +164,7 @@ describe Chef::Provider::Mount::Mount do
       mount << "#{@new_resource.device} on #{@new_resource.mount_point} type ext3 (rw)\n"
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: mount))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_truthy
     end
 
@@ -173,13 +173,13 @@ describe Chef::Provider::Mount::Mount do
       mount << "/dev/sdy1 on #{@new_resource.mount_point} type ext3 (rw)\n"
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: mount))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "mounted should be false if the mount point is not found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
-      @provider.load_current_resource()
+      @provider.load_current_resource
       expect(@provider.current_resource.mounted).to be_falsey
     end
 
@@ -297,14 +297,14 @@ describe Chef::Provider::Mount::Mount do
     describe "mount_fs" do
       it "should mount the filesystem if it is not mounted" do
         expect(@provider).to receive(:shell_out_compacted!).with("mount", "-t", "ext3", "-o", "defaults", "/dev/sdz1", "/tmp/foo")
-        @provider.mount_fs()
+        @provider.mount_fs
       end
 
       it "should mount the filesystem with options if options were passed" do
         options = "rw,noexec,noauto"
         @new_resource.options(%w{rw noexec noauto})
         expect(@provider).to receive(:shell_out_compacted!).with("mount", "-t", "ext3", "-o", "rw,noexec,noauto", "/dev/sdz1", "/tmp/foo")
-        @provider.mount_fs()
+        @provider.mount_fs
       end
 
       it "should mount the filesystem specified by uuid", :not_supported_on_solaris do
@@ -315,13 +315,13 @@ describe Chef::Provider::Mount::Mount do
         @stdout_mock = double("stdout mock")
         allow(@stdout_mock).to receive(:each).and_yield("#{@new_resource.device} on #{@new_resource.mount_point}")
         expect(@provider).to receive(:shell_out_compacted!).with("mount", "-t", @new_resource.fstype, "-o", "defaults", "-U", @new_resource.device, @new_resource.mount_point).and_return(@stdout_mock)
-        @provider.mount_fs()
+        @provider.mount_fs
       end
 
       it "should not mount the filesystem if it is mounted" do
         allow(@current_resource).to receive(:mounted).and_return(true)
         expect(@provider).not_to receive(:shell_out!)
-        @provider.mount_fs()
+        @provider.mount_fs
       end
 
     end
@@ -330,13 +330,13 @@ describe Chef::Provider::Mount::Mount do
       it "should umount the filesystem if it is mounted" do
         @current_resource.mounted(true)
         expect(@provider).to receive(:shell_out!).with("umount", "/tmp/foo")
-        @provider.umount_fs()
+        @provider.umount_fs
       end
 
       it "should not umount the filesystem if it is not mounted" do
         @current_resource.mounted(false)
         expect(@provider).not_to receive(:shell_out!)
-        @provider.umount_fs()
+        @provider.umount_fs
       end
     end
 
@@ -363,7 +363,7 @@ describe Chef::Provider::Mount::Mount do
         expect(@provider).to receive(:umount_fs)
         expect(@provider).to receive(:sleep).with(1)
         expect(@provider).to receive(:mount_fs)
-        @provider.remount_fs()
+        @provider.remount_fs
       end
 
       it "should not try to remount at all if mounted is false" do
@@ -371,7 +371,7 @@ describe Chef::Provider::Mount::Mount do
         expect(@provider).not_to receive(:shell_out!)
         expect(@provider).not_to receive(:umount_fs)
         expect(@provider).not_to receive(:mount_fs)
-        @provider.remount_fs()
+        @provider.remount_fs
       end
     end
 

data/spec/unit/provider/mount/solaris_spec.rb

@@ -103,7 +103,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
   describe "#define_resource_requirements" do
     before do
       # we're not testing the actual actions so stub them all out
-      [:mount_fs, :umount_fs, :remount_fs, :enable_fs, :disable_fs].each { |m| allow(provider).to receive(m) }
+      %i{mount_fs umount_fs remount_fs enable_fs disable_fs}.each { |m| allow(provider).to receive(m) }
     end
 
     it "run_action(:mount) should raise an error if the device does not exist" do
@@ -350,7 +350,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         expect(File).to receive(:symlink?).with(device).at_least(:once).and_return(true)
         expect(File).to receive(:readlink).with(device).at_least(:once).and_return(target)
 
-        provider.load_current_resource()
+        provider.load_current_resource
       end
 
       it "should set mounted true if the symlink target of the device is found in the mounts list" do
@@ -387,7 +387,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         expect(File).to receive(:symlink?).with(device).at_least(:once).and_return(true)
         expect(File).to receive(:readlink).with(device).at_least(:once).and_return(target)
 
-        provider.load_current_resource()
+        provider.load_current_resource
       end
 
       it "should set mounted true if the symlink target of the device is found in the mounts list" do
@@ -411,7 +411,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       end
       it "should set mounted true" do
-        provider.load_current_resource()
+        provider.load_current_resource
         expect(provider.current_resource.mounted).to be_truthy
       end
     end
@@ -424,7 +424,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       end
       it "should set mounted false" do
-        provider.load_current_resource()
+        provider.load_current_resource
         expect(provider.current_resource.mounted).to be_falsey
       end
     end
@@ -436,7 +436,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       end
       it "should set mounted false" do
-        provider.load_current_resource()
+        provider.load_current_resource
         expect(provider.current_resource.mounted).to be_falsey
       end
     end
@@ -448,7 +448,7 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
         EOF
       end
       it "should set mounted false" do
-        provider.load_current_resource()
+        provider.load_current_resource
         expect(provider.current_resource.mounted).to be_falsey
       end
     end
@@ -539,28 +539,28 @@ describe Chef::Provider::Mount::Solaris, :unix_only do
     describe "mount_fs" do
       it "should mount the filesystem" do
         expect(provider).to receive(:shell_out_compacted!).with("mount", "-F", fstype, device, mountpoint)
-        provider.mount_fs()
+        provider.mount_fs
       end
 
       it "should mount the filesystem with options if options were passed" do
         options = "logging,noatime,largefiles,nosuid,rw,quota"
         new_resource.options(options.split(/,/))
         expect(provider).to receive(:shell_out_compacted!).with("mount", "-F", fstype, "-o", options, device, mountpoint)
-        provider.mount_fs()
+        provider.mount_fs
       end
 
       it "should delete the 'noauto' magic option" do
         options = "rw,noauto"
         new_resource.options(%w{rw noauto})
         expect(provider).to receive(:shell_out_compacted!).with("mount", "-F", fstype, "-o", "rw", device, mountpoint)
-        provider.mount_fs()
+        provider.mount_fs
       end
     end
 
     describe "umount_fs" do
       it "should umount the filesystem if it is mounted" do
         expect(provider).to receive(:shell_out_compacted!).with("umount", mountpoint)
-        provider.umount_fs()
+        provider.umount_fs
       end
     end
 

data/spec/unit/provider/ohai_spec.rb

@@ -43,7 +43,7 @@ describe Chef::Provider::Ohai do
     }
     allow(mock_ohai).to receive(:all_plugins).and_return(true)
     allow(mock_ohai).to receive(:data).and_return(mock_ohai[:data],
-                                      mock_ohai[:data2])
+      mock_ohai[:data2])
     allow(Ohai::System).to receive(:new).and_return(mock_ohai)
     allow(Chef::Platform).to receive(:find_platform_and_version).and_return({ "platform" => @platform,
                                                                               "platform_version" => @platform_version })

data/spec/unit/provider/osx_profile_spec.rb

@@ -132,7 +132,7 @@ describe Chef::Provider::OsxProfile do
       provider.load_current_resource
       expect(
         provider.instance_variable_get(:@new_profile_identifier)
-        ).to eql(test_profile["PayloadIdentifier"])
+      ).to eql(test_profile["PayloadIdentifier"])
     end
 
     it "should install when not installed" do
@@ -167,7 +167,7 @@ describe Chef::Provider::OsxProfile do
       provider.load_current_resource
       allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
       expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
-      provider.action_install()
+      provider.action_install
     end
 
     it "should fail if there is no identifier inside the profile" do
@@ -228,16 +228,14 @@ describe Chef::Provider::OsxProfile do
       new_resource.profile_name "com.testprofile.screensaver"
       new_resource.action(:remove)
       provider.load_current_resource
-      expect(provider.instance_variable_get(:@new_profile_identifier)
-        ).to eql(new_resource.profile_name)
+      expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(new_resource.profile_name)
     end
 
     it "should use specified identifier" do
       new_resource.identifier "com.testprofile.screensaver"
       new_resource.action(:remove)
       provider.load_current_resource
-      expect(provider.instance_variable_get(:@new_profile_identifier)
-        ).to eql(new_resource.identifier)
+      expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(new_resource.identifier)
     end
 
     it "should work with spaces in the identifier" do
@@ -251,7 +249,7 @@ describe Chef::Provider::OsxProfile do
       new_resource.action(:remove)
       provider.load_current_resource
       expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-R", "-p", new_resource.identifier).and_return(shell_out_success)
-      provider.action_remove()
+      provider.action_remove
     end
   end
 end