1 files changed, 17 insertions, 4 deletions
diff --git a/spec/ruby/core/thread/value_spec.rb b/spec/ruby/core/thread/value_spec.rb
index 82c0cbf762..50c823171d 100644
--- a/spec/ruby/core/thread/value_spec.rb
+++ b/spec/ruby/core/thread/value_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Thread#value" do
   it "returns the result of the block" do
@@ -7,12 +7,25 @@ describe "Thread#value" do
   end
 
   it "re-raises an error for an uncaught exception" do
-    t = Thread.new { raise "Hello" }
-    lambda { t.value }.should raise_error(RuntimeError, "Hello")
+    t = Thread.new {
+      Thread.current.report_on_exception = false
+      raise "Hello"
+    }
+    -> { t.value }.should.raise(RuntimeError, "Hello")
   end
 
   it "is nil for a killed thread" do
     t = Thread.new { Thread.current.exit }
     t.value.should == nil
   end
+
+  it "returns when the thread finished" do
+    q = Queue.new
+    t = Thread.new {
+      q.pop
+    }
+    -> { t.value }.should block_caller
+    q.push :result
+    t.value.should == :result
+  end
 end