[GR-14806] Update specs

PullRequest: truffleruby/3932

Author: eregon

doc/contributor/workflow.md

@@ -322,6 +322,9 @@ When working on a feature from the next version of Ruby, add the spec file in
 the corresponding files list in `spec/truffleruby.next-specs` so that the specs
 are run in CI too.
 
+However this does not work for C-API specs,
+because those use `#ifdef RUBY_VERSION_IS_3_2` and that version cannot be faked.
+
 ## How to fix a failing MRI test
 
 Remove the exclusion of either the file (`test/mri/failing.exclude`) or the

lib/truffle/stringio.rb

@@ -107,6 +107,8 @@ def syswrite(str)
 
 class StringIO
 
+  VERSION = '3.0.1' # Same version as the default gem in CRuby 3.1.3
+
   include Enumerable
   include Truffle::CExt.rb_define_module_under(IO, 'generic_readable')
   include Truffle::CExt.rb_define_module_under(IO, 'generic_writable')

spec/ruby/command_line/dash_upper_u_spec.rb

@@ -6,6 +6,13 @@
               options: '-U').should == 'UTF-8'
   end
 
+  it "sets Encoding.default_internal to UTF-8 when RUBYOPT is empty or only spaces" do
+    ruby_exe('p Encoding.default_internal',
+             options: '-U', env: { 'RUBYOPT' => '' }).should == "#<Encoding:UTF-8>\n"
+    ruby_exe('p Encoding.default_internal',
+             options: '-U', env: { 'RUBYOPT' => '  ' }).should == "#<Encoding:UTF-8>\n"
+  end
+
   it "does nothing different if specified multiple times" do
      ruby_exe('print Encoding.default_internal.name',
               options: '-U -U').should == 'UTF-8'

spec/ruby/core/basicobject/instance_eval_spec.rb

@@ -84,6 +84,13 @@ def foo
 
   end
 
+  ruby_version_is "3.3" do
+    it "uses the caller location as default location" do
+      f = Object.new
+      f.instance_eval("[__FILE__, __LINE__]").should == ["(eval at #{__FILE__}:#{__LINE__})", 1]
+    end
+  end
+
   it "has access to receiver's instance variables" do
     BasicObjectSpecs::IVars.new.instance_eval { @secret }.should == 99
     BasicObjectSpecs::IVars.new.instance_eval("@secret").should == 99

spec/ruby/core/binding/eval_spec.rb

@@ -60,10 +60,12 @@
     bind.eval("#foo\n__LINE__", "(test)", 88).should == 89
   end
 
-  it "uses (eval) as __FILE__ if single argument given" do
-    obj = BindingSpecs::Demo.new(1)
-    bind = obj.get_binding
-    bind.eval("__FILE__").should == '(eval)'
+  ruby_version_is ""..."3.3" do
+    it "uses (eval) as __FILE__ if single argument given" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      bind.eval("__FILE__").should == '(eval)'
+    end
   end
 
   it "uses 1 as __LINE__" do
@@ -104,4 +106,10 @@
 
     bind.eval("'bar'.foo").should == "foo"
   end
+
+  ruby_version_is "3.3" do
+    it "uses the caller location as default filename" do
+      binding.eval("[__FILE__, __LINE__]").should == ["(eval at #{__FILE__}:#{__LINE__})", 1]
+    end
+  end
 end

spec/ruby/core/false/singleton_method_spec.rb

@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe "FalseClass#singleton_method" do
+  ruby_version_is '3.3' do
+    it "raises regardless of whether FalseClass defines the method" do
+      -> { false.singleton_method(:foo) }.should raise_error(NameError)
+      begin
+        def (false).foo; end
+        -> { false.singleton_method(:foo) }.should raise_error(NameError)
+      ensure
+        FalseClass.send(:remove_method, :foo)
+      end
+    end
+  end
+end

spec/ruby/core/kernel/eval_spec.rb

@@ -159,20 +159,37 @@ class Object
     end
   end
 
-  it "uses (eval) filename if none is provided" do
-    eval("__FILE__").should == "(eval)"
-    eval("__FILE__", binding).should == "(eval)"
-    eval("__FILE__", binding, "success").should == "success"
-    eval("eval '__FILE__', binding").should == "(eval)"
-    eval("eval '__FILE__', binding", binding).should == "(eval)"
-    eval("eval '__FILE__', binding", binding, 'success').should == '(eval)'
-    eval("eval '__FILE__', binding, 'success'", binding).should == 'success'
-  end
+  ruby_version_is ""..."3.3" do
+    it "uses (eval) filename if none is provided" do
+      eval("__FILE__").should == "(eval)"
+      eval("__FILE__", binding).should == "(eval)"
+      eval("__FILE__", binding, "success").should == "success"
+      eval("eval '__FILE__', binding").should == "(eval)"
+      eval("eval '__FILE__', binding", binding).should == "(eval)"
+      eval("eval '__FILE__', binding", binding, 'success').should == '(eval)'
+      eval("eval '__FILE__', binding, 'success'", binding).should == 'success'
+    end
 
-  it 'uses (eval) for __FILE__ and 1 for __LINE__ with a binding argument' do
-    eval("[__FILE__, __LINE__]", binding).should == ["(eval)", 1]
+    it 'uses (eval) for __FILE__ and 1 for __LINE__ with a binding argument' do
+      eval("[__FILE__, __LINE__]", binding).should == ["(eval)", 1]
+    end
   end
 
+  ruby_version_is "3.3" do
+    it "uses (eval at __FILE__:__LINE__) if none is provided" do
+      eval("__FILE__").should == "(eval at #{__FILE__}:#{__LINE__})"
+      eval("__FILE__", binding).should == "(eval at #{__FILE__}:#{__LINE__})"
+      eval("__FILE__", binding, "success").should == "success"
+      eval("eval '__FILE__', binding").should == "(eval at (eval at #{__FILE__}:#{__LINE__}):1)"
+      eval("eval '__FILE__', binding", binding).should == "(eval at (eval at #{__FILE__}:#{__LINE__}):1)"
+      eval("eval '__FILE__', binding", binding, 'success').should == "(eval at success:1)"
+      eval("eval '__FILE__', binding, 'success'", binding).should == 'success'
+    end
+
+    it 'uses (eval at __FILE__:__LINE__) for __FILE__ and 1 for __LINE__ with a binding argument' do
+      eval("[__FILE__, __LINE__]", binding).should == ["(eval at #{__FILE__}:#{__LINE__})", 1]
+    end
+  end
   # Found via Rubinius bug github:#149
   it "does not alter the value of __FILE__ in the binding" do
     first_time =  EvalSpecs.call_eval
@@ -209,6 +226,20 @@ class Object
     -> { eval("return :eval") }.call.should == :eval
   end
 
+  it "returns from the method calling #eval when evaluating 'return'" do
+    def eval_return(n)
+      eval("return n*2")
+    end
+    -> { eval_return(3) }.call.should == 6
+  end
+
+  it "returns from the method calling #eval when evaluating 'return' in BEGIN" do
+    def eval_return(n)
+      eval("BEGIN {return n*3}")
+    end
+    -> { eval_return(4) }.call.should == 12
+  end
+
   it "unwinds through a Proc-style closure and returns from a lambda-style closure in the closure chain" do
     code = fixture __FILE__, "eval_return_with_lambda.rb"
     ruby_exe(code).chomp.should == "a,b,c,eval,f"

spec/ruby/core/module/const_get_spec.rb

@@ -105,7 +105,7 @@
     -> { ConstantSpecs.const_get("CS_CONST1", false) }.should raise_error(NameError)
   end
 
-  it "returns a constant whose module is defined the the toplevel" do
+  it "returns a constant whose module is defined the toplevel" do
     ConstantSpecs.const_get("ConstantSpecsTwo::Foo").should == :cs_two_foo
     ConstantSpecsThree.const_get("ConstantSpecsTwo::Foo").should == :cs_three_foo
   end

spec/ruby/core/module/name_spec.rb

@@ -6,55 +6,6 @@
     Module.new.name.should be_nil
   end
 
-  ruby_version_is "3.3" do
-    it "can assign a temporary name" do
-      m = Module.new
-      m.name.should be_nil
-
-      m.set_temporary_name("fake_name")
-      m.name.should == "fake_name"
-
-      m.set_temporary_name(nil)
-      m.name.should be_nil
-    end
-
-    it "can't assign empty string as name" do
-      m = Module.new
-      -> { m.set_temporary_name("") }.should raise_error(ArgumentError, "empty class/module name")
-    end
-
-    it "can't assign a constant name as a temporary name" do
-      m = Module.new
-      -> { m.set_temporary_name("Object") }.should raise_error(ArgumentError, "name must not be valid constant name")
-    end
-
-    it "can't assign name to permanent module" do
-      -> { Object.set_temporary_name("fake_name") }.should raise_error(RuntimeError, "can't change permanent name")
-    end
-
-    it "can assign a temporary name to a nested module" do
-      m = Module.new
-      module m::N; end
-      m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
-
-      m::N.set_temporary_name("fake_name")
-      m::N.name.should == "fake_name"
-
-      m::N.set_temporary_name(nil)
-      m::N.name.should be_nil
-    end
-
-    it "can update the name when assigned to a constant" do
-      m = Module.new
-      m::N = Module.new
-      m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
-      m::N.set_temporary_name(nil)
-
-      m::M = m::N
-      m::M.name.should =~ /\A#<Module:0x\h+>::M\z/m
-    end
-  end
-
   it "is not nil when assigned to a constant in an anonymous module" do
     m = Module.new
     m::N = Module.new

spec/ruby/core/module/set_temporary_name_spec.rb

@@ -0,0 +1,68 @@
+require_relative '../../spec_helper'
+
+ruby_version_is "3.3" do
+  describe "Module#set_temporary_name" do
+    it "can assign a temporary name" do
+      m = Module.new
+      m.name.should be_nil
+
+      m.set_temporary_name("fake_name")
+      m.name.should == "fake_name"
+
+      m.set_temporary_name(nil)
+      m.name.should be_nil
+    end
+
+    it "can assign a temporary name which is not a valid constant path" do
+      m = Module.new
+      m.set_temporary_name("a::B")
+      m.name.should == "a::B"
+
+      m.set_temporary_name("Template['foo.rb']")
+      m.name.should == "Template['foo.rb']"
+    end
+
+    it "can't assign empty string as name" do
+      m = Module.new
+      -> { m.set_temporary_name("") }.should raise_error(ArgumentError, "empty class/module name")
+    end
+
+    it "can't assign a constant name as a temporary name" do
+      m = Module.new
+      -> { m.set_temporary_name("Object") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    end
+
+    it "can't assign a constant path as a temporary name" do
+      m = Module.new
+      -> { m.set_temporary_name("A::B") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+      -> { m.set_temporary_name("::A") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+      -> { m.set_temporary_name("::A::B") }.should raise_error(ArgumentError, "the temporary name must not be a constant path to avoid confusion")
+    end
+
+    it "can't assign name to permanent module" do
+      -> { Object.set_temporary_name("fake_name") }.should raise_error(RuntimeError, "can't change permanent name")
+    end
+
+    it "can assign a temporary name to a nested module" do
+      m = Module.new
+      module m::N; end
+      m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
+
+      m::N.set_temporary_name("fake_name")
+      m::N.name.should == "fake_name"
+
+      m::N.set_temporary_name(nil)
+      m::N.name.should be_nil
+    end
+
+    it "can update the name when assigned to a constant" do
+      m = Module.new
+      m::N = Module.new
+      m::N.name.should =~ /\A#<Module:0x\h+>::N\z/
+      m::N.set_temporary_name(nil)
+
+      m::M = m::N
+      m::M.name.should =~ /\A#<Module:0x\h+>::M\z/m
+    end
+  end
+end