1 files changed, 13 insertions, 14 deletions
diff --git a/spec/ruby/library/matrix/divide_spec.rb b/spec/ruby/library/matrix/divide_spec.rb
index b602d7d10f..711a5189e4 100644
--- a/spec/ruby/library/matrix/divide_spec.rb
+++ b/spec/ruby/library/matrix/divide_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'spec_helper'
+require_relative 'fixtures/classes'
 require 'matrix'
 
 describe "Matrix#/" do
@@ -14,13 +14,12 @@ describe "Matrix#/" do
     (@a / @b).should be_close_to_matrix([[2.5, -1.5], [1.5, -0.5]])
   end
 
-  conflicts_with :Prime do
+  # Guard against the Mathn library
+  guard -> { !defined?(Math.rsqrt) } do
     it "returns the result of dividing self by a Fixnum" do
       (@a / 2).should == Matrix[ [0, 1], [1, 2] ]
     end
-  end
 
-  conflicts_with :Prime do
     it "returns the result of dividing self by a Bignum" do
       (@a / bignum_value).should == Matrix[ [0, 0], [0, 0] ]
     end
@@ -31,25 +30,25 @@ describe "Matrix#/" do
   end
 
   it "raises a Matrix::ErrDimensionMismatch if the matrices are different sizes" do
-    lambda { @a / Matrix[ [1] ] }.should raise_error(Matrix::ErrDimensionMismatch)
+    -> { @a / Matrix[ [1] ] }.should.raise(Matrix::ErrDimensionMismatch)
   end
 
   it "returns an instance of Matrix" do
-    (@a / @b).should be_kind_of(Matrix)
+    (@a / @b).should.is_a?(Matrix)
   end
 
   describe "for a subclass of Matrix" do
     it "returns an instance of that subclass" do
       m = MatrixSub.ins
-      (m/m).should be_an_instance_of(MatrixSub)
-      (m/1).should be_an_instance_of(MatrixSub)
+      (m/m).should.instance_of?(MatrixSub)
+      (m/1).should.instance_of?(MatrixSub)
     end
   end
 
   it "raises a TypeError if other is of wrong type" do
-    lambda { @a / nil        }.should raise_error(TypeError)
-    lambda { @a / "a"        }.should raise_error(TypeError)
-    lambda { @a / [ [1, 2] ] }.should raise_error(TypeError)
-    lambda { @a / Object.new }.should raise_error(TypeError)
+    -> { @a / nil        }.should.raise(TypeError)
+    -> { @a / "a"        }.should.raise(TypeError)
+    -> { @a / [ [1, 2] ] }.should.raise(TypeError)
+    -> { @a / Object.new }.should.raise(TypeError)
   end
 end