[GR-14806] Update specs.

PullRequest: truffleruby/879

Author: eregon

spec/mspec/Gemfile.lock

@@ -19,6 +19,3 @@ PLATFORMS
 DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 2.14.1)
-
-BUNDLED WITH
-   1.16.1

spec/mspec/lib/mspec/helpers/ruby_exe.rb

@@ -2,36 +2,29 @@
 require 'mspec/helpers/tmp'
 
 # The ruby_exe helper provides a wrapper for invoking the
-# same Ruby interpreter with the same falgs as the one running
+# same Ruby interpreter with the same flags as the one running
 # the specs and getting the output from running the code.
+#
 # If +code+ is a file that exists, it will be run.
-# Otherwise, +code+ should be Ruby code that will be run with
-# the -e command line option. For example:
+# Otherwise, +code+ will be written to a temporary file and be run.
+# For example:
 #
 #   ruby_exe('path/to/some/file.rb')
 #
 # will be executed as
 #
 #   `#{RUBY_EXE} 'path/to/some/file.rb'`
 #
-# while
-#
-#   ruby_exe('puts "hello, world."')
-#
-# will be executed as
-#
-#   `#{RUBY_EXE} -e 'puts "hello, world."'`
-#
 # The ruby_exe helper also accepts an options hash with three
 # keys: :options, :args and :env. For example:
 #
 #   ruby_exe('file.rb', :options => "-w",
-#                       :args => "> file.txt",
+#                       :args => "arg1 arg2",
 #                       :env => { :FOO => "bar" })
 #
 # will be executed as
 #
-#   `#{RUBY_EXE} -w #{'file.rb'} > file.txt`
+#   `#{RUBY_EXE} -w file.rb arg1 arg2`
 #
 # with access to ENV["FOO"] with value "bar".
 #
@@ -49,33 +42,11 @@
 # The RUBY_EXE constant is setup by mspec automatically
 # and is used by ruby_exe and ruby_cmd. The mspec runner script
 # will set ENV['RUBY_EXE'] to the name of the executable used
-# to invoke the mspec-run script. The value of RUBY_EXE will be
-# constructed as follows:
-#
-#   1. the value of ENV['RUBY_EXE']
-#   2. an explicit value based on RUBY_ENGINE
-#   3. cwd/(RUBY_ENGINE + $(EXEEXT) || $(exeext) || '')
-#   4. $(bindir)/$(RUBY_INSTALL_NAME)
+# to invoke the mspec-run script.
 #
 # The value will only be used if the file exists and is executable.
-# The flags will then be appended to the resulting value.
-#
-# These 4 ways correspond to the following scenarios:
-#
-#   1. Using the MSpec runner scripts, the name of the
-#      executable is explicitly passed by ENV['RUBY_EXE']
-#      so there is no ambiguity.
-#
-#  Otherwise, if using RSpec (or something else)
-#
-#   2. Running the specs while developing an alternative
-#      Ruby implementation. This explicitly names the
-#      executable in the development directory based on
-#      the value of RUBY_ENGINE.
-#   3. Running the specs within the source directory for
-#      some implementation. (E.g. a local build directory.)
-#   4. Running the specs against some installed Ruby
-#      implementation.
+# The flags will then be appended to the resulting value, such that
+# the RUBY_EXE constant contains both the executable and the flags.
 #
 # Additionally, the flags passed to mspec
 # (with -T on the command line or in the config with set :flags)
@@ -129,6 +100,10 @@ def resolve_ruby_exe
   raise Exception, "Unable to find a suitable ruby executable."
 end
 
+unless Object.const_defined?(:RUBY_EXE) and RUBY_EXE
+  RUBY_EXE = resolve_ruby_exe
+end
+
 def ruby_exe(code = :not_given, opts = {})
   if opts[:dir]
     raise "ruby_exe(..., dir: dir) is no longer supported, use Dir.chdir"
@@ -180,7 +155,3 @@ def ruby_cmd(code, opts = {})
 
   [RUBY_EXE, opts[:options], body, opts[:args]].compact.join(' ')
 end
-
-unless Object.const_defined?(:RUBY_EXE) and RUBY_EXE
-  RUBY_EXE = resolve_ruby_exe
-end

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

@@ -190,7 +190,7 @@ def verify_commits(impl)
     puts "Manually check commit messages:"
     print "Press enter >"
     STDIN.gets
-    sh "git", "log", "master..."
+    system "git", "log", "master..."
   end
 end
 

spec/ruby/core/binding/fixtures/irbrc

@@ -0,0 +1 @@
+# empty configuration

spec/ruby/core/binding/irb_spec.rb

@@ -4,8 +4,9 @@
   describe "Binding#irb" do
     it "creates an IRB session with the binding in scope" do
       irb_fixture = fixture __FILE__, "irb.rb"
+      irbrc_fixture = fixture __FILE__, "irbrc"
 
-      out = IO.popen([*ruby_exe, irb_fixture], "r+") do |pipe|
+      out = IO.popen([{"IRBRC"=>irbrc_fixture}, *ruby_exe, irb_fixture], "r+") do |pipe|
         pipe.puts "a ** 2"
         pipe.puts "exit"
         pipe.readlines.map(&:chomp)

spec/ruby/core/enumerable/tally_spec.rb

@@ -0,0 +1,35 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+ruby_version_is "2.7" do
+  describe "Enumerable#tally" do
+    before :each do
+      ScratchPad.record []
+    end
+
+    it "returns a hash with counts according to the value" do
+      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+      enum.tally.should == { 'foo' => 2, 'bar' => 1, 'baz' => 1}
+    end
+
+    it "returns a hash without default" do
+      hash = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz').tally
+      hash.default_proc.should be_nil
+      hash.default.should be_nil
+    end
+
+    it "returns an empty hash for empty enumerables" do
+      EnumerableSpecs::Empty.new.tally.should == {}
+    end
+
+    it "counts values as gathered array when yielded with multiple arguments" do
+      EnumerableSpecs::YieldsMixed2.new.tally.should == EnumerableSpecs::YieldsMixed2.gathered_yields.group_by(&:itself).transform_values(&:size)
+    end
+
+    it "does not call given block" do
+      enum = EnumerableSpecs::Numerous.new('foo', 'bar', 'foo', 'baz')
+      enum.tally { |v| ScratchPad << v }
+      ScratchPad.recorded.should == []
+    end
+  end
+end

spec/ruby/core/file/fixtures/file_types.rb

@@ -52,9 +52,9 @@ def self.symlink
   end
 
   def self.socket
-    require 'socket'
-    name = tmp("ftype_socket.socket")
-    rm_r name
+    require_relative '../../../library/socket/fixtures/classes.rb'
+
+    name = SocketSpecs.socket_path
     socket = UNIXServer.new name
     begin
       yield name

spec/ruby/core/file/stat/ftype_spec.rb

@@ -55,10 +55,6 @@
       end
     end
 
-    # This will silently not execute the block if no socket
-    # can be found. However, if you are running X, there is
-    # a good chance that if nothing else, at least the X
-    # Server socket exists.
     it "returns 'socket' when the file is a socket" do
       FileSpecs.socket do |socket|
         File.lstat(socket).ftype.should == 'socket'

spec/ruby/core/process/fixtures/clocks.rb

@@ -11,7 +11,7 @@ def self.clock_constants
       clocks -= [:CLOCK_BOOTTIME_ALARM, :CLOCK_REALTIME_ALARM]
     end
 
-    clocks.map { |c|
+    clocks.sort.map { |c|
       [c, Process.const_get(c)]
     }
   end

spec/ruby/core/process/getrlimit_spec.rb

@@ -41,9 +41,9 @@
     end
 
     context "when passed a Symbol" do
-      Process.constants.grep(/\ARLIMIT_/) do |fullname|
-        short = $'
-        it "coerces :#{short} into #{fullname}" do
+      it "coerces the short name into the full RLIMIT_ prefixed name" do
+        Process.constants.grep(/\ARLIMIT_/) do |fullname|
+          short = fullname[/\ARLIMIT_(.+)/, 1]
           Process.getrlimit(short.to_sym).should == Process.getrlimit(Process.const_get(fullname))
         end
       end
@@ -54,9 +54,9 @@
     end
 
     context "when passed a String" do
-      Process.constants.grep(/\ARLIMIT_/) do |fullname|
-        short = $'
-        it "coerces '#{short}' into #{fullname}" do
+      it "coerces the short name into the full RLIMIT_ prefixed name" do
+        Process.constants.grep(/\ARLIMIT_/) do |fullname|
+          short = fullname[/\ARLIMIT_(.+)/, 1]
           Process.getrlimit(short).should == Process.getrlimit(Process.const_get(fullname))
         end
       end