jruby · Nov 28, 2015 · Nov 28, 2015
diff --git a/spec/ruby/core/array/dig_spec.rb b/spec/ruby/core/array/dig_spec.rb
@@ -0,0 +1,29 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is '2.3' do
+  describe "Array#dig" do
+
+    it "returns #at with one arg" do
+      ['a'].dig(0).should == 'a'
+      ['a'].dig(1).should be_nil
+    end
+
+    it "recurses array elements" do
+      a = [ [ 1, [2, '3'] ] ]
+      a.dig(0, 0).should == 1
+      a.dig(0, 1, 1).should == '3'
+      a.dig(0, -1, 0).should == 2
+    end
+
+    it "raises without any args" do
+      lambda { [10].dig() }.should raise_error(ArgumentError)
+    end
+
+    it "calls #dig on the result of #at with the remaining arguments" do
+      h = [[nil, [nil, nil, 42]]]
+      h[0].should_receive(:dig).with(1, 2).and_return(42)
+      h.dig(0, 1, 2).should == 42
+    end
+
+  end
+end
diff --git a/spec/ruby/core/dir/entries_spec.rb b/spec/ruby/core/dir/entries_spec.rb
@@ -43,7 +43,7 @@
   it "returns entries encoded with the filesystem encoding by default" do
     # This spec depends on the locale not being US-ASCII because if it is, the
     # entries that are not ascii_only? will be ASCII-8BIT encoded.
-    entries = Dir.entries File.join(DirSpecs.mock_dir, 'special')
+    entries = Dir.entries(File.join(DirSpecs.mock_dir, 'special')).sort
     encoding = Encoding.find("filesystem")
     encoding = Encoding::ASCII_8BIT if encoding == Encoding::US_ASCII
     entries.should include("こんにちは.txt".force_encoding(encoding))
@@ -52,13 +52,13 @@
 
   it "returns entries encoded with the specified encoding" do
     dir = File.join(DirSpecs.mock_dir, 'special')
-    entries = Dir.entries dir, encoding: "euc-jp"
+    entries = Dir.entries(dir, encoding: "euc-jp").sort
     entries.first.encoding.should equal(Encoding::EUC_JP)
   end
 
   it "returns entries transcoded to the default internal encoding" do
     Encoding.default_internal = Encoding::EUC_KR
-    entries = Dir.entries File.join(DirSpecs.mock_dir, 'special')
+    entries = Dir.entries(File.join(DirSpecs.mock_dir, 'special')).sort
     entries.first.encoding.should equal(Encoding::EUC_KR)
   end
 

diff --git a/spec/ruby/core/dir/fileno_spec.rb b/spec/ruby/core/dir/fileno_spec.rb
@@ -1,6 +1,15 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/common', __FILE__)
 
+has_dir_fileno = begin
+  Dir.new('.').fileno
+  true
+rescue NotImplementedError
+  false
+rescue Exception
+  true
+end
+
 ruby_version_is "2.2" do
   describe "Dir#fileno" do
     before :each do
@@ -14,15 +23,13 @@
       rm_r @name
     end
 
-    platform_is_not :windows do
+    if has_dir_fileno
       it "returns the file descriptor of the dir" do
-        @dir.fileno.should.be_kind_of(Fixnum)
+        @dir.fileno.should be_kind_of(Fixnum)
       end
-    end
-
-    platform_is :windows do
-      it "raises an error on Windows" do
-        lambda { @dir.fileno }.to raise_error(NotImplementedError)
+    else
+      it "raises an error when not implemented on the platform" do
+        lambda { @dir.fileno }.should raise_error(NotImplementedError)
       end
     end
   end

diff --git a/spec/ruby/core/enumerator/enum_for_spec.rb b/spec/ruby/core/enumerator/enum_for_spec.rb
@@ -1,6 +1,6 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
 
-describe "#enum_for" do
+describe "Enumerator#enum_for" do
   it_behaves_like :enum_for, :enum_for
 end
diff --git a/spec/ruby/core/enumerator/size_spec.rb b/spec/ruby/core/enumerator/size_spec.rb
@@ -19,7 +19,7 @@
   end
 
   ruby_version_is "2.1" do
-    it "returns the result from size.call if the size respond to call " do
+    it "returns the result from size.call if the size respond to call" do
       obj = mock('call')
       obj.should_receive(:call).and_return(42)
       Enumerator.new(obj) {}.size.should == 42

diff --git a/spec/ruby/core/enumerator/to_enum_spec.rb b/spec/ruby/core/enumerator/to_enum_spec.rb
@@ -1,6 +1,6 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
 
-describe "#to_enum" do
+describe "Enumerator#to_enum" do
   it_behaves_like :enum_for, :enum_for
 end
diff --git a/spec/ruby/core/file/stat/zero_spec.rb b/spec/ruby/core/file/stat/zero_spec.rb
@@ -4,10 +4,4 @@
 
 describe "File::Stat#zero?" do
   it_behaves_like :file_zero, :zero?, FileStat
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      FileStat.zero?('/dev/null').should == false
-    end
-  end
 end
diff --git a/spec/ruby/core/hash/dig_spec.rb b/spec/ruby/core/hash/dig_spec.rb
@@ -0,0 +1,47 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is '2.3' do
+  describe "Hash#dig" do
+
+    it "returns #[] with one arg" do
+      h = { 0 => false, :a => 1 }
+      h.dig(:a).should == 1
+      h.dig(0).should be_false
+      h.dig(1).should be_nil
+    end
+
+    it "does recurse" do
+      h = { foo: { bar: { baz: 1 } } }
+      h.dig(:foo, :bar, :baz).should == 1
+      h.dig(:foo, :bar, :nope).should be_nil
+      h.dig(:foo, :baz).should be_nil
+      h.dig(:bar, :baz, :foo).should be_nil
+    end
+
+    it "raises without args" do
+      lambda { { the: 'borg' }.dig() }.should raise_error(ArgumentError)
+    end
+
+    it "handles type-mixed deep digging" do
+      h = {}
+      h[:foo] = [ { :bar => [ 1 ] }, [ obj = Object.new, 'str' ] ]
+      def obj.dig(*args); [ 42 ] end
+
+      h.dig(:foo, 0, :bar).should == [ 1 ]
+      h.dig(:foo, 0, :bar, 0).should == 1
+      h.dig(:foo, 0, :bar, 0, 0).should be_nil
+      h.dig(:foo, 1, 1).should == 'str'
+      h.dig(:foo, 1, 1, 0).should be_nil
+      # MRI does not recurse values returned from `obj.dig`
+      h.dig(:foo, 1, 0, 0).should == [ 42 ]
+      h.dig(:foo, 1, 0, 0, 10).should == [ 42 ]
+    end
+
+    it "calls #dig on the result of #[] with the remaining arguments" do
+      h = { foo: { bar: { baz: 42 } } }
+      h[:foo].should_receive(:dig).with(:bar, :baz).and_return(42)
+      h.dig(:foo, :bar, :baz).should == 42
+    end
+
+  end
+end
diff --git a/spec/ruby/core/hash/gt_spec.rb b/spec/ruby/core/hash/gt_spec.rb
@@ -0,0 +1,32 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Hash#>" do
+    before :each do
+      @hash = {a:1, b:2}
+      @bigger = {a:1, b:2, c:3}
+      @unrelated = {c:3, d:4}
+      @similar = {a:2, b:3}
+    end
+
+    it "returns false when receiver size is smaller than argument" do
+      (@hash > @bigger).should == false
+      (@unrelated > @bigger).should == false
+    end
+
+    it "returns false when receiver size is the same as argument" do
+      (@hash > @hash).should == false
+      (@hash > @unrelated).should == false
+      (@unrelated > @hash).should == false
+    end
+
+    it "returns true when argument is a subset of receiver" do
+      (@bigger > @hash).should == true
+    end
+
+    it "returns false when keys match but values don't" do
+      (@hash > @similar).should == false
+      (@similar > @hash).should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/hash/gte_spec.rb b/spec/ruby/core/hash/gte_spec.rb
@@ -0,0 +1,32 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Hash#>=" do
+    before :each do
+      @hash = {a:1, b:2}
+      @bigger = {a:1, b:2, c:3}
+      @unrelated = {c:3, d:4}
+      @similar = {a:2, b:3}
+    end
+
+    it "returns false when receiver size is smaller than argument" do
+      (@hash >= @bigger).should == false
+      (@unrelated >= @bigger).should == false
+    end
+
+    it "returns false when argument is not a subset or not equals to receiver" do
+      (@hash >= @unrelated).should == false
+      (@unrelated >= @hash).should == false
+    end
+
+    it "returns true when argument is a subset of receiver or equals to receiver" do
+      (@bigger >= @hash).should == true
+      (@hash >= @hash).should == true
+    end
+
+    it "returns false when keys match but values don't" do
+      (@hash >= @similar).should == false
+      (@similar >= @hash).should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/hash/lt_spec.rb b/spec/ruby/core/hash/lt_spec.rb
@@ -0,0 +1,32 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Hash#<" do
+    before :each do
+      @hash = {a:1, b:2}
+      @bigger = {a:1, b:2, c:3}
+      @unrelated = {c:3, d:4}
+      @similar = {a:2, b:3}
+    end
+
+    it "returns false when receiver size is larger than argument" do
+      (@bigger < @hash).should == false
+      (@bigger < @unrelated).should == false
+    end
+
+    it "returns false when receiver size is the same as argument" do
+      (@hash < @hash).should == false
+      (@hash < @unrelated).should == false
+      (@unrelated < @hash).should == false
+    end
+
+    it "returns true when receiver is a subset of argument" do
+      (@hash < @bigger).should == true
+    end
+
+    it "returns false when keys match but values don't" do
+      (@hash < @similar).should == false
+      (@similar < @hash).should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/hash/lte_spec.rb b/spec/ruby/core/hash/lte_spec.rb
@@ -0,0 +1,32 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Hash#<=" do
+    before :each do
+      @hash = {a:1, b:2}
+      @bigger = {a:1, b:2, c:3}
+      @unrelated = {c:3, d:4}
+      @similar = {a:2, b:3}
+    end
+
+    it "returns false when receiver size is larger than argument" do
+      (@bigger <= @hash).should == false
+      (@bigger <= @unrelated).should == false
+    end
+
+    it "returns false when receiver size is the same as argument" do
+      (@hash <= @unrelated).should == false
+      (@unrelated <= @hash).should == false
+    end
+
+    it "returns true when receiver is a subset of argument or equals to argument" do
+      (@hash <= @bigger).should == true
+      (@hash <= @hash).should == true
+    end
+
+    it "returns false when keys match but values don't" do
+      (@hash <= @similar).should == false
+      (@similar <= @hash).should == false
+    end
+  end
+end
diff --git a/spec/ruby/core/hash/to_proc_spec.rb b/spec/ruby/core/hash/to_proc_spec.rb
@@ -0,0 +1,53 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+ruby_version_is "2.3" do
+  describe "Hash#to_proc" do
+    before :each do
+      @key = Object.new
+      @value = Object.new
+      @hash = new_hash @key => @value
+      @default = Object.new
+      @unstored = Object.new
+    end
+
+    it "returns an instance of Proc" do
+      @hash.to_proc.should be_an_instance_of Proc
+    end
+
+    describe "the returned proc" do
+      before :each do
+        @proc = @hash.to_proc
+      end
+
+      context "with a stored key" do
+        it "returns the paired value" do
+          @proc.call(@key).should equal(@value)
+        end
+      end
+
+      context "with no stored key" do
+        it "returns nil" do
+          @proc.call(@unstored).should be_nil
+        end
+
+        context "when the hash has a default value" do
+          before :each do
+            @hash.default = @default
+          end
+
+          it "returns the default value" do
+            @proc.call(@unstored).should equal(@default)
+          end
+        end
+
+        context "when the hash has a default proc" do
+          it "returns an evaluated value from the default proc" do
+            @hash.default_proc = -> hash, called_with { [hash.keys, called_with] }
+            @proc.call(@unstored).should == [[@key], @unstored]
+          end
+        end
+      end
+    end
+  end
+end