[GR-14806] Update specs

PullRequest: truffleruby/3214

Author: eregon

spec/mspec/lib/mspec/commands/mspec.rb

@@ -25,6 +25,7 @@ def options(argv = ARGV)
     config[:command] = argv.shift if ["ci", "run", "tag"].include?(argv[0])
 
     options = MSpecOptions.new "mspec [COMMAND] [options] (FILE|DIRECTORY|GLOB)+", 30, config
+    @options = options
 
     options.doc " The mspec command sets up and invokes the sub-commands"
     options.doc " (see below) to enable, for instance, running the specs"
@@ -110,8 +111,9 @@ def run
     if config[:multi]
       exit multi_exec(argv)
     else
-      $stderr.puts "$ #{argv.join(' ')}"
-      $stderr.flush
+      log = config[:options].include?('--error-output') ? $stdout : $stderr
+      log.puts "$ #{argv.join(' ')}"
+      log.flush
       exec(*argv, close_others: false)
     end
   end

spec/mspec/lib/mspec/runner/formatters/base.rb

@@ -1,6 +1,7 @@
 require 'mspec/expectations/expectations'
 require 'mspec/runner/actions/timer'
 require 'mspec/runner/actions/tally'
+require 'mspec/utils/options'
 
 if ENV['CHECK_LEAKS']
   require 'mspec/runner/actions/leakchecker'
@@ -18,10 +19,17 @@ def initialize(out = nil)
 
     @count = 0 # For subclasses
 
-    if out.nil?
+    if out
+      @out = File.open out, "w"
+    else
       @out = $stdout
+    end
+
+    err = MSpecOptions.latest && MSpecOptions.latest.config[:error_output]
+    if err
+      @err = (err == 'stderr') ? $stderr : File.open(err, "w")
     else
-      @out = File.open out, "w"
+      @err = @out
     end
   end
 
@@ -115,9 +123,9 @@ def finish
 
   def print_exception(exc, count)
     outcome = exc.failure? ? "FAILED" : "ERROR"
-    print "\n#{count})\n#{exc.description} #{outcome}\n"
-    print exc.message, "\n"
-    print exc.backtrace, "\n"
+    @err.print "\n#{count})\n#{exc.description} #{outcome}\n"
+    @err.print exc.message, "\n"
+    @err.print exc.backtrace, "\n"
   end
 
   # A convenience method to allow printing to different outputs.

spec/mspec/lib/mspec/utils/options.rb

@@ -32,6 +32,10 @@ class OptionError < Exception; end
   # Raised if an unrecognized option is encountered.
   class ParseError < Exception; end
 
+  class << self
+    attr_accessor :latest
+  end
+
   attr_accessor :config, :banner, :width, :options
 
   def initialize(banner = "", width = 30, config = nil)
@@ -46,7 +50,7 @@ def initialize(banner = "", width = 30, config = nil)
       @extra << x
     }
 
-    yield self if block_given?
+    MSpecOptions.latest = self
   end
 
   # Registers an option. Acceptable formats for arguments are:
@@ -311,6 +315,11 @@ def formatters
        "Write formatter output to FILE") do |f|
       config[:output] = f
     end
+
+    on("--error-output", "FILE",
+       "Write error output of failing specs to FILE, or $stderr if value is 'stderr'.") do |f|
+      config[:error_output] = f
+    end
   end
 
   def filters

spec/ruby/.mspec.constants

@@ -73,6 +73,7 @@ EvalBindingProcA
 Exception2MessageMapper
 ExceptionForMatrix
 Fcntl
+Fiddle
 FileStat
 FileUtils
 Find

spec/ruby/core/dir/read_spec.rb

@@ -56,9 +56,9 @@
       Encoding.default_external = Encoding::SHIFT_JIS
       shift_jis_entries = []
       begin
-        Dir.open(File.join(DirSpecs.mock_dir, 'special')) do |dir|
+        Dir.open(File.join(DirSpecs.mock_dir, 'special')) do |d|
           -> {
-            while entry = dir.read
+            while entry = d.read
               shift_jis_entries << entry
             end
           }.should_not raise_error

spec/ruby/core/exception/interrupt_spec.rb

@@ -49,10 +49,12 @@
     out.should == "Interrupt: #{Signal.list["INT"]}\n"
   end
 
-  it "shows the backtrace and has a signaled exit status" do
-    err = IO.popen([*ruby_exe, '-e', 'Process.kill :INT, Process.pid; sleep'], err: [:child, :out], &:read)
-    $?.termsig.should == Signal.list.fetch('INT')
-    err.should.include? ': Interrupt'
-    err.should.include? "from -e:1:in `<main>'"
+  platform_is_not :windows do
+    it "shows the backtrace and has a signaled exit status" do
+      err = IO.popen([*ruby_exe, '-e', 'Process.kill :INT, Process.pid; sleep'], err: [:child, :out], &:read)
+      $?.termsig.should == Signal.list.fetch('INT')
+      err.should.include? ': Interrupt'
+      err.should.include? "from -e:1:in `<main>'"
+    end
   end
 end

spec/ruby/core/rational/minus_spec.rb

@@ -1,7 +1,51 @@
-require_relative '../../shared/rational/minus'
+require_relative '../../spec_helper'
 require_relative '../../shared/rational/arithmetic_exception_in_coerce'
 
 describe "Rational#-" do
-  it_behaves_like :rational_minus, :-
   it_behaves_like :rational_arithmetic_exception_in_coerce, :-
+
+  it "calls #coerce on the passed argument with self" do
+    rational = Rational(3, 4)
+    obj = mock("Object")
+    obj.should_receive(:coerce).with(rational).and_return([1, 2])
+
+    rational - obj
+  end
+
+  it "calls #- on the coerced Rational with the coerced Object" do
+    rational = Rational(3, 4)
+
+    coerced_rational = mock("Coerced Rational")
+    coerced_rational.should_receive(:-).and_return(:result)
+
+    coerced_obj = mock("Coerced Object")
+
+    obj = mock("Object")
+    obj.should_receive(:coerce).and_return([coerced_rational, coerced_obj])
+
+    (rational - obj).should == :result
+  end
+end
+
+describe "Rational#- passed a Rational" do
+  it "returns the result of subtracting other from self as a Rational" do
+    (Rational(3, 4) - Rational(0, 1)).should eql(Rational(3, 4))
+    (Rational(3, 4) - Rational(1, 4)).should eql(Rational(1, 2))
+
+    (Rational(3, 4) - Rational(2, 1)).should eql(Rational(-5, 4))
+  end
+end
+
+describe "Rational#- passed a Float" do
+  it "returns the result of subtracting other from self as a Float" do
+    (Rational(3, 4) - 0.2).should eql(0.55)
+    (Rational(3, 4) - 2.5).should eql(-1.75)
+  end
+end
+
+describe "Rational#- passed an Integer" do
+  it "returns the result of subtracting other from self as a Rational" do
+    (Rational(3, 4) - 1).should eql(Rational(-1, 4))
+    (Rational(3, 4) - 2).should eql(Rational(-5, 4))
+  end
 end

spec/ruby/core/string/shared/to_sym.rb

@@ -53,6 +53,15 @@
     sym.to_s.should == binary_string
   end
 
+  it "ignores exising symbols with different encoding" do
+    source = "fée"
+
+    iso_symbol = source.force_encoding(Encoding::ISO_8859_1).send(@method)
+    iso_symbol.encoding.should == Encoding::ISO_8859_1
+    binary_symbol = source.force_encoding(Encoding::BINARY).send(@method)
+    binary_symbol.encoding.should == Encoding::BINARY
+  end
+
   it "raises an EncodingError for UTF-8 String containing invalid bytes" do
     invalid_utf8 = "\xC3"
     invalid_utf8.should_not.valid_encoding?

spec/ruby/language/predefined_spec.rb

@@ -1324,6 +1324,7 @@ def obj.foo2; yield; end
 
     it "returns what will be loaded without actual loading, .so file" do
       require 'rbconfig'
+      skip "no dynamically loadable standard extension" if RbConfig::CONFIG["EXTSTATIC"] == "static"
 
       extension, path = $LOAD_PATH.resolve_feature_path('etc')
       extension.should == :so

spec/ruby/library/date/iso8601_spec.rb

@@ -17,20 +17,11 @@
     d.should == Date.civil(-4712, 1, 1)
   end
 
-  it "parses a Symbol into a Date object" do
-    d = Date.iso8601(:'2015-10-15')
-    d.should == Date.civil(2015, 10, 15)
-  end
-
   it "parses a StringSubclass into a Date object" do
     d = Date.iso8601(Class.new(String).new("-4712-01-01"))
     d.should == Date.civil(-4712, 1, 1)
   end
 
-  it "raises an ArgumentError when passed a Symbol without a valid Date" do
-    -> { Date.iso8601(:test) }.should raise_error(ArgumentError)
-  end
-
   it "raises a TypeError when passed an Object" do
     -> { Date.iso8601(Object.new) }.should raise_error(TypeError)
   end