1 files changed, 21 insertions, 14 deletions
diff --git a/spec/ruby/core/thread/thread_variable_spec.rb b/spec/ruby/core/thread/thread_variable_spec.rb
index d64e6ec63d..ebafd4f3eb 100644
--- a/spec/ruby/core/thread/thread_variable_spec.rb
+++ b/spec/ruby/core/thread/thread_variable_spec.rb
@@ -11,43 +11,50 @@ describe "Thread#thread_variable?" do
 
   it "returns false if the thread variables do not contain 'key'" do
     @t.thread_variable_set(:a, 2)
-    @t.thread_variable?(:b).should be_false
+    @t.thread_variable?(:b).should == false
   end
 
   it "returns true if the thread variables contain 'key'" do
     @t.thread_variable_set(:a, 2)
-    @t.thread_variable?(:a).should be_true
+    @t.thread_variable?(:a).should == true
   end
 
   it "accepts String and Symbol keys interchangeably" do
-    @t.thread_variable?('a').should be_false
-    @t.thread_variable?(:a).should be_false
+    @t.thread_variable?('a').should == false
+    @t.thread_variable?(:a).should == false
 
     @t.thread_variable_set(:a, 49)
 
-    @t.thread_variable?('a').should be_true
-    @t.thread_variable?(:a).should be_true
+    @t.thread_variable?('a').should == true
+    @t.thread_variable?(:a).should == true
   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('a')
     @t.thread_variable_set(:a, 49)
-    @t.thread_variable?(key).should be_true
+    @t.thread_variable?(key).should == true
   end
 
   it "does not raise FrozenError if the thread is frozen" do
     @t.freeze
-    @t.thread_variable?(:a).should be_false
+    @t.thread_variable?(:a).should == false
   end
 
-  it "does not raise a TypeError if the key is neither Symbol nor String, nor responds to #to_str" do
-    @t.thread_variable?(123).should be_false
+  it "raises a TypeError if the key is neither Symbol nor String when thread variables are already set" do
+    @t.thread_variable_set(:a, 49)
+    -> { @t.thread_variable?(123) }.should.raise(TypeError, /123 is not a symbol/)
   end
 
-  it "does not try to convert the key with #to_sym" do
-    key = mock('key')
-    key.should_not_receive(:to_sym)
-    @t.thread_variable?(key).should be_false
+  ruby_version_is '3.4' do
+    it "raises a TypeError if the key is neither Symbol nor String when no thread variables are set" do
+      -> { @t.thread_variable?(123) }.should.raise(TypeError, /123 is not a symbol/)
+    end
+
+    it "raises a TypeError if the key is neither Symbol nor String without calling #to_sym" do
+      key = mock('key')
+      key.should_not_receive(:to_sym)
+      -> { @t.thread_variable?(key) }.should.raise(TypeError, /#{Regexp.escape(key.inspect)} is not a symbol/)
+    end
   end
 end