3 files changed, 17 insertions, 17 deletions
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
index 6804af3fb3..014056acda 100644
--- a/spec/ruby/shared/sizedqueue/enque.rb
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -29,7 +29,7 @@ describe :sizedqueue_enq, shared: true do
     q.size.should == 1
     add_to_queue.call
     q.size.should == 2
-    add_to_queue.should raise_error(ThreadError)
+    add_to_queue.should.raise(ThreadError)
   end
 
   it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
@@ -37,7 +37,7 @@ describe :sizedqueue_enq, shared: true do
     q << 1
 
     t = Thread.new {
-      -> { q.send(@method, 2) }.should raise_error(ClosedQueueError, "queue closed")
+      -> { q.send(@method, 2) }.should.raise(ClosedQueueError, "queue closed")
     }
 
     Thread.pass until q.num_waiting == 1
@@ -90,24 +90,24 @@ describe :sizedqueue_enq, shared: true do
       q = @object.call(1)
       -> {
         q.send(@method, 2, timeout: "1")
-      }.should raise_error(TypeError, "no implicit conversion to float from string")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
 
       -> {
         q.send(@method, 2, timeout: false)
-      }.should raise_error(TypeError, "no implicit conversion to float from false")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
     end
 
     it "raise ArgumentError if non_block = true is passed too" do
       q = @object.call(1)
       -> {
         q.send(@method, 2, true, timeout: 1)
-      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+      }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled")
     end
 
     it "raise ClosedQueueError when closed before enqueued" do
       q = @object.call(1)
       q.close
-      -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed")
+      -> { q.send(@method, 2, timeout: 1) }.should.raise(ClosedQueueError, "queue closed")
     end
 
     it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
@@ -115,7 +115,7 @@ describe :sizedqueue_enq, shared: true do
       q << 1
 
       t = Thread.new {
-        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should raise_error(ClosedQueueError, "queue closed")
+        -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should.raise(ClosedQueueError, "queue closed")
       }
 
       Thread.pass until q.num_waiting == 1
diff --git a/spec/ruby/shared/sizedqueue/max.rb b/spec/ruby/shared/sizedqueue/max.rb
index ea10d24be0..167f669275 100644
--- a/spec/ruby/shared/sizedqueue/max.rb
+++ b/spec/ruby/shared/sizedqueue/max.rb
@@ -19,7 +19,7 @@ describe :sizedqueue_max=, shared: true do
     q.enq 2
     q.enq 3
     q.max = 2
-    (q.size > q.max).should be_true
+    (q.size > q.max).should == true
     q.deq.should == 1
     q.deq.should == 2
     q.deq.should == 3
@@ -27,21 +27,21 @@ describe :sizedqueue_max=, shared: true do
 
   it "raises a TypeError when given a non-numeric value" do
     q = @object.call(5)
-    -> { q.max = "foo" }.should raise_error(TypeError)
-    -> { q.max = Object.new }.should raise_error(TypeError)
+    -> { q.max = "foo" }.should.raise(TypeError)
+    -> { q.max = Object.new }.should.raise(TypeError)
   end
 
   it "raises an argument error when set to zero" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = 0 }.should raise_error(ArgumentError)
+    -> { q.max = 0 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 
   it "raises an argument error when set to a negative number" do
     q = @object.call(5)
     q.max.should == 5
-    -> { q.max = -1 }.should raise_error(ArgumentError)
+    -> { q.max = -1 }.should.raise(ArgumentError)
     q.max.should == 5
   end
 end
diff --git a/spec/ruby/shared/sizedqueue/new.rb b/spec/ruby/shared/sizedqueue/new.rb
index 2573194efb..2904422a45 100644
--- a/spec/ruby/shared/sizedqueue/new.rb
+++ b/spec/ruby/shared/sizedqueue/new.rb
@@ -1,7 +1,7 @@
 describe :sizedqueue_new, shared: true do
   it "raises a TypeError when the given argument doesn't respond to #to_int" do
-    -> { @object.call("12") }.should raise_error(TypeError)
-    -> { @object.call(Object.new) }.should raise_error(TypeError)
+    -> { @object.call("12") }.should.raise(TypeError)
+    -> { @object.call(Object.new) }.should.raise(TypeError)
 
     @object.call(12.9).max.should == 12
     object = Object.new
@@ -10,14 +10,14 @@ describe :sizedqueue_new, shared: true do
   end
 
   it "raises an argument error when no argument is given" do
-    -> { @object.call }.should raise_error(ArgumentError)
+    -> { @object.call }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is zero" do
-    -> { @object.call(0) }.should raise_error(ArgumentError)
+    -> { @object.call(0) }.should.raise(ArgumentError)
   end
 
   it "raises an argument error when the given argument is negative" do
-    -> { @object.call(-1) }.should raise_error(ArgumentError)
+    -> { @object.call(-1) }.should.raise(ArgumentError)
   end
 end