1 files changed, 23 insertions, 18 deletions
diff --git a/spec/ruby/core/thread/join_spec.rb b/spec/ruby/core/thread/join_spec.rb
index 249b3d333e..f4332167f1 100644
--- a/spec/ruby/core/thread/join_spec.rb
+++ b/spec/ruby/core/thread/join_spec.rb
@@ -1,46 +1,51 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Thread#join" do
   it "returns the thread when it is finished" do
     t = Thread.new {}
-    t.join.should equal(t)
+    t.join.should.equal?(t)
   end
 
   it "returns the thread when it is finished when given a timeout" do
     t = Thread.new {}
     t.join
-    t.join(0).should equal(t)
+    t.join(0).should.equal?(t)
   end
 
   it "coerces timeout to a Float if it is not nil" do
     t = Thread.new {}
     t.join
-    t.join(0).should equal(t)
-    t.join(0.0).should equal(t)
-    t.join(nil).should equal(t)
-    lambda { t.join(:foo) }.should raise_error TypeError
-    lambda { t.join("bar") }.should raise_error TypeError
+    t.join(0).should.equal?(t)
+    t.join(0.0).should.equal?(t)
+    t.join(nil).should.equal?(t)
+  end
+
+  it "raises TypeError if the argument is not a valid timeout" do
+    t = Thread.new { }
+    t.join
+    -> { t.join(:foo) }.should.raise TypeError
+    -> { t.join("bar") }.should.raise TypeError
   end
 
   it "returns nil if it is not finished when given a timeout" do
-    c = Channel.new
-    t = Thread.new { c.receive }
+    q = Queue.new
+    t = Thread.new { q.pop }
     begin
       t.join(0).should == nil
     ensure
-      c << true
+      q << true
     end
     t.join.should == t
   end
 
   it "accepts a floating point timeout length" do
-    c = Channel.new
-    t = Thread.new { c.receive }
+    q = Queue.new
+    t = Thread.new { q.pop }
     begin
       t.join(0.01).should == nil
     ensure
-      c << true
+      q << true
     end
     t.join.should == t
   end
@@ -50,16 +55,16 @@ describe "Thread#join" do
       Thread.current.report_on_exception = false
       raise NotImplementedError.new("Just kidding")
     }
-    lambda { t.join }.should raise_error(NotImplementedError)
+    -> { t.join }.should.raise(NotImplementedError)
   end
 
   it "returns the dead thread" do
     t = Thread.new { Thread.current.kill }
-    t.join.should equal(t)
+    t.join.should.equal?(t)
   end
 
   it "raises any uncaught exception encountered in ensure block" do
     t = ThreadSpecs.dying_thread_ensures { raise NotImplementedError.new("Just kidding") }
-    lambda { t.join }.should raise_error(NotImplementedError)
+    -> { t.join }.should.raise(NotImplementedError)
   end
 end