[GR-14806] Update specs.

PullRequest: truffleruby/2025

Author: eregon

spec/mspec/lib/mspec/utils/warnings.rb

@@ -1,6 +1,12 @@
 require 'mspec/guards/version'
 
-if RUBY_ENGINE == "ruby"
+# Always enable deprecation warnings when running MSpec, as ruby/spec tests for them,
+# and like in most test frameworks, all warnings should be enabled by default (same as -w).
+if Object.const_defined?(:Warning) and Warning.respond_to?(:[]=)
+  Warning[:deprecated] = true
+end
+
+if Object.const_defined?(:Warning) and Warning.respond_to?(:warn)
   def Warning.warn(message)
     # Suppress any warning inside the method to prevent recursion
     verbose = $VERBOSE

spec/mspec/tool/sync/sync-rubyspec.rb

@@ -157,12 +157,16 @@ def rebase_commits(impl)
   end
 end
 
+def new_commits?(impl)
+  Dir.chdir(SOURCE_REPO) do
+    diff = `git diff master #{impl.rebased_branch}`
+    !diff.empty?
+  end
+end
+
 def test_new_specs
   require "yaml"
   Dir.chdir(SOURCE_REPO) do
-    diff = `git diff master`
-    abort "#{BRIGHT_YELLOW}No new commits, aborting#{RESET}" if diff.empty?
-
     workflow = YAML.load_file(".github/workflows/ci.yml")
     job_name = MSPEC ? "test" : "specs"
     versions = workflow.dig("jobs", job_name, "strategy", "matrix", "ruby")
@@ -195,8 +199,8 @@ def verify_commits(impl)
 def fast_forward_master(impl)
   Dir.chdir(SOURCE_REPO) do
     sh "git", "checkout", "master"
-    sh "git", "merge", "--ff-only", "#{impl.name}-rebased"
-    sh "git", "branch", "--delete", "#{impl.name}-rebased"
+    sh "git", "merge", "--ff-only", impl.rebased_branch
+    sh "git", "branch", "--delete", impl.rebased_branch
   end
 end
 
@@ -215,10 +219,15 @@ def main(impls)
     update_repo(impl)
     filter_commits(impl)
     rebase_commits(impl)
-    test_new_specs
-    verify_commits(impl)
-    fast_forward_master(impl)
-    check_ci
+    if new_commits?(impl)
+      test_new_specs
+      verify_commits(impl)
+      fast_forward_master(impl)
+      check_ci
+    else
+      STDERR.puts "#{BRIGHT_YELLOW}No new commits#{RESET}"
+      fast_forward_master(impl)
+    end
   end
 end
 

spec/ruby/README.md

@@ -5,6 +5,8 @@
 
 The Ruby Spec Suite, abbreviated `ruby/spec`, is a test suite for the behavior of the Ruby programming language.
 
+### Description and Motivation
+
 It is not a standardized specification like the ISO one, and does not aim to become one.
 Instead, it is a practical tool to describe and test the behavior of Ruby with code.
 
@@ -30,20 +32,24 @@ ruby/spec is known to be tested in these implementations for every commit:
 ruby/spec describes the behavior of Ruby 2.5 and more recent Ruby versions.
 More precisely, every latest stable MRI release should [pass](https://travis-ci.org/ruby/spec) all specs of ruby/spec (2.5.x, 2.6.x, 2.7.x, etc), and those are tested in TravisCI.
 
+### Synchronization with Ruby Implementations
+
 The specs are synchronized both ways around once a month by @eregon between ruby/spec, MRI, JRuby and TruffleRuby.
 Each of these repositories has a full copy of the specs under `spec/ruby` to ease editing specs.
 Any of these repositories can be used to add or edit specs, use what is most convenient for you.
 
-For *testing* a Ruby implementation, one should always test against the implementation's copy of the specs under `spec/ruby`, as that's what the Ruby implementation tests against in their CI.
+For *testing* the development version of a Ruby implementation, one should always test against that implementation's copy of the specs under `spec/ruby`, as that's what the Ruby implementation tests against in their CI.
 Also, this repository doesn't always contain the latest spec changes from MRI (it's synchronized monthly), and does not contain tags (specs marked as failing on that Ruby implementation).
-Running specs in a Ruby implementation can be done with:
+Running specs on a Ruby implementation can be done with:
 
 ```
 $ cd ruby_implementation/spec/ruby
 # Add ../ruby_implementation/bin in PATH, or pass -t /path/to/bin/ruby
 $ ../mspec/bin/mspec
 ```
 
+### Specs for old Ruby versions
+
 For older specs try these commits:
 * Ruby 2.0.0-p647 - [Suite](https://github.com/ruby/spec/commit/245862558761d5abc676843ef74f86c9bcc8ea8d) using [MSpec](https://github.com/ruby/mspec/commit/f90efa068791064f955de7a843e96e2d7d3041c2) (may encounter 2 failures)
 * Ruby 2.1.9 - [Suite](https://github.com/ruby/spec/commit/f029e65241374386077ac500add557ae65069b55) using [MSpec](https://github.com/ruby/mspec/commit/55568ea3918c6380e64db8c567d732fa5781efed)

spec/ruby/command_line/feature_spec.rb

@@ -37,11 +37,16 @@
     ruby_exe("p 'foo'.frozen?", options: "--disable-frozen-string-literal").chomp.should == "false"
   end
 
-  it "can be used with all" do
+  it "can be used with all for enable" do
     e = "p [defined?(Gem), defined?(DidYouMean), $VERBOSE, 'foo'.frozen?]"
     env = {'RUBYOPT' => '-w'}
-    ruby_exe(e, options: "--enable=all", env: env).chomp.should == "[\"constant\", \"constant\", true, true]"
+    # Use a single variant here because it can be quite slow as it might enable jit, etc
     ruby_exe(e, options: "--enable-all", env: env).chomp.should == "[\"constant\", \"constant\", true, true]"
+  end
+
+  it "can be used with all for disable" do
+    e = "p [defined?(Gem), defined?(DidYouMean), $VERBOSE, 'foo'.frozen?]"
+    env = {'RUBYOPT' => '-w'}
     ruby_exe(e, options: "--disable=all", env: env).chomp.should == "[nil, nil, false, false]"
     ruby_exe(e, options: "--disable-all", env: env).chomp.should == "[nil, nil, false, false]"
   end

spec/ruby/core/binding/eval_spec.rb

@@ -23,7 +23,7 @@
     bind2.local_variables.should == []
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "inherits __LINE__ from the enclosing scope" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
@@ -50,7 +50,7 @@
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "starts with line 1 if single argument is given" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
@@ -89,15 +89,15 @@
     bind.eval("#foo\n__LINE__", "(test)", 88).should == 89
   end
 
-  ruby_version_is ""..."2.8" do
+  ruby_version_is ""..."3.0" do
     it "inherits __FILE__ from the enclosing scope" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding
       suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "Uses (eval) as __FILE__ if single argument given" do
       obj = BindingSpecs::Demo.new(1)
       bind = obj.get_binding

spec/ruby/core/complex/to_c_spec.rb

@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+
+describe "Complex#to_c" do
+  it "returns self" do
+    value = Complex(1, 5)
+    value.to_c.should equal(value)
+  end
+
+  it 'returns the same value' do
+    Complex(1, 5).to_c.should == Complex(1, 5)
+  end
+end

spec/ruby/core/env/delete_spec.rb

@@ -30,7 +30,7 @@
     ScratchPad.recorded.should == "foo"
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "returns the result of given block if the named environment variable does not exist" do
       ENV.delete("foo")
       ENV.delete("foo") { |name| "bar" }.should == "bar"

spec/ruby/core/exception/no_method_error_spec.rb

@@ -104,7 +104,7 @@ def inspect
     end
   end
 
-  ruby_version_is "2.8" do
+  ruby_version_is "3.0" do
     it "uses #name to display the receiver if it is a class or a module" do
       klass = Class.new { def self.name; "MyClass"; end }
       begin

spec/ruby/core/exception/top_level_spec.rb

@@ -9,7 +9,7 @@
     it "the Exception#cause is printed to STDERR with backtraces" do
       code = <<-RUBY
       def raise_cause
-        raise "the cause" 
+        raise "the cause"
       end
       def raise_wrapped
         raise "wrapped"
@@ -22,7 +22,7 @@ def raise_wrapped
       RUBY
       lines = ruby_exe(code, args: "2>&1").lines
       lines.reject! { |l| l.include?('rescue in') }
-      lines.map! { |l| l.split(':')[2..-1].join(':').chomp }
+      lines.map! { |l| l.chomp[/:(in.+)/, 1] }
       lines.should == ["in `raise_wrapped': wrapped (RuntimeError)",
                        "in `<main>'",
                        "in `raise_cause': the cause (RuntimeError)",

spec/ruby/core/hash/except_spec.rb

@@ -0,0 +1,33 @@
+require_relative '../../spec_helper'
+
+ruby_version_is "3.0" do
+  describe "Hash#except" do
+    before :each do
+      @hash = { a: 1, b: 2, c: 3 }
+    end
+
+    it "returns a new duplicate hash without arguments" do
+      ret = @hash.except
+      ret.should_not equal(@hash)
+      ret.should == @hash
+    end
+
+    it "returns a hash without the requested subset" do
+      @hash.except(:c, :a).should == { b: 2 }
+    end
+
+    it "ignores keys not present in the original hash" do
+      @hash.except(:a, :chunky_bacon).should == { b: 2, c: 3 }
+    end
+
+    it "returns an instance of a subclass" do
+      klass = Class.new(Hash)
+      h = klass.new
+      h[:bar] = 12
+      h[:foo] = 42
+      r = h.except(:foo)
+      r.should == {bar: 12}
+      r.class.should == klass
+    end
+  end
+end