Resource: use #const_defined? with arity 2 (ruby < 2 specific, issues #2497, #2503)

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 3dc0ae409b..776d1f5440 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -651,6 +651,7 @@ class Chef
     include Chef::Mixin::ParamsValidate
     include Chef::Mixin::Deprecation
 
+<<<<<<< HEAD
     #
     # The provider class for this resource.
     #
@@ -669,6 +670,13 @@ class Chef
         arg
       end
       set_or_return(:provider, klass, kind_of: [ Class ])
+=======
+    extend Chef::Mixin::ConvertToClassName
+    extend Chef::Mixin::DescendantsTracker
+
+    def self.strict_const_defined?(const)
+      const_defined?(const, false)
+>>>>>>> Resource: use #const_defined? with arity 2 (ruby < 2 specific, issues #2497, #2503)
     end
     def provider=(arg)
       provider(arg)
@@ -931,14 +939,8 @@ class Chef
       run_context.notifies_delayed(Notification.new(resource_spec, action, self))
     end
 
-    if Module.method(:const_defined?).arity == 1
-      def self.strict_const_defined?(const)
-        const_defined?(const)
-      end
-    else
-      def self.strict_const_defined?(const)
-        const_defined?(const, false)
-      end
+    def self.strict_const_defined?(const)
+      const_defined?(const, false)
     end
 
     class << self