1 files changed, 21 insertions, 13 deletions
diff --git a/spec/ruby/core/kernel/public_send_spec.rb b/spec/ruby/core/kernel/public_send_spec.rb
index 2eabbc7dc9..6a4a969c77 100644
--- a/spec/ruby/core/kernel/public_send_spec.rb
+++ b/spec/ruby/core/kernel/public_send_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-require File.expand_path('../../../shared/basicobject/send', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require_relative '../../shared/basicobject/send'
 
 describe "Kernel#public_send" do
   it "invokes the named public method" do
@@ -29,7 +29,7 @@ describe "Kernel#public_send" do
         'done'
       end
     end
-    lambda { KernelSpecs::Foo.new.public_send(:bar)}.should raise_error(NoMethodError)
+    -> { KernelSpecs::Foo.new.public_send(:bar)}.should.raise(NoMethodError)
   end
 
   it "raises a NoMethodError if the named method is private" do
@@ -39,9 +39,9 @@ describe "Kernel#public_send" do
         'done2'
       end
     end
-    lambda {
+    -> {
       KernelSpecs::Foo.new.public_send(:bar)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   context 'called from own public method' do
@@ -70,11 +70,11 @@ describe "Kernel#public_send" do
     end
 
     it "raises a NoMethodError if the method is protected" do
-      lambda { @receiver.call_protected_method }.should raise_error(NoMethodError)
+      -> { @receiver.call_protected_method }.should.raise(NoMethodError)
     end
 
     it "raises a NoMethodError if the method is private" do
-      lambda { @receiver.call_private_method }.should raise_error(NoMethodError)
+      -> { @receiver.call_private_method }.should.raise(NoMethodError)
     end
   end
 
@@ -86,9 +86,9 @@ describe "Kernel#public_send" do
       end
       alias :aka :bar
     end
-    lambda {
+    -> {
       KernelSpecs::Foo.new.public_send(:aka)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
   it "raises a NoMethodError if the named method is an alias of a protected method" do
@@ -99,10 +99,18 @@ describe "Kernel#public_send" do
       end
       alias :aka :bar
     end
-    lambda {
+    -> {
       KernelSpecs::Foo.new.public_send(:aka)
-    }.should raise_error(NoMethodError)
+    }.should.raise(NoMethodError)
   end
 
-  it_behaves_like(:basicobject_send, :public_send)
+  it "includes `public_send` in the backtrace when passed not enough arguments" do
+    -> { public_send() }.should.raise(ArgumentError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
+  end
+
+  it "includes `public_send` in the backtrace when passed a single incorrect argument" do
+    -> { public_send(Object.new) }.should.raise(TypeError) { |e| e.backtrace[0].should =~ /[`'](?:Kernel#)?public_send'/ }
+  end
+
+  it_behaves_like :basicobject_send, :public_send
 end