Update to ruby/spec@ccf0d85

2 files changed, 92 insertions, 10 deletions

diff --git a/spec/ruby/language/defined_spec.rb b/spec/ruby/language/defined_spec.rb
index f2da8a9293..38345c3727 100644
--- a/spec/ruby/language/defined_spec.rb
+++ b/spec/ruby/language/defined_spec.rb
@@ -5,21 +5,25 @@ describe "The defined? keyword for literals" do
   it "returns 'self' for self" do
     ret = defined?(self)
     ret.should == "self"
+    ret.frozen?.should == true
   end
 
   it "returns 'nil' for nil" do
     ret = defined?(nil)
     ret.should == "nil"
+    ret.frozen?.should == true
   end
 
   it "returns 'true' for true" do
     ret = defined?(true)
     ret.should == "true"
+    ret.frozen?.should == true
   end
 
   it "returns 'false' for false" do
     ret = defined?(false)
     ret.should == "false"
+    ret.frozen?.should == true
   end
 
   describe "for a literal Array" do
@@ -27,6 +31,7 @@ describe "The defined? keyword for literals" do
     it "returns 'expression' if each element is defined" do
       ret = defined?([Object, Array])
       ret.should == "expression"
+      ret.frozen?.should == true
     end
 
     it "returns nil if one element is not defined" do
@@ -45,7 +50,9 @@ end
 describe "The defined? keyword when called with a method name" do
   describe "without a receiver" do
     it "returns 'method' if the method is defined" do
-      defined?(puts).should == "method"
+      ret = defined?(puts)
+      ret.should == "method"
+      ret.frozen?.should == true
     end
 
     it "returns nil if the method is not defined" do
@@ -167,7 +174,9 @@ describe "The defined? keyword for an expression" do
   end
 
   it "returns 'assignment' for assigning a local variable" do
-    defined?(x = 2).should == "assignment"
+    ret = defined?(x = 2)
+    ret.should == "assignment"
+    ret.frozen?.should == true
   end
 
   it "returns 'assignment' for assigning an instance variable" do
@@ -470,7 +479,9 @@ end
 
 describe "The defined? keyword for variables" do
   it "returns 'local-variable' when called with the name of a local variable" do
-    DefinedSpecs::Basic.new.local_variable_defined.should == "local-variable"
+    ret = DefinedSpecs::Basic.new.local_variable_defined
+    ret.should == "local-variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'local-variable' when called with the name of a local variable assigned to nil" do
@@ -486,7 +497,9 @@ describe "The defined? keyword for variables" do
   end
 
   it "returns 'instance-variable' for an instance variable that has been assigned" do
-    DefinedSpecs::Basic.new.instance_variable_defined.should == "instance-variable"
+    ret = DefinedSpecs::Basic.new.instance_variable_defined
+    ret.should == "instance-variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'instance-variable' for an instance variable that has been assigned to nil" do
@@ -502,7 +515,9 @@ describe "The defined? keyword for variables" do
   end
 
   it "returns 'global-variable' for a global variable that has been assigned nil" do
-    DefinedSpecs::Basic.new.global_variable_defined_as_nil.should == "global-variable"
+    ret = DefinedSpecs::Basic.new.global_variable_defined_as_nil
+    ret.should == "global-variable"
+    ret.frozen?.should == true
   end
 
   # MRI appears to special case defined? for $! and $~ in that it returns
@@ -674,7 +689,9 @@ describe "The defined? keyword for variables" do
   # get to the defined? call so it really has nothing to do with 'defined?'.
 
   it "returns 'class variable' when called with the name of a class variable" do
-    DefinedSpecs::Basic.new.class_variable_defined.should == "class variable"
+    ret = DefinedSpecs::Basic.new.class_variable_defined
+    ret.should == "class variable"
+    ret.frozen?.should == true
   end
 
   it "returns 'local-variable' when called with the name of a block local" do
@@ -685,7 +702,9 @@ end
 
 describe "The defined? keyword for a simple constant" do
   it "returns 'constant' when the constant is defined" do
-    defined?(DefinedSpecs).should == "constant"
+    ret = defined?(DefinedSpecs)
+    ret.should == "constant"
+    ret.frozen?.should == true
   end
 
   it "returns nil when the constant is not defined" do
@@ -941,12 +960,26 @@ describe "The defined? keyword for yield" do
   end
 
   it "returns 'yield' if a block is passed to a method not taking a block parameter" do
-    DefinedSpecs::Basic.new.yield_block.should == "yield"
+    ret = DefinedSpecs::Basic.new.yield_block
+    ret.should == "yield"
+    ret.frozen?.should == true
   end
 
   it "returns 'yield' if a block is passed to a method taking a block parameter" do
     DefinedSpecs::Basic.new.yield_block_parameter.should == "yield"
   end
+
+  it "returns 'yield' when called within a block" do
+    def yielder
+      yield
+    end
+
+    def call_defined
+      yielder { defined?(yield) }
+    end
+
+    call_defined() { }.should == "yield"
+  end
 end
 
 describe "The defined? keyword for super" do
@@ -972,7 +1005,9 @@ describe "The defined? keyword for super" do
     end
 
     it "returns 'super' when a superclass method exists" do
-      DefinedSpecs::Super.new.method_no_args.should == "super"
+      ret = DefinedSpecs::Super.new.method_no_args
+      ret.should == "super"
+      ret.frozen?.should == true
     end
 
     it "returns 'super' from a block when a superclass method exists" do
diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb
index 24a8cf2f67..417afea537 100644
--- a/spec/ruby/language/predefined_spec.rb
+++ b/spec/ruby/language/predefined_spec.rb
@@ -1099,6 +1099,8 @@ The following constants are defined by the Ruby interpreter.
 DATA                 IO          If the main program file contains the directive __END__, then
                                  the constant DATA will be initialized so that reading from it will
                                  return lines following __END__ from the source file.
+FALSE                FalseClass  Synonym for false (deprecated, removed in Ruby 3).
+NIL                  NilClass    Synonym for nil (deprecated, removed in Ruby 3).
 RUBY_PLATFORM        String      The identifier of the platform running this program. This string
                                  is in the same form as the platform identifier used by the GNU
                                  configure utility (which is not a coincidence).
@@ -1116,9 +1118,55 @@ SCRIPT_LINES__       Hash        If a constant SCRIPT_LINES__ is defined and ref
                                  the value.
 TOPLEVEL_BINDING     Binding     A Binding object representing the binding at Ruby’s top level—
                                  the level where programs are initially executed.
+TRUE                 TrueClass   Synonym for true (deprecated, removed in Ruby 3).
 =end
 
 describe "The predefined global constants" do
+  describe "TRUE" do
+    ruby_version_is "3.0" do
+      it "is no longer defined" do
+        Object.const_defined?(:TRUE).should == false
+      end
+    end
+
+    ruby_version_is ""..."3.0" do
+      it "includes TRUE" do
+        Object.const_defined?(:TRUE).should == true
+        -> { TRUE }.should complain(/constant ::TRUE is deprecated/)
+      end
+    end
+  end
+
+  describe "FALSE" do
+    ruby_version_is "3.0" do
+      it "is no longer defined" do
+        Object.const_defined?(:FALSE).should == false
+      end
+    end
+
+    ruby_version_is ""..."3.0" do
+      it "includes FALSE" do
+        Object.const_defined?(:FALSE).should == true
+        -> { FALSE }.should complain(/constant ::FALSE is deprecated/)
+      end
+    end
+  end
+
+  describe "NIL" do
+    ruby_version_is "3.0" do
+      it "is no longer defined" do
+        Object.const_defined?(:NIL).should == false
+      end
+    end
+
+    ruby_version_is ""..."3.0" do
+      it "includes NIL" do
+        Object.const_defined?(:NIL).should == true
+        -> { NIL }.should complain(/constant ::NIL is deprecated/)
+      end
+    end
+  end
+
   it "includes STDIN" do
     Object.const_defined?(:STDIN).should == true
   end
@@ -1146,7 +1194,6 @@ describe "The predefined global constants" do
   it "includes TOPLEVEL_BINDING" do
     Object.const_defined?(:TOPLEVEL_BINDING).should == true
   end
-
 end
 
 describe "The predefined global constant" do