jruby · Mar 1, 2016 · Mar 1, 2016
diff --git a/spec/ruby/core/array/dig_spec.rb b/spec/ruby/core/array/dig_spec.rb
@@ -15,8 +15,16 @@
       a.dig(0, -1, 0).should == 2
     end
 
+    it "raises a TypeError for a non-numeric index" do
+      lambda {
+        ['a'].dig(:first)
+      }.should raise_error(TypeError)
+    end
+
     it "raises without any args" do
-      lambda { [10].dig() }.should raise_error(ArgumentError)
+      lambda {
+        [10].dig()
+      }.should raise_error(ArgumentError)
     end
 
     it "calls #dig on the result of #at with the remaining arguments" do

diff --git a/.../ruby/fixtures/kernel/singleton_method.rb → .../basicobject/fixtures/singleton_method.rb b/.../ruby/fixtures/kernel/singleton_method.rb → .../basicobject/fixtures/singleton_method.rb
@@ -1,15 +1,15 @@
-module KernelSpecs
+module BasicObjectSpecs
   class SingletonMethod
     def self.singleton_method_added name
-      ScratchPad.record [:method_added, name]
+      ScratchPad.record [:singleton_method_added, name]
     end
 
     def self.singleton_method_removed name
-      ScratchPad.record [:method_removed, name]
+      ScratchPad.record [:singleton_method_removed, name]
     end
 
     def self.singleton_method_undefined name
-      ScratchPad.record [:method_undefined, name]
+      ScratchPad.record [:singleton_method_undefined, name]
     end
 
     def self.singleton_method_to_alias

diff --git a/spec/ruby/core/basicobject/singleton_method_added_spec.rb b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
@@ -1,6 +1,86 @@
 require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/kernel/singleton_method_added', __FILE__)
+require File.expand_path('../fixtures/singleton_method', __FILE__)
 
 describe "BasicObject#singleton_method_added" do
-  it_behaves_like(:singleton_method_added, :singleton_method_added, BasicObject)
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "is a private method" do
+    BasicObject.should have_private_instance_method(:singleton_method_added)
+  end
+
+  it "is called when a singleton method is defined on an object" do
+    obj = BasicObject.new
+
+    def obj.singleton_method_added(name)
+      ScratchPad.record [:singleton_method_added, name]
+    end
+
+    def obj.new_singleton_method
+    end
+
+    ScratchPad.recorded.should == [:singleton_method_added, :new_singleton_method]
+  end
+
+  it "is not called for instance methods" do
+    ScratchPad.record []
+
+    Module.new do
+      def self.singleton_method_added(name)
+        ScratchPad << name
+      end
+
+      def new_instance_method
+      end
+    end
+
+    ScratchPad.recorded.should_not include(:new_instance_method)
+  end
+
+  it "is called when a singleton method is defined on a module" do
+    class BasicObjectSpecs::SingletonMethod
+      def self.new_method_on_self
+      end
+    end
+    ScratchPad.recorded.should == [:singleton_method_added, :new_method_on_self]
+  end
+
+  it "is called when a method is defined in the singleton class" do
+    class BasicObjectSpecs::SingletonMethod
+      class << self
+        def new_method_on_singleton
+        end
+      end
+    end
+    ScratchPad.recorded.should == [:singleton_method_added, :new_method_on_singleton]
+  end
+
+  it "is called when a method is defined with alias_method in the singleton class" do
+    class BasicObjectSpecs::SingletonMethod
+      class << self
+        alias_method :new_method_on_singleton_with_alias_method, :singleton_method_to_alias
+      end
+    end
+    ScratchPad.recorded.should == [:singleton_method_added, :new_method_on_singleton_with_alias_method]
+  end
+
+  it "is called when a method is defined with syntax alias in the singleton class" do
+    class BasicObjectSpecs::SingletonMethod
+      class << self
+        alias new_method_on_singleton_with_syntax_alias singleton_method_to_alias
+      end
+    end
+    ScratchPad.recorded.should == [:singleton_method_added, :new_method_on_singleton_with_syntax_alias]
+  end
+
+  it "is called when define_method is used in the singleton class" do
+    class BasicObjectSpecs::SingletonMethod
+      class << self
+        define_method :new_method_with_define_method do
+        end
+      end
+    end
+    ScratchPad.recorded.should == [:singleton_method_added, :new_method_with_define_method]
+  end
 end
diff --git a/spec/ruby/core/basicobject/singleton_method_removed_spec.rb b/spec/ruby/core/basicobject/singleton_method_removed_spec.rb
@@ -1,6 +1,19 @@
 require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/kernel/singleton_method_removed', __FILE__)
+require File.expand_path('../fixtures/singleton_method', __FILE__)
 
 describe "BasicObject#singleton_method_removed" do
-  it_behaves_like(:singleton_method_removed, :singleton_method_removed, BasicObject)
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "is a private method" do
+    BasicObject.should have_private_instance_method(:singleton_method_removed)
+  end
+
+  it "is called when a method is removed on self" do
+    class << BasicObjectSpecs::SingletonMethod
+      remove_method :singleton_method_to_remove
+    end
+    ScratchPad.recorded.should == [:singleton_method_removed, :singleton_method_to_remove]
+  end
 end
diff --git a/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb b/spec/ruby/core/basicobject/singleton_method_undefined_spec.rb
@@ -1,5 +1,19 @@
-require File.expand_path('../../../shared/kernel/singleton_method_undefined', __FILE__)
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/singleton_method', __FILE__)
 
 describe "BasicObject#singleton_method_undefined" do
-  it_behaves_like(:singleton_method_undefined, :singleton_method_undefined, BasicObject)
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "is a private method" do
+    BasicObject.should have_private_instance_method(:singleton_method_undefined)
+  end
+
+  it "is called when a method is removed on self" do
+    class << BasicObjectSpecs::SingletonMethod
+      undef_method :singleton_method_to_undefine
+    end
+    ScratchPad.recorded.should == [:singleton_method_undefined, :singleton_method_to_undefine]
+  end
 end
diff --git a/spec/ruby/core/dir/chdir_spec.rb b/spec/ruby/core/dir/chdir_spec.rb
@@ -20,11 +20,12 @@
 
   it "defaults to $HOME with no arguments" do
     if ENV['HOME']
-    Dir.chdir(ENV['HOME'])
-    home = Dir.pwd
+      Dir.chdir
+      current_dir = Dir.pwd
 
-    Dir.chdir
-    Dir.pwd.should == home
+      Dir.chdir(ENV['HOME'])
+      home = Dir.pwd
+      current_dir.should == home
     end
   end
 
@@ -75,7 +76,8 @@ def to_str;  DirSpecs.mock_dir; end
     Dir.chdir { current_dir = Dir.pwd }
 
     Dir.chdir(ENV['HOME'])
-    current_dir.should == Dir.pwd
+    home = Dir.pwd
+    current_dir.should == home
   end
 
   it "changes to the specified directory for the duration of the block" do

diff --git a/spec/ruby/core/dir/fixtures/common.rb b/spec/ruby/core/dir/fixtures/common.rb
@@ -102,13 +102,11 @@ def self.mock_dir_files
   end
 
   def self.create_mock_dirs
-    umask = File.umask 0
     mock_dir_files.each do |name|
       file = File.join mock_dir, name
       mkdir_p File.dirname(file)
       touch file
     end
-    File.umask umask
   end
 
   def self.delete_mock_dirs

diff --git a/spec/ruby/core/enumerable/grep_spec.rb b/spec/ruby/core/enumerable/grep_spec.rb
@@ -46,7 +46,7 @@ def (@odd_matcher = BasicObject.new).===(obj)
     end
 
     it "raises an ArgumentError when not given a pattern" do
-      -> { @numerous.grep_v { |e| e } }.should raise_error(ArgumentError)
+      -> { @numerous.grep { |e| e } }.should raise_error(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/fixnum/element_reference_spec.rb b/spec/ruby/core/fixnum/element_reference_spec.rb
@@ -1,20 +1,38 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Fixnum#[]" do
+  it "behaves like (n >> b) & 1" do
+    0b101[1].should == 0
+    0b101[2].should == 1
+  end
+
   it "returns 1 if the nth bit is set" do
     15[1].should == 1
   end
 
+  it "returns 1 if the nth bit is set (in two's-complement representation)" do
+    (-1)[1].should == 1
+  end
+
   it "returns 0 if the nth bit is not set" do
     8[2].should == 0
   end
 
+  it "returns 0 if the nth bit is not set (in two's-complement representation)" do
+    (-2)[0].should == 0
+  end
+
   it "returns 0 if the nth bit is greater than the most significant bit" do
     2[3].should == 0
   end
 
+  it "returns 1 if self is negative and the nth bit is greater than the most significant bit" do
+    (-1)[3].should == 1
+  end
+
   it "returns 0 when passed a negative argument" do
     3[-1].should == 0
+    (-1)[-1].should == 0
   end
 
   it "calls #to_int to convert the argument to an Integer and returns 1 if the nth bit is set" do

diff --git a/spec/ruby/core/marshal/shared/load.rb b/spec/ruby/core/marshal/shared/load.rb
@@ -221,13 +221,13 @@
         y.tainted?.should be_true
         y.first.tainted?.should be_false
       end
-    end
 
-    it "does not taint Floats" do
-      x = [1.2]
-      y = Marshal.send(@method, Marshal.dump(x).taint)
-      y.tainted?.should be_true
-      y.first.tainted?.should be_false
+      it "does not taint Floats" do
+        x = [1.2]
+        y = Marshal.send(@method, Marshal.dump(x).taint)
+        y.tainted?.should be_true
+        y.first.tainted?.should be_false
+      end
     end
   end
 

diff --git a/spec/ruby/core/module/ancestors_spec.rb b/spec/ruby/core/module/ancestors_spec.rb
@@ -11,7 +11,7 @@
       [ModuleSpecs::Parent, Object, Kernel, BasicObject]
     ModuleSpecs.without_test_modules(ModuleSpecs::Child.ancestors).should ==
       [ModuleSpecs::Child, ModuleSpecs::Super, ModuleSpecs::Basic, ModuleSpecs::Parent, Object, Kernel, BasicObject]
-  end  
+  end
 
   it "returns only modules and classes" do
     class << ModuleSpecs::Child; self; end.ancestors.should include(ModuleSpecs::Internal, Class, Module, Object, Kernel)

diff --git a/spec/ruby/core/module/fixtures/classes.rb b/spec/ruby/core/module/fixtures/classes.rb
@@ -3,7 +3,7 @@ def self.without_test_modules(modules)
     ignore = %w[MSpecRSpecAdapter PP::ObjectMixin ModuleSpecs::IncludedInObject MainSpecs::Module ConstantSpecs::ModuleA]
     modules.reject { |k| ignore.include?(k.name) }
   end
-  
+
   CONST = :plain_constant
 
   module PrivConstModule

diff --git a/spec/ruby/core/module/instance_methods_spec.rb b/spec/ruby/core/module/instance_methods_spec.rb
@@ -6,7 +6,7 @@
     methods = ModuleSpecs::Parent.instance_methods(false)
     methods.should_not include(:undefed_method)
   end
-  
+
   it "only includes module methods on an included module" do
     methods = ModuleSpecs::Basic.instance_methods(false)
     methods.should include(:public_module)

diff --git a/spec/ruby/core/module/method_added_spec.rb b/spec/ruby/core/module/method_added_spec.rb
@@ -12,26 +12,38 @@
     end
   end
 
-  it "is called when a new method is defined in self" do
-    begin
-      $methods_added = []
-
-      m = Module.new do
-        def self.method_added(name)
-          $methods_added << name
-        end
-
-        def test() end
-        def test2() end
-        def test() end
-        alias_method :aliased_test, :test
-        alias aliased_test2 test
+  it "is called when a new instance method is defined in self" do
+    ScratchPad.record []
+
+    Module.new do
+      def self.method_added(name)
+        ScratchPad << name
       end
 
-      $methods_added.should == [:test, :test2, :test, :aliased_test, :aliased_test2]
-    ensure
-      $methods_added = nil
+      def test() end
+      def test2() end
+      def test() end
+      alias_method :aliased_test, :test
+      alias aliased_test2 test
     end
+
+    ScratchPad.recorded.should == [:test, :test2, :test, :aliased_test, :aliased_test2]
+  end
+
+  it "is not called when a singleton method is added" do
+    # obj.singleton_method_added is called instead
+    ScratchPad.record []
+
+    klass = Class.new
+    def klass.method_added(name)
+      ScratchPad << name
+    end
+
+    obj = klass.new
+    def obj.new_singleton_method
+    end
+
+    ScratchPad.recorded.should == []
   end
 
   it "is not called when a method is undefined in self" do

diff --git a/spec/ruby/core/module/remove_method_spec.rb b/spec/ruby/core/module/remove_method_spec.rb
@@ -25,11 +25,11 @@ def method_to_remove; 1; end
   class Second < First
     def method_to_remove; 2; end
   end
-  
+
   class Multiple
     def method_to_remove_1; 1; end
     def method_to_remove_2; 2; end
-    
+
     remove_method :method_to_remove_1, :method_to_remove_2
   end
 end
@@ -53,7 +53,7 @@ def method_to_remove_2; 2; end
     x.respond_to?(:method_to_remove).should == true
     x.method_to_remove.should == 1
   end
-  
+
   it "removes multiple methods with 1 call" do
     x = ModuleSpecs::Multiple.new
     x.respond_to?(:method_to_remove_1).should == false