1 files changed, 36 insertions, 14 deletions
diff --git a/spec/ruby/core/thread/element_set_spec.rb b/spec/ruby/core/thread/element_set_spec.rb
index 47b4d06328..97d6c23980 100644
--- a/spec/ruby/core/thread/element_set_spec.rb
+++ b/spec/ruby/core/thread/element_set_spec.rb
@@ -1,25 +1,47 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Thread#[]=" do
   after :each do
     Thread.current[:value] = nil
   end
 
-  it "raises a RuntimeError if the thread is frozen" do
-    running = false
-    t = Thread.new do
-      Thread.pass until running
-      t.freeze
-      t[:foo] = "bar"
-    end
-    running = true
-    lambda { t.join }.should raise_error(RuntimeError)
+  it "raises a FrozenError if the thread is frozen" do
+    Thread.new do
+      th = Thread.current
+      th.freeze
+      -> {
+        th[:foo] = "bar"
+      }.should.raise(FrozenError, "can't modify frozen thread locals")
+    end.join
+  end
+
+  it "accepts Strings and Symbols" do
+    t1 = Thread.new do
+      Thread.current[:value] = 1
+    end.join
+    t2 = Thread.new do
+      Thread.current["value"] = 2
+    end.join
+
+    t1[:value].should == 1
+    t2[:value].should == 2
+  end
+
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('value')
+    key.should_receive(:to_str).and_return('value')
+
+    th = Thread.new do
+      Thread.current[key] = 1
+    end.join
+
+    th[:value].should == 1
   end
 
   it "raises exceptions on the wrong type of keys" do
-    lambda { Thread.current[nil] = true }.should raise_error(TypeError)
-    lambda { Thread.current[5] = true }.should raise_error(TypeError)
+    -> { Thread.current[nil] = true }.should.raise(TypeError)
+    -> { Thread.current[5] = true }.should.raise(TypeError)
   end
 
   it "is not shared across fibers" do
@@ -29,7 +51,7 @@ describe "Thread#[]=" do
       Thread.current[:value].should == 1
     end
     fib.resume
-    Thread.current[:value].should be_nil
+    Thread.current[:value].should == nil
     Thread.current[:value] = 2
     fib.resume
     Thread.current[:value] = 2