Remove const_defined? workaround

Author: pirj

lib/rspec/support/recursive_const_methods.rb

@@ -5,52 +5,27 @@ module Support
     module RecursiveConstMethods
       # We only want to consider constants that are defined directly on a
       # particular module, and not include top-level/inherited constants.
-      # Unfortunately, the constant API changed between 1.8 and 1.9, so
-      # we need to conditionally define methods to ignore the top-level/inherited
-      # constants.
       #
-      # Given:
       #   class A; B = 1; end
       #   class C < A; end
       #
-      # On 1.8:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => false
-      #   - C.constants # => ["B"]
-      #   - None of these methods accept the extra `inherit` argument
-      # On 1.9:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => true
-      #   - C.const_get("Hash", false) # => raises NameError
-      #   - C.const_defined?("Hash", false) # => false
-      #   - C.constants # => [:B]
-      #   - C.constants(false) #=> []
-      if Module.method(:const_defined?).arity == 1
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name)
-        end
-
-        def get_const_defined_on(mod, const_name)
-          return mod.const_get(const_name) if const_defined_on?(mod, const_name)
-
-          raise NameError, "uninitialized constant #{mod.name}::#{const_name}"
-        end
-
-        def constants_defined_on(mod)
-          mod.constants.select { |c| const_defined_on?(mod, c) }
-        end
-      else
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name, false)
-        end
+      #   C.const_get("Hash") # => ::Hash
+      #   C.const_defined?("Hash") # => true
+      #   C.const_get("Hash", false) # => raises NameError
+      #   C.const_defined?("Hash", false) # => false
+      #   C.constants # => [:B]
+      #   C.constants(false) #=> []
+
+      def const_defined_on?(mod, const_name)
+        mod.const_defined?(const_name, false)
+      end
 
-        def get_const_defined_on(mod, const_name)
-          mod.const_get(const_name, false)
-        end
+      def get_const_defined_on(mod, const_name)
+        mod.const_get(const_name, false)
+      end
 
-        def constants_defined_on(mod)
-          mod.constants(false)
-        end
+      def constants_defined_on(mod)
+        mod.constants(false)
       end
 
       def recursive_const_get(const_name)