Update to ruby/spec@aaf998f

Author: eregon

spec/ruby/README.md

@@ -18,13 +18,13 @@ Every example code has a textual description, which presents several advantages:
 
 The specs are written with syntax similar to RSpec 2.
 They are run with MSpec, the purpose-built framework for running the Ruby Spec Suite.
-For more information, see the [MSpec](http://github.com/ruby/mspec) project.
+For more information, see the [MSpec](https://github.com/ruby/mspec) project.
 
 The specs describe the [language syntax](language/), the [core library](core/), the [standard library](library/), the [C API for extensions](optional/capi) and the [command line flags](command_line/).
 The language specs are grouped by keyword while the core and standard library specs are grouped by class and method.
 
 ruby/spec is known to be tested in these implementations for every commit:
-* [MRI](http://rubyci.org/) on 30 platforms and 4 versions
+* [MRI](https://rubyci.org/) on 30 platforms and 4 versions
 * [JRuby](https://github.com/jruby/jruby/tree/master/spec/ruby) for both 1.7 and 9.x
 * [TruffleRuby](https://github.com/oracle/truffleruby/tree/master/spec/ruby)
 * [Opal](https://github.com/opal/opal/tree/master/spec)
@@ -70,7 +70,7 @@ Then move to it:
 
     $ cd spec
 
-Clone [MSpec](http://github.com/ruby/mspec):
+Clone [MSpec](https://github.com/ruby/mspec):
 
     $ git clone https://github.com/ruby/mspec.git ../mspec
 
@@ -152,5 +152,5 @@ This project was originally born from [Rubinius](https://github.com/rubinius/rub
 The revision history of these specs is available [here](https://github.com/ruby/spec/blob/2b886623/CHANGES.before-2008-05-10).
 These specs were later extracted to their own project, RubySpec, with a specific vision and principles.
 At the end of 2014, Brian Shirai, the creator of RubySpec, decided to [end RubySpec](http://rubinius.com/2014/12/31/matz-s-ruby-developers-don-t-use-rubyspec/).
-A couple months later, the different repositories were merged and [the project was revived](http://eregon.github.io/rubyspec/2015/07/29/rubyspec-is-reborn.html).
+A couple months later, the different repositories were merged and [the project was revived](https://eregon.github.io/rubyspec/2015/07/29/rubyspec-is-reborn.html).
 On 12 January 2016, the name was changed to "The Ruby Spec Suite" for clarity and to let the RubySpec ideology rest in peace.

spec/ruby/core/dir/home_spec.rb

@@ -28,7 +28,7 @@
       end
     end
 
-    platform_is_not :windows, :solaris, :android do
+    platform_is_not :windows, :solaris, :android, :wasi do
       it "returns the named user's home directory, from the user database" do
         Dir.home(ENV['USER']).should == `echo ~#{ENV['USER']}`.chomp
       end

spec/ruby/core/kernel/define_singleton_method_spec.rb

@@ -96,4 +96,19 @@ def o.define(name)
       o.define(:foo) { raise "not used" }
     }.should raise_error(ArgumentError)
   end
+
+  it "always defines the method with public visibility" do
+    cls = Class.new
+    def cls.define(name, &block)
+      private
+      define_singleton_method(name, &block)
+    end
+
+    -> {
+      suppress_warning do
+        cls.define(:foo) { :ok }
+      end
+      cls.foo.should == :ok
+    }.should_not raise_error(NoMethodError)
+  end
 end

spec/ruby/core/kernel/open_spec.rb

@@ -27,7 +27,7 @@
     open(@name, "r") { |f| f.gets }.should == @content
   end
 
-  platform_is_not :windows do
+  platform_is_not :windows, :wasi do
     it "opens an io when path starts with a pipe" do
       @io = open("|date")
       begin

spec/ruby/core/kernel/require_relative_spec.rb

@@ -207,7 +207,7 @@
       $LOADED_FEATURES.should include(@abs_path)
     end
 
-    platform_is_not :windows do
+    platform_is_not :windows, :wasi do
       describe "with symlinks" do
         before :each do
           @symlink_to_code_dir = tmp("codesymlink")

spec/ruby/core/module/ruby2_keywords_spec.rb

@@ -79,7 +79,7 @@ def kwargs(**kw)
       after_usage.should == h
       after_usage.should_not.equal?(h)
       after_usage.should_not.equal?(marked)
-      ruby_bug "#18625", ""..."3.2" do
+      ruby_bug "#18625", ""..."3.3" do # might be fixed in 3.2
         Hash.ruby2_keywords_hash?(after_usage).should == false
       end
       Hash.ruby2_keywords_hash?(marked).should == true

spec/ruby/core/proc/parameters_spec.rb

@@ -20,6 +20,21 @@
     proc {|x| }.parameters.first.first.should == :opt
   end
 
+  ruby_version_is "3.2" do
+    it "sets the first element of each sub-Array to :req if argument would be required if a lambda if lambda keyword used" do
+      proc {|x| }.parameters(lambda: true).first.first.should == :req
+      proc {|y,*x| }.parameters(lambda: true).first.first.should == :req
+    end
+
+    it "regards named parameters in procs as required if lambda keyword used" do
+      proc {|x| }.parameters(lambda: true).first.first.should == :req
+    end
+
+    it "regards named parameters in lambda as optional if lambda: false keyword used" do
+      -> x { }.parameters(lambda: false).first.first.should == :opt
+    end
+  end
+
   it "regards optional keyword parameters in procs as optional" do
     proc {|x: :y| }.parameters.first.first.should == :key
   end

spec/ruby/core/struct/new_spec.rb

@@ -62,11 +62,20 @@ def obj.to_str() "Foo" end
     -> { Struct.new(:animal, ['chris', 'evan'])    }.should raise_error(TypeError)
   end
 
-  it "raises a TypeError or ArgumentError if passed a Hash with an unknown key" do
-    # CRuby raises ArgumentError: unknown keyword: :name, but that seems a bug
-    -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(StandardError) { |e|
-      [ArgumentError, TypeError].should.include?(e.class)
-    }
+  ruby_version_is ""..."3.2" do
+    it "raises a TypeError or ArgumentError if passed a Hash with an unknown key" do
+      # CRuby < 3.2 raises ArgumentError: unknown keyword: :name, but that seems a bug:
+      # https://bugs.ruby-lang.org/issues/18632
+      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(StandardError) { |e|
+        [ArgumentError, TypeError].should.include?(e.class)
+      }
+    end
+  end
+
+  ruby_version_is "3.2" do
+    it "raises a TypeError if passed a Hash with an unknown key" do
+      -> { Struct.new(:animal, { name: 'chris' }) }.should raise_error(TypeError)
+    end
   end
 
   it "raises ArgumentError when there is a duplicate member" do

spec/ruby/language/keyword_arguments_spec.rb

@@ -125,7 +125,7 @@ def m(*args, **kwargs)
       end
 
       it "works with -> (*args, **kwargs) {}" do
-        m = -> (*args, **kwargs) do
+        m = -> *args, **kwargs do
           target(*args, **kwargs)
         end
 
@@ -261,8 +261,8 @@ def y(args)
             yield(*args)
           end
 
-          ruby2_keywords def m(*args)
-            y(args, &-> (*args, **kwargs) { target(*args, **kwargs) })
+          ruby2_keywords def m(*outer_args)
+            y(outer_args, &-> *args, **kwargs { target(*args, **kwargs) })
           end
         end
 

spec/ruby/language/predefined_spec.rb

@@ -854,6 +854,8 @@ def obj.foo2; yield; end
   end
 
   it "default $LOAD_PATH entries until sitelibdir included have @gem_prelude_index set" do
+    skip "no sense in ruby itself" if MSpecScript.instance_variable_defined?(:@testing_ruby)
+
     $:.should.include?(RbConfig::CONFIG['sitelibdir'])
     idx = $:.index(RbConfig::CONFIG['sitelibdir'])