summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@chef.io>2020-08-18 09:15:58 -0700
committerGitHub <noreply@github.com>2020-08-18 09:15:58 -0700
commit4f54aa046eb3866f22ab0a2f5b94dbe6b138e23b (patch)
tree65f4a302800479205088db8b7a8cd162ab32468d
parente5e09d3ba59f950a9dcd8649cae444b925a010a7 (diff)
parent63217f28a11186e8f87264827ec67ad64bfbf4a7 (diff)
downloadchef-4f54aa046eb3866f22ab0a2f5b94dbe6b138e23b.tar.gz
Merge pull request #10320 from chef/mac_testing
Signed-off-by: Lamont Granquist <lamont@chef.io>
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/macos.rb5
-rw-r--r--lib/chef/resource/osx_profile.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
index c6be1ef249..76ddacb4bb 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb
@@ -56,6 +56,11 @@ include_recipe "git"
end
end
+osx_profile 'Remove screensaver profile' do
+ identifier 'com.company.screensaver'
+ action :remove
+end
+
build_essential
launchd "io.chef.testing.fake" do
diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb
index 3528b8f837..437290742d 100644
--- a/lib/chef/resource/osx_profile.rb
+++ b/lib/chef/resource/osx_profile.rb
@@ -81,7 +81,7 @@ class Chef
def check_resource_semantics!
if mac? && node["platform_version"] =~ ">= 11.0"
- raise "The osx_profile resource is not available on macOS Big Sur or above due to the removal of Apple support for CLI installation of profiles"
+ raise "The osx_profile resource is not available on macOS Big Sur or above due to Apple's removal of support for CLI profile installation"
end
if action == :remove