Merge pull request #12219 from chef/fix-macos-userdefaults-nomethod-error

3 files changed, 22 insertions, 25 deletions

diff --git a/lib/chef/resource/macos_userdefaults.rb b/lib/chef/resource/macos_userdefaults.rb
index ee84278392..b0b9c32fe0 100644
--- a/lib/chef/resource/macos_userdefaults.rb
+++ b/lib/chef/resource/macos_userdefaults.rb
@@ -17,6 +17,7 @@
 
 require_relative "../resource"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
+require "corefoundation" if RUBY_PLATFORM.match?(/darwin/)
 autoload :Plist, "plist"
 
 class Chef
@@ -135,31 +136,27 @@ class Chef
         CF::Preferences.get(new_resource.key, new_resource.domain, new_resource.user, new_resource.host)
       end
 
-      action_class do
-        require "corefoundation" if RUBY_PLATFORM.match?(/darwin/)
-
-        # Return valid hostname based on the input from host property
-        def to_cf_host(value)
-          case value
-          when :all
-            CF::Preferences::ALL_HOSTS
-          when :current
-            CF::Preferences::CURRENT_HOST
-          else
-            value
-          end
+      # Return valid hostname based on the input from host property
+      def to_cf_host(value)
+        case value
+        when :all
+          CF::Preferences::ALL_HOSTS
+        when :current
+          CF::Preferences::CURRENT_HOST
+        else
+          value
         end
+      end
 
-        # Return valid username based on the input from user property
-        def to_cf_user(value)
-          case value
-          when :all
-            CF::Preferences::ALL_USERS
-          when :current
-            CF::Preferences::CURRENT_USER
-          else
-            value
-          end
+      # Return valid username based on the input from user property
+      def to_cf_user(value)
+        case value
+        when :all
+          CF::Preferences::ALL_USERS
+        when :current
+          CF::Preferences::CURRENT_USER
+        else
+          value
         end
       end
     end
diff --git a/spec/functional/resource/macos_userdefaults_spec.rb b/spec/functional/resource/macos_userdefaults_spec.rb
index c8e065e0f1..2f79135c45 100644
--- a/spec/functional/resource/macos_userdefaults_spec.rb
+++ b/spec/functional/resource/macos_userdefaults_spec.rb
@@ -16,7 +16,7 @@
 #
 require "spec_helper"
 
-describe Chef::Resource::MacosUserDefaults, :macos_only, requires_root: true do
+describe Chef::Resource::MacosUserDefaults, :macos_only do
   def create_resource
     node = Chef::Node.new
     events = Chef::EventDispatch::Dispatcher.new
diff --git a/spec/unit/resource/macos_user_defaults_spec.rb b/spec/unit/resource/macos_user_defaults_spec.rb
index 63cfe4a0c4..8363b822ec 100644
--- a/spec/unit/resource/macos_user_defaults_spec.rb
+++ b/spec/unit/resource/macos_user_defaults_spec.rb
@@ -17,7 +17,7 @@
 
 require "spec_helper"
 
-describe Chef::Resource::MacosUserDefaults, :macos_only, requires_root: true do
+describe Chef::Resource::MacosUserDefaults, :macos_only do
   let(:test_value) { "fakest_key_value" }
   let(:test_key) { "fakest_key" }
   let(:node) { Chef::Node.new }