jruby · Sep 28, 2017 · Sep 28, 2017 · Sep 28, 2017 · Sep 28, 2017
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml
@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
+before_script:
+  # https://github.com/travis-ci/travis-ci/issues/8408
+  - unset _JAVA_OPTIONS
 script:
   - bundle exec rspec
 matrix:

diff --git a/spec/mspec/lib/mspec/matchers/raise_error.rb b/spec/mspec/lib/mspec/matchers/raise_error.rb
@@ -53,13 +53,19 @@ def format_exception(exception)
     exception_class_and_message(exception.class, exception.message)
   end
 
+  def format_result(result)
+    result.pretty_inspect.chomp
+  rescue => e
+    "#pretty_inspect raised #{e.class}; A #<#{result.class}>"
+  end
+
   def failure_message
     message = ["Expected #{format_expected_exception}"]
 
     if @actual
       message << "but got #{format_exception(@actual)}"
     else
-      message << "but no exception was raised (#{@result.pretty_inspect.chomp} was returned)"
+      message << "but no exception was raised (#{format_result(@result)} was returned)"
     end
 
     message

diff --git a/spec/mspec/spec/matchers/raise_error_spec.rb b/spec/mspec/spec/matchers/raise_error_spec.rb
@@ -90,6 +90,18 @@ class UnexpectedException < Exception; end
       ["Expected ExpectedException (expected)", "but no exception was raised (nil was returned)"]
   end
 
+  it "provides a useful failure message when no exception is raised and the result raises in #pretty_inspect" do
+    result = Object.new
+    def result.pretty_inspect
+      raise ArgumentError, "bad"
+    end
+    proc = Proc.new { result }
+    matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
+    matcher.matches?(proc)
+    matcher.failure_message.should ==
+      ["Expected ExpectedException (expected)", "but no exception was raised (#pretty_inspect raised ArgumentError; A #<Object> was returned)"]
+  end
+
   it "provides a useful negative failure message" do
     proc = Proc.new { raise ExpectedException, "expected" }
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")

diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -13,7 +13,6 @@
   mri: {
     git: "https://github.com/ruby/ruby.git",
     master: "trunk",
-    prefix: "spec/rubyspec",
     merge_message: "Update to ruby/spec@",
   },
 }
@@ -71,8 +70,7 @@ def last_merge_message
   end
 
   def prefix
-    return "spec/mspec" if MSPEC
-    @data[:prefix] || "spec/ruby"
+    MSPEC ? "spec/mspec" : "spec/ruby"
   end
 
   def rebased_branch

diff --git a/spec/ruby/appveyor.yml b/spec/ruby/appveyor.yml
@@ -1,18 +1,29 @@
 ---
 version: "{build}"
 clone_depth: 5
+init:
+  # To avoid duplicated executables in PATH, see https://github.com/ruby/spec/pull/468
+  - set PATH=C:\ruby%RUBY_VERSION%\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32;C:\Program Files;C:\Windows
+  # Loads trunk build and updates MSYS2 / MinGW to most recent gcc compiler
+  - if %ruby_version%==_trunk (
+      appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
+      7z x C:\ruby_trunk.7z -oC:\ruby_trunk & C:\ruby_trunk\trunk_msys2.cmd)
 environment:
   matrix:
     - RUBY_VERSION: 23-x64
+    - RUBY_VERSION: 24-x64
+    - RUBY_VERSION: _trunk # So the folder name is ruby_trunk
 install:
-  - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - ruby --version
-  - call "C:\Ruby23-x64\DevKit\devkitvars.bat"
   - git clone https://github.com/ruby/mspec.git ../mspec
 build: off
 test_script:
   - SET CHECK_LEAKS=true
-  - ../mspec/bin/mspec -ff
+  - ../mspec/bin/mspec -rdevkit -ff
+on_finish:
+  - ruby -v
+matrix:
+  allow_failures:
+    - ruby_version: _trunk
 branches:
   only:
     - master

diff --git a/spec/ruby/command_line/dash_v_spec.rb b/spec/ruby/command_line/dash_v_spec.rb
@@ -6,8 +6,7 @@
 
   describe "when used alone" do
     it "prints version and ends" do
-      version = ruby_exe(nil, args: '--version')
-      ruby_exe(nil, args: '-v').should == version
+      ruby_exe(nil, args: '-v').include?(RUBY_DESCRIPTION).should == true
     end
   end
 end
diff --git a/spec/ruby/core/array/flatten_spec.rb b/spec/ruby/core/array/flatten_spec.rb
@@ -111,18 +111,34 @@
       lambda { [@obj].flatten }.should raise_error(TypeError)
     end
 
+    ruby_version_is ""..."2.5" do
+      it "calls respond_to_missing?(:to_ary, false) to try coercing" do
+        def @obj.respond_to_missing?(*args) ScratchPad << args; false end
+        [@obj].flatten.should == [@obj]
+        ScratchPad.recorded.should == [[:to_ary, false]]
+      end
+    end
+
+    ruby_version_is "2.5" do
+      it "calls respond_to_missing?(:to_ary, true) to try coercing" do
+        def @obj.respond_to_missing?(*args) ScratchPad << args; false end
+        [@obj].flatten.should == [@obj]
+        ScratchPad.recorded.should == [[:to_ary, true]]
+      end
+    end
+
     it "does not call #to_ary if not defined when #respond_to_missing? returns false" do
-      def @obj.respond_to_missing?(*args) ScratchPad << args; false end
+      def @obj.respond_to_missing?(name, priv) ScratchPad << name; false end
 
       [@obj].flatten.should == [@obj]
-      ScratchPad.recorded.should == [[:to_ary, false]]
+      ScratchPad.recorded.should == [:to_ary]
     end
 
     it "calls #to_ary if not defined when #respond_to_missing? returns true" do
-      def @obj.respond_to_missing?(*args) ScratchPad << args; true end
+      def @obj.respond_to_missing?(name, priv) ScratchPad << name; true end
 
       lambda { [@obj].flatten }.should raise_error(NoMethodError)
-      ScratchPad.recorded.should == [[:to_ary, false]]
+      ScratchPad.recorded.should == [:to_ary]
     end
 
     it "calls #method_missing if defined" do

diff --git a/spec/ruby/core/dir/mkdir_spec.rb b/spec/ruby/core/dir/mkdir_spec.rb
@@ -55,11 +55,11 @@
   end
 
   it "raises Errno::EEXIST if the specified directory already exists" do
-    lambda { Dir.mkdir(File.dirname(__FILE__)) }.should raise_error(Errno::EEXIST)
+    lambda { Dir.mkdir("#{DirSpecs.mock_dir}/dir") }.should raise_error(Errno::EEXIST)
   end
 
   it "raises Errno::EEXIST if the argument points to the existing file" do
-    lambda { Dir.mkdir(__FILE__) }.should raise_error(Errno::EEXIST)
+    lambda { Dir.mkdir("#{DirSpecs.mock_dir}/file_one.ext") }.should raise_error(Errno::EEXIST)
   end
 end
 

diff --git a/spec/ruby/core/io/select_spec.rb b/spec/ruby/core/io/select_spec.rb
@@ -108,6 +108,7 @@
     end
 
     Thread.pass while t.status && t.status != "sleep"
+    t.join unless t.status
     t.status.should == "sleep"
     t.kill
     t.join

diff --git a/spec/ruby/core/string/include_spec.rb b/spec/ruby/core/string/include_spec.rb
@@ -25,4 +25,11 @@
     lambda { "hello".include?('h'.ord)  }.should raise_error(TypeError)
     lambda { "hello".include?(mock('x')) }.should raise_error(TypeError)
   end
+
+  it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
+    pat = "ア".encode Encoding::EUC_JP
+    lambda do
+      "あれ".include?(pat)
+    end.should raise_error(Encoding::CompatibilityError)
+  end
 end
diff --git a/spec/ruby/library/date/day_spec.rb b/spec/ruby/library/date/day_spec.rb
@@ -2,5 +2,8 @@
 require 'date'
 
 describe "Date#day" do
-  it "needs to be reviewed for spec completeness"
+  it "returns the day" do
+    d = Date.new(2000, 7, 1).day
+    d.should == 1
+  end
 end
diff --git a/spec/ruby/library/date/month_spec.rb b/spec/ruby/library/date/month_spec.rb
@@ -2,5 +2,8 @@
 require 'date'
 
 describe "Date#month" do
-  it "needs to be reviewed for spec completeness"
+  it "returns the month" do
+    m = Date.new(2000, 7, 1).month
+    m.should == 7
+  end
 end
diff --git a/spec/ruby/library/date/next_day_spec.rb b/spec/ruby/library/date/next_day_spec.rb
@@ -0,0 +1,10 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "Date#next_day" do
+  it "returns the next day" do
+    d = Date.new(2000, 1, 5)
+    d1 = Date.new(2000, 1, 4).next_day
+    d1.should == d
+  end
+end
diff --git a/spec/ruby/library/date/next_month_spec.rb b/spec/ruby/library/date/next_month_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "Date#next_month" do
+  it "returns the next month" do
+    d = Date.new(2000, 7, 1).next_month
+    d.should == Date.new(2000, 8, 1)
+  end
+
+  it "returns three months later" do
+    d = Date.new(2000, 7, 1).next_month(3)
+    d.should == Date.new(2000, 10, 1)
+  end
+end
diff --git a/spec/ruby/library/date/prev_day_spec.rb b/spec/ruby/library/date/prev_day_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "Date#prev_day" do
+  it "returns previous day" do
+    d = Date.new(2000, 7, 2).prev_day
+    d.should == Date.new(2000, 7, 1)
+  end
+
+  it "returns three days ago" do
+    d = Date.new(2000, 7, 4).prev_day(3)
+    d.should == Date.new(2000, 7, 1)
+  end
+end
diff --git a/spec/ruby/library/date/prev_month_spec.rb b/spec/ruby/library/date/prev_month_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require 'date'
+
+describe "Date#prev_month" do
+  it "returns previous month" do
+    d = Date.new(2000, 9, 1).prev_month
+    d.should == Date.new(2000, 8, 1)
+  end
+
+  it "returns three months ago" do
+    d = Date.new(2000, 10, 1).prev_month(3)
+    d.should == Date.new(2000, 7, 1)
+  end
+end
diff --git a/spec/ruby/library/date/year_spec.rb b/spec/ruby/library/date/year_spec.rb
@@ -2,5 +2,8 @@
 require 'date'
 
 describe "Date#year" do
-  it "needs to be reviewed for spec completeness"
+  it "returns the year" do
+    y = Date.new(2000, 7, 1).year
+    y.should == 2000
+  end
 end
diff --git a/spec/ruby/library/fiber/current_spec.rb b/spec/ruby/library/fiber/current_spec.rb
@@ -10,7 +10,7 @@
       # We can always transfer to the root Fiber; it will never die
       5.times do
         root.transfer.should be_nil
-        root.alive?.should_not be_false #Workaround for bug #1547
+        root.alive?.should be_true
       end
     end
 
@@ -19,39 +19,31 @@
         this = Fiber.current
         this.should be_an_instance_of(Fiber)
         this.should == fiber
-        this.alive?.should_not be_false # Workaround for bug #1547
+        this.alive?.should be_true
       end
       fiber.resume
     end
 
     it "returns the current Fiber when called from a Fiber that transferred to another" do
-
       states = []
       fiber = Fiber.new do
         states << :fiber
         this = Fiber.current
         this.should be_an_instance_of(Fiber)
-        this.should === fiber
-        this.alive?.should_not be_false # Workaround for bug #1547
+        this.should == fiber
+        this.alive?.should be_true
       end
 
       fiber2 = Fiber.new do
         states << :fiber2
         fiber.transfer
-        this = Fiber.current
-        this.should be_an_instance_of(Fiber)
-        this.should === fiber2
-        this.alive?.should_not be_false # Workaround for bug #1547
+        flunk
       end
 
       fiber3 = Fiber.new do
         states << :fiber3
         fiber2.transfer
-        this = Fiber.current
-        this.should be_an_instance_of(Fiber)
-        this.should === fiber3
-        this.alive?.should_not be_false # Workaround for bug #1547
-        fiber2.transfer
+        flunk
       end
 
       fiber3.resume

diff --git a/spec/ruby/library/net/ftp/initialize_spec.rb b/spec/ruby/library/net/ftp/initialize_spec.rb
@@ -5,6 +5,10 @@
   before :each do
     @ftp = Net::FTP.allocate
     @ftp.stub!(:connect)
+    @port_args = []
+    ruby_version_is "2.5" do
+      @port_args << 21
+    end
   end
 
   it "is private" do
@@ -44,14 +48,14 @@
 
   describe "when passed host" do
     it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost")
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
       @ftp.send(:initialize, "localhost")
     end
   end
 
   describe "when passed host, user" do
     it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost")
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
       @ftp.send(:initialize, "localhost")
     end
 
@@ -63,7 +67,7 @@
 
   describe "when passed host, user, password" do
     it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost")
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
       @ftp.send(:initialize, "localhost")
     end
 
@@ -75,7 +79,7 @@
 
   describe "when passed host, user" do
     it "tries to connect to the passed host" do
-      @ftp.should_receive(:connect).with("localhost")
+      @ftp.should_receive(:connect).with("localhost", *@port_args)
       @ftp.send(:initialize, "localhost")
     end
 

diff --git a/spec/ruby/library/set/case_equality_spec.rb b/spec/ruby/library/set/case_equality_spec.rb
@@ -0,0 +1,9 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/include', __FILE__)
+require 'set'
+
+ruby_version_is "2.5" do
+  describe "Set#===" do
+    it_behaves_like :set_include, :===
+  end
+end
diff --git a/spec/ruby/library/set/sortedset/add_spec.rb b/spec/ruby/library/set/sortedset/add_spec.rb
@@ -12,7 +12,9 @@
   end
 
   it "raises on incompatible <=> comparison" do
-    lambda { SortedSet['1', '2'].add(3) }.should raise_error(ArgumentError)
+    # Use #to_a here as elements are sorted only when needed.
+    # Therefore the <=> incompatibility is only noticed on sorting.
+    lambda { SortedSet['1', '2'].add(3).to_a }.should raise_error(ArgumentError)
   end
 end