4 files changed, 55 insertions, 3 deletions
diff --git a/spec/ruby/core/thread/element_reference_spec.rb b/spec/ruby/core/thread/element_reference_spec.rb
index 85280cb287..fde9d1f440 100644
--- a/spec/ruby/core/thread/element_reference_spec.rb
+++ b/spec/ruby/core/thread/element_reference_spec.rb
@@ -37,6 +37,17 @@ describe "Thread#[]" do
     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[:value] = 1
+    end.join
+
+    th[key].should == 1
+  end
+
   it "raises exceptions on the wrong type of keys" do
     -> { Thread.current[nil] }.should raise_error(TypeError)
     -> { Thread.current[5] }.should raise_error(TypeError)
diff --git a/spec/ruby/core/thread/element_set_spec.rb b/spec/ruby/core/thread/element_set_spec.rb
index c7498f7ac9..f205177304 100644
--- a/spec/ruby/core/thread/element_set_spec.rb
+++ b/spec/ruby/core/thread/element_set_spec.rb
@@ -12,10 +12,33 @@ describe "Thread#[]=" do
       th.freeze
       -> {
         th[:foo] = "bar"
-      }.should raise_error(FrozenError, /frozen/)
+      }.should raise_error(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
     -> { Thread.current[nil] = true }.should raise_error(TypeError)
     -> { Thread.current[5] = true }.should raise_error(TypeError)
diff --git a/spec/ruby/core/thread/group_spec.rb b/spec/ruby/core/thread/group_spec.rb
index 59f5ac37c8..d0d4704b66 100644
--- a/spec/ruby/core/thread/group_spec.rb
+++ b/spec/ruby/core/thread/group_spec.rb
@@ -1,5 +1,16 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+
 describe "Thread#group" do
-  it "needs to be reviewed for spec completeness"
+  it "returns the default thread group for the main thread" do
+    Thread.main.group.should == ThreadGroup::Default
+  end
+
+  it "returns the thread group explicitly set for this thread" do
+    thread = Thread.new { nil }
+    thread_group = ThreadGroup.new
+    thread_group.add(thread)
+    thread.group.should == thread_group
+  ensure
+    thread.join if thread
+  end
 end
diff --git a/spec/ruby/core/thread/key_spec.rb b/spec/ruby/core/thread/key_spec.rb
index 6940cf5f28..339fa98f53 100644
--- a/spec/ruby/core/thread/key_spec.rb
+++ b/spec/ruby/core/thread/key_spec.rb
@@ -16,6 +16,13 @@ describe "Thread#key?" do
     @th.key?(:stanley.to_s).should == false
   end
 
+  it "converts a key that is neither String nor Symbol with #to_str" do
+    key = mock('key')
+    key.should_receive(:to_str).and_return('oliver')
+
+    @th.key?(key).should == true
+  end
+
   it "raises exceptions on the wrong type of keys" do
     -> { Thread.current.key? nil }.should raise_error(TypeError)
     -> { Thread.current.key? 5 }.should raise_error(TypeError)