have_constant should use inherit=false

Author: eregon

spec/mspec/lib/mspec/matchers/have_class_variable.rb

@@ -1,8 +1,11 @@
 require 'mspec/matchers/variable'
 
 class HaveClassVariableMatcher < VariableMatcher
-  self.variables_method = :class_variables
-  self.description      = 'class variable'
+  self.description = 'class variable'
+
+  private def check(object, variable)
+    object.class_variable_defined?(variable)
+  end
 end
 
 module MSpecMatchers

spec/mspec/lib/mspec/matchers/have_constant.rb

@@ -1,8 +1,12 @@
 require 'mspec/matchers/variable'
 
 class HaveConstantMatcher < VariableMatcher
-  self.variables_method = :constants
-  self.description      = 'constant'
+  self.description = 'constant'
+
+  private def check(object, variable)
+    # Differs from object.const_defined?(variable, false) for undefined constants
+    object.constants(false).include?(variable)
+  end
 end
 
 module MSpecMatchers

spec/mspec/lib/mspec/matchers/have_instance_variable.rb

@@ -1,8 +1,11 @@
 require 'mspec/matchers/variable'
 
 class HaveInstanceVariableMatcher < VariableMatcher
-  self.variables_method = :instance_variables
-  self.description      = 'instance variable'
+  self.description = 'instance variable'
+
+  private def check(object, variable)
+    object.instance_variable_defined?(variable)
+  end
 end
 
 module MSpecMatchers

spec/mspec/lib/mspec/matchers/variable.rb

@@ -1,6 +1,6 @@
 class VariableMatcher
   class << self
-    attr_accessor :variables_method, :description
+    attr_accessor :description
   end
 
   def initialize(variable)
@@ -9,7 +9,7 @@ def initialize(variable)
 
   def matches?(object)
     @object = object
-    @object.send(self.class.variables_method).include? @variable
+    check(@object, @variable)
   end
 
   def failure_message

spec/ruby/core/module/autoload_spec.rb

@@ -573,11 +573,11 @@ class LexicalScope
         -> { DeclaredInParentDefinedInCurrent }.should raise_error(NameError)
         ruby_version_is ""..."3.1" do
           # Basically, the parent autoload constant remains in a "undefined" state
-          self.should have_constant(:DeclaredInParentDefinedInCurrent)
+          self.constants(false).should.include?(:DeclaredInParentDefinedInCurrent)
         end
         ruby_version_is "3.1" do
           # The autoload constant has been removed
-          self.should_not have_constant(:DeclaredInParentDefinedInCurrent)
+          self.constants(false).should_not.include?(:DeclaredInParentDefinedInCurrent)
         end
 
         ModuleSpecs::Autoload::LexicalScope.send(:remove_const, :DeclaredInParentDefinedInCurrent)
@@ -627,7 +627,7 @@ class LexicalScope
             # The autoload constant has been removed
             self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
             const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-            self.should_not have_constant(:DeclaredInCurrentDefinedInParent)
+            self.constants(false).should_not.include?(:DeclaredInCurrentDefinedInParent)
             -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
           end
 
@@ -650,7 +650,7 @@ class LexicalScope
             # Basically, the autoload constant remains in a "undefined" state
             self.autoload?(:DeclaredInCurrentDefinedInParent).should == nil
             const_defined?(:DeclaredInCurrentDefinedInParent).should == false
-            self.should have_constant(:DeclaredInCurrentDefinedInParent)
+            self.constants(false).should.include?(:DeclaredInCurrentDefinedInParent)
             -> { const_get(:DeclaredInCurrentDefinedInParent) }.should raise_error(NameError)
           end