1 files changed, 14 insertions, 14 deletions
diff --git a/spec/ruby/core/thread/shared/to_s.rb b/spec/ruby/core/thread/shared/to_s.rb
index e47426cf3f..27e53ba4b8 100644
--- a/spec/ruby/core/thread/shared/to_s.rb
+++ b/spec/ruby/core/thread/shared/to_s.rb
@@ -1,53 +1,53 @@
 require_relative '../fixtures/classes'
 
 describe :thread_to_s, shared: true do
-  sep = ruby_version_is("2.7") ? " " : "@"
-
   it "returns a description including file and line number" do
-    Thread.new { "hello" }.send(@method).should =~ /^#<Thread:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ } \w+>$/
+    thread, line = Thread.new { "hello" }, __LINE__
+    thread.join
+    thread.send(@method).should =~ /^#<Thread:([^ ]*?) #{Regexp.escape __FILE__}:#{line} \w+>$/
   end
 
   it "has a binary encoding" do
-    Thread.new { "hello" }.send(@method).encoding.should == Encoding::BINARY
+    ThreadSpecs.status_of_current_thread.send(@method).encoding.should == Encoding::BINARY
   end
 
   it "can check it's own status" do
-    ThreadSpecs.status_of_current_thread.send(@method).should include('run')
+    ThreadSpecs.status_of_current_thread.send(@method).should.include?('run')
   end
 
   it "describes a running thread" do
-    ThreadSpecs.status_of_running_thread.send(@method).should include('run')
+    ThreadSpecs.status_of_running_thread.send(@method).should.include?('run')
   end
 
   it "describes a sleeping thread" do
-    ThreadSpecs.status_of_sleeping_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_sleeping_thread.send(@method).should.include?('sleep')
   end
 
   it "describes a blocked thread" do
-    ThreadSpecs.status_of_blocked_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_blocked_thread.send(@method).should.include?('sleep')
   end
 
   it "describes a completed thread" do
-    ThreadSpecs.status_of_completed_thread.send(@method).should include('dead')
+    ThreadSpecs.status_of_completed_thread.send(@method).should.include?('dead')
   end
 
   it "describes a killed thread" do
-    ThreadSpecs.status_of_killed_thread.send(@method).should include('dead')
+    ThreadSpecs.status_of_killed_thread.send(@method).should.include?('dead')
   end
 
   it "describes a thread with an uncaught exception" do
-    ThreadSpecs.status_of_thread_with_uncaught_exception.send(@method).should include('dead')
+    ThreadSpecs.status_of_thread_with_uncaught_exception.send(@method).should.include?('dead')
   end
 
   it "describes a dying sleeping thread" do
-    ThreadSpecs.status_of_dying_sleeping_thread.send(@method).should include('sleep')
+    ThreadSpecs.status_of_dying_sleeping_thread.send(@method).should.include?('sleep')
   end
 
   it "reports aborting on a killed thread" do
-    ThreadSpecs.status_of_dying_running_thread.send(@method).should include('aborting')
+    ThreadSpecs.status_of_dying_running_thread.send(@method).should.include?('aborting')
   end
 
   it "reports aborting on a killed thread after sleep" do
-    ThreadSpecs.status_of_dying_thread_after_sleep.send(@method).should include('aborting')
+    ThreadSpecs.status_of_dying_thread_after_sleep.send(@method).should.include?('aborting')
   end
 end