1 files changed, 20 insertions, 12 deletions
diff --git a/spec/ruby/core/math/cos_spec.rb b/spec/ruby/core/math/cos_spec.rb
index 3ba7a54c38..e8602cde3c 100644
--- a/spec/ruby/core/math/cos_spec.rb
+++ b/spec/ruby/core/math/cos_spec.rb
@@ -4,7 +4,7 @@ require_relative 'fixtures/classes'
 # cosine : (-Inf, Inf) --> (-1.0, 1.0)
 describe "Math.cos" do
   it "returns a float" do
-    Math.cos(Math::PI).should be_kind_of(Float)
+    Math.cos(Math::PI).should.is_a?(Float)
   end
 
   it "returns the cosine of the argument expressed in radians" do
@@ -15,23 +15,31 @@ describe "Math.cos" do
     Math.cos(2*Math::PI).should be_close(1.0, TOLERANCE)
   end
 
-
   it "raises a TypeError unless the argument is Numeric and has #to_f" do
-    -> { Math.cos("test") }.should raise_error(TypeError)
+    -> { Math.cos("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.cos(nan_value).nan?.should be_true
-  end
-
-  it "raises a TypeError if the argument is nil" do
-    -> { Math.cos(nil) }.should raise_error(TypeError)
+    Math.cos(nan_value).nan?.should == true
   end
 
-  it "coerces its argument with #to_f" do
-    f = mock_numeric('8.2')
-    f.should_receive(:to_f).and_return(8.2)
-    Math.cos(f).should == Math.cos(8.2)
+  describe "coerces its argument with #to_f" do
+    it "coerces its argument with #to_f" do
+      f = mock_numeric('8.2')
+      f.should_receive(:to_f).and_return(8.2)
+      Math.cos(f).should == Math.cos(8.2)
+    end
+
+    it "raises a TypeError if the given argument can't be converted to a Float" do
+      -> { Math.cos(nil) }.should.raise(TypeError)
+      -> { Math.cos(:abc) }.should.raise(TypeError)
+    end
+
+    it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a Float" do
+      object = mock_numeric('mock-float')
+      object.should_receive(:to_f).and_raise(NoMethodError)
+      -> { Math.cos(object) }.should.raise(NoMethodError)
+    end
   end
 end