From e87fb88be844f0fae736768846954b6f6f7dc7c3 Mon Sep 17 00:00:00 2001 From: eregon Date: Tue, 25 Sep 2018 10:41:16 +0000 Subject: Update to ruby/spec@241f9e7 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/library/matrix/divide_spec.rb | 5 ++--- spec/ruby/library/matrix/real_spec.rb | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/ruby/library/matrix') diff --git a/spec/ruby/library/matrix/divide_spec.rb b/spec/ruby/library/matrix/divide_spec.rb index d656985f38..205bc5d892 100644 --- a/spec/ruby/library/matrix/divide_spec.rb +++ b/spec/ruby/library/matrix/divide_spec.rb @@ -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 diff --git a/spec/ruby/library/matrix/real_spec.rb b/spec/ruby/library/matrix/real_spec.rb index e3648e4769..38033c63c8 100644 --- a/spec/ruby/library/matrix/real_spec.rb +++ b/spec/ruby/library/matrix/real_spec.rb @@ -16,7 +16,8 @@ describe "Matrix#real?" do Matrix[ [Complex(1,1), 2], [3, 4] ].real?.should be_false end - conflicts_with :CMath do + # Guard against the Mathn library + guard -> { !defined?(Math.rsqrt) } do it "returns false if one element is a Complex whose imaginary part is 0" do Matrix[ [Complex(1,0), 2], [3, 4] ].real?.should be_false end -- cgit v1.2.3