jruby · Jan 12, 2016 · Jan 12, 2016
diff --git a/spec/ruby/.travis.yml b/spec/ruby/.travis.yml
@@ -1,8 +1,9 @@
+sudo: false
 language: ruby
 rvm:
-  - 2.0.0-p647
-  - 2.1.7
-  - 2.2.3
+  - 2.0.0-p648
+  - 2.1.8
+  - 2.2.4
   - ruby-head
 install:
   - git clone https://github.com/ruby/mspec.git ../mspec

diff --git a/spec/ruby/core/array/shared/inspect.rb b/spec/ruby/core/array/shared/inspect.rb
@@ -81,11 +81,22 @@
       array.send(@method).encoding.name.should == "US-ASCII"
     end
 
-    it "raises if inspected result is not default external encoding" do
-      utf_16be = mock("utf_16be")
-      utf_16be.should_receive(:inspect).and_return("utf_16be".encode!(Encoding::UTF_16BE))
+    ruby_version_is ''...'2.3' do
+      it "raises if inspected result is not default external encoding" do
+        utf_16be = mock("utf_16be")
+        utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
 
-      lambda { [utf_16be].send(@method) }.should raise_error(Encoding::CompatibilityError)
+        lambda { [utf_16be].send(@method) }.should raise_error(Encoding::CompatibilityError)
+      end
+    end
+
+    ruby_version_is '2.3' do
+      it "raises if inspected result is not default external encoding" do
+        utf_16be = mock("utf_16be")
+        utf_16be.should_receive(:inspect).and_return(%<"utf_16be \u3042">.encode!(Encoding::UTF_16BE))
+
+        [utf_16be].send(@method).should == '["utf_16be \u3042"]'
+      end
     end
   end
 end
diff --git a/spec/ruby/core/basicobject/instance_eval_spec.rb b/spec/ruby/core/basicobject/instance_eval_spec.rb
@@ -150,4 +150,13 @@ class B; end
       (1 << 64).instance_eval { def foo; end }
     end.should raise_error(TypeError)
   end
+
+  it "evaluates procs originating from methods" do
+    def meth(arg); arg; end
+
+    m = method(:meth)
+    obj = Object.new
+
+    obj.instance_eval(&m).should == obj
+  end
 end
diff --git a/spec/ruby/core/comparable/equal_value_spec.rb b/spec/ruby/core/comparable/equal_value_spec.rb
@@ -1,8 +1,6 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/classes', __FILE__)
 
-no_silent_rescue = "2.3"
-
 describe "Comparable#==" do
   a = b = nil
   before :each do
@@ -50,13 +48,13 @@
       a.should_receive(:<=>).once.and_return("abc")
     end
 
-    ruby_version_is ""...no_silent_rescue do
+    ruby_version_is ""..."2.3" do
       it "returns false" do
         (a == b).should be_false
       end
     end
 
-    ruby_version_is no_silent_rescue do
+    ruby_version_is "2.3" do
       it "raises an ArgumentError" do
         lambda { (a == b) }.should raise_error(ArgumentError)
       end
@@ -69,14 +67,14 @@
         a.should_receive(:<=>).once.and_raise(StandardError)
       end
 
-      ruby_version_is ""...no_silent_rescue do
+      ruby_version_is ""..."2.3" do
         # Behaviour confirmed by MRI test suite
         it "returns false" do
           (a == b).should be_false
         end
       end
 
-      ruby_version_is no_silent_rescue do
+      ruby_version_is "2.3" do
         it "lets it go through" do
           lambda { (a == b) }.should raise_error(StandardError)
         end
@@ -89,13 +87,13 @@
         a.should_receive(:<=>).once.and_raise(TypeError)
       end
 
-      ruby_version_is ""...no_silent_rescue do
+      ruby_version_is ""..."2.3" do
         it "returns false" do
           (a == b).should be_false
         end
       end
 
-      ruby_version_is no_silent_rescue do
+      ruby_version_is "2.3" do
         it "lets it go through" do
           lambda { (a == b) }.should raise_error(TypeError)
         end

diff --git a/spec/ruby/core/dir/pwd_spec.rb b/spec/ruby/core/dir/pwd_spec.rb
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/common', __FILE__)
 require File.expand_path('../shared/pwd', __FILE__)
@@ -12,19 +13,25 @@
   end
 
   it_behaves_like :dir_pwd, :pwd
+end
 
-  it "correctly displays dirs with unicode characters in them" do
-    DirSpecs.clear_dirs
+describe "Dir.pwd" do
+  before :each do
+    @name = tmp("あ").force_encoding('binary')
+    @fs_encoding = Encoding.find('filesystem')
+  end
 
-    begin
-      str = [0xe9].pack 'U' # Unicode é
-      Dir.mkdir str
-      File.exist?(str).should == true
+  after :each do
+    rm_r @name
+  end
 
-      old_pwd = Dir.pwd
-      Dir.chdir(str) { Dir.pwd.force_encoding('UTF-8').should == File.join(old_pwd, str) }
-    ensure
-      DirSpecs.clear_dirs
+  it "correctly handles dirs with unicode characters in them" do
+    Dir.mkdir @name
+    Dir.chdir @name do
+      if @fs_encoding == Encoding::UTF_8
+        Dir.pwd.encoding.should == Encoding::UTF_8
+      end
+      Dir.pwd.force_encoding('binary').should == @name
     end
   end
 end
diff --git a/spec/ruby/core/enumerable/chunk_spec.rb b/spec/ruby/core/enumerable/chunk_spec.rb
@@ -72,6 +72,15 @@
     end
   end
 
+  ruby_version_is "2.3" do
+    it "does not accept arguments" do
+      e = EnumerableSpecs::Numerous.new(1, 2, 3)
+      lambda {
+        e.chunk(1) {}
+      }.should raise_error(ArgumentError)
+    end
+  end
+
   it 'returned Enumerator size returns nil' do
     e = EnumerableSpecs::NumerousWithSize.new(1, 2, 3, 2, 1)
     enum = e.chunk { |x| true }

diff --git a/spec/ruby/core/enumerable/chunk_while_spec.rb b/spec/ruby/core/enumerable/chunk_while_spec.rb
@@ -0,0 +1,38 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Enumerable#chunk_while" do
+    before :each do
+      ary = [10, 9, 7, 6, 4, 3, 2, 1]
+      @enum = EnumerableSpecs::Numerous.new *ary
+      @result = @enum.chunk_while { |i, j| i - 1 == j }
+      @enum_length = ary.length
+    end
+
+    context "when given a block" do
+      it "returns an enumerator" do
+        @result.should be_an_instance_of(enumerator_class)
+      end
+
+      it "splits chunks between adjacent elements i and j where the block returns false" do
+        @result.to_a.should == [[10, 9], [7, 6], [4, 3, 2, 1]]
+      end
+
+      it "calls the block for length of the receiver enumerable minus one times" do
+        times_called = 0
+        @enum.chunk_while do |i, j|
+          times_called += 1
+          i - 1 == j
+        end.to_a
+        times_called.should == (@enum_length - 1)
+      end
+    end
+
+    context "when not given a block" do
+      it "raises an ArgumentError" do
+        lambda { @enum.chunk_while }.should raise_error(ArgumentError)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/enumerable/slice_before_spec.rb b/spec/ruby/core/enumerable/slice_before_spec.rb
@@ -58,17 +58,14 @@
           end
           e.to_a
         end
+      end
+    end
 
-        quarantine! do # need to double-check with ruby-core. Might be wrong or too specific
-          it "duplicates the argument directly without calling dup" do
-            arg = EnumerableSpecs::Undupable.new
-            e = @enum.slice_before(arg) do |i, init|
-              init.initialize_dup_called.should be_true
-              false
-            end
-            e.to_a.should == [[7, 6, 5, 4, 3, 2, 1]]
-          end
-        end
+    ruby_version_is "2.3" do
+      it "does not accept arguments" do
+        lambda {
+          @enum.slice_before(1) {}
+        }.should raise_error(ArgumentError)
       end
     end
   end

diff --git a/spec/ruby/core/exception/backtrace_spec.rb b/spec/ruby/core/exception/backtrace_spec.rb
@@ -23,7 +23,7 @@
   end
 
   it "includes the line number of the location where self raised in the first element" do
-    @backtrace.first.should =~ /:22:in /
+    @backtrace.first.should =~ /:7:in /
   end
 
   it "includes the name of the method from where self raised in the first element" do

diff --git a/spec/ruby/core/exception/fixtures/common.rb b/spec/ruby/core/exception/fixtures/common.rb
@@ -1,25 +1,10 @@
-module NoMethodErrorSpecs
-  class NoMethodErrorA; end
-
-  class NoMethodErrorB; end
-
-  class NoMethodErrorC;
-    protected
-    def a_protected_method;end
-    private
-    def a_private_method; end
-  end
-
-  class NoMethodErrorD; end
-end
-
 module ExceptionSpecs
   class Exceptional < Exception; end
 
   class Backtrace
     def self.backtrace
       begin
-        raise
+        raise # Do not move this line or update backtrace_spec.rb
       rescue RuntimeError => e
         e.backtrace
       end
@@ -54,3 +39,26 @@ def to_s
     end
   end
 end
+
+module NoMethodErrorSpecs
+  class NoMethodErrorA; end
+
+  class NoMethodErrorB; end
+
+  class NoMethodErrorC;
+    protected
+    def a_protected_method;end
+    private
+    def a_private_method; end
+  end
+
+  class NoMethodErrorD; end
+end
+
+class NameErrorSpecs
+  class ReceiverClass
+    def call_undefined_class_variable
+      @@doesnt_exist
+    end
+  end
+end
diff --git a/spec/ruby/core/exception/name_spec.rb b/spec/ruby/core/exception/name_spec.rb
@@ -1,5 +1,59 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "NameError#name" do
-  it "needs to be reviewed for spec completeness"
+  it "returns a method name as a symbol" do
+    -> {
+      doesnt_exist
+    }.should raise_error(NameError) {|e| e.name.should == :doesnt_exist }
+  end
+
+  it "returns a constant name as a symbol" do
+    -> {
+      DoesntExist
+    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+  end
+
+  it "returns a constant name without namespace as a symbol" do
+    -> {
+      Object::DoesntExist
+    }.should raise_error(NameError) {|e| e.name.should == :DoesntExist }
+  end
+
+  it "returns a class variable name as a symbol" do
+    -> {
+      @@doesnt_exist
+    }.should raise_error(NameError) {|e| e.name.should == :@@doesnt_exist }
+  end
+
+  ruby_version_is ""..."2.3" do
+    it "always returns a symbol when a NameError is raised from #instance_variable_get" do
+      -> {
+        Object.new.instance_variable_get("invalid_ivar_name")
+      }.should raise_error(NameError) { |e| e.name.should == :invalid_ivar_name }
+    end
+
+    it "always returns a symbol when a NameError is raised from #class_variable_get" do
+      -> {
+        Object.class_variable_get("invalid_cvar_name")
+      }.should raise_error(NameError) { |e| e.name.should == :invalid_cvar_name }
+    end
+  end
+
+  ruby_version_is "2.3" do
+    it "returns the first argument passed to the method when a NameError is raised from #instance_variable_get" do
+      invalid_ivar_name = "invalid_ivar_name"
+
+      -> {
+        Object.new.instance_variable_get(invalid_ivar_name)
+      }.should raise_error(NameError) {|e| e.name.should equal(invalid_ivar_name) }
+    end
+
+    it "returns the first argument passed to the method when a NameError is raised from #class_variable_get" do
+      invalid_cvar_name = "invalid_cvar_name"
+
+      -> {
+        Object.class_variable_get(invalid_cvar_name)
+      }.should raise_error(NameError) {|e| e.name.should equal(invalid_cvar_name) }
+    end
+  end
 end