1 files changed, 21 insertions, 5 deletions
diff --git a/spec/ruby/core/thread/current_spec.rb b/spec/ruby/core/thread/current_spec.rb
index cc969b71c4..f893f078ba 100644
--- a/spec/ruby/core/thread/current_spec.rb
+++ b/spec/ruby/core/thread/current_spec.rb
@@ -1,15 +1,31 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Thread.current" do
   it "returns a thread" do
     current = Thread.current
-    current.should be_kind_of(Thread)
+    current.should.is_a?(Thread)
   end
 
   it "returns the current thread" do
     t = Thread.new { Thread.current }
-    t.value.should equal(t)
-    Thread.current.should_not equal(t.value)
+    t.value.should.equal?(t)
+    Thread.current.should_not.equal?(t.value)
+  end
+
+  it "returns the correct thread in a Fiber" do
+    # This catches a bug where Fibers are running on a thread-pool
+    # and Fibers from a different Ruby Thread reuse the same native thread.
+    # Caching the Ruby Thread based on the native thread is not correct in that case.
+    2.times do
+      t = Thread.new {
+        cur = Thread.current
+        Fiber.new {
+          Thread.current
+        }.resume.should.equal? cur
+        cur
+      }
+      t.value.should.equal? t
+    end
   end
 end