1 files changed, 10 insertions, 12 deletions
diff --git a/spec/ruby/core/math/acosh_spec.rb b/spec/ruby/core/math/acosh_spec.rb
index 272bfaf6a9..ccacda37e0 100644
--- a/spec/ruby/core/math/acosh_spec.rb
+++ b/spec/ruby/core/math/acosh_spec.rb
@@ -1,9 +1,9 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Math.acosh" do
   it "returns a float" do
-    Math.acosh(1.0).should be_kind_of(Float)
+    Math.acosh(1.0).should.is_a?(Float)
   end
 
   it "returns the principle value of the inverse hyperbolic cosine of the argument" do
@@ -11,24 +11,22 @@ describe "Math.acosh" do
     Math.acosh(1.0).should be_close(0.0, TOLERANCE)
   end
 
-  conflicts_with :Complex do
-    it "raises Errno::EDOM if the passed argument is less than -1.0 or greater than 1.0" do
-      lambda { Math.acosh(1.0 - TOLERANCE) }.should raise_error(Errno::EDOM)
-      lambda { Math.acosh(0) }.should raise_error(Errno::EDOM)
-      lambda { Math.acosh(-1.0) }.should raise_error(Errno::EDOM)
-    end
+  it "raises Math::DomainError if the passed argument is less than -1.0 or greater than 1.0" do
+    -> { Math.acosh(1.0 - TOLERANCE) }.should.raise(Math::DomainError)
+    -> { Math.acosh(0) }.should.raise(Math::DomainError)
+    -> { Math.acosh(-1.0) }.should.raise(Math::DomainError)
   end
 
   it "raises a TypeError if the argument cannot be coerced with Float()" do
-    lambda { Math.acosh("test") }.should raise_error(TypeError)
+    -> { Math.acosh("test") }.should.raise(TypeError)
   end
 
   it "returns NaN given NaN" do
-    Math.acosh(nan_value).nan?.should be_true
+    Math.acosh(nan_value).nan?.should == true
   end
 
   it "raises a TypeError if the argument is nil" do
-    lambda { Math.acosh(nil) }.should raise_error(TypeError)
+    -> { Math.acosh(nil) }.should.raise(TypeError)
   end
 
   it "accepts any argument that can be coerced with Float()" do