1 files changed, 20 insertions, 23 deletions
diff --git a/spec/ruby/core/string/shared/partition.rb b/spec/ruby/core/string/shared/partition.rb
index 7dc3d9cc0b..4cac149ce5 100644
--- a/spec/ruby/core/string/shared/partition.rb
+++ b/spec/ruby/core/string/shared/partition.rb
@@ -2,35 +2,32 @@ require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 
 describe :string_partition, shared: true do
-  ruby_version_is '3.0' do
-    it "returns String instances when called on a subclass" do
-      StringSpecs::MyString.new("hello").send(@method, "l").each do |item|
-        item.should be_an_instance_of(String)
-      end
+  it "returns String instances when called on a subclass" do
+    StringSpecs::MyString.new("hello").send(@method, "l").each do |item|
+      item.should be_an_instance_of(String)
+    end
 
-      StringSpecs::MyString.new("hello").send(@method, "x").each do |item|
-        item.should be_an_instance_of(String)
-      end
+    StringSpecs::MyString.new("hello").send(@method, "x").each do |item|
+      item.should be_an_instance_of(String)
+    end
 
-      StringSpecs::MyString.new("hello").send(@method, /l./).each do |item|
-        item.should be_an_instance_of(String)
-      end
+    StringSpecs::MyString.new("hello").send(@method, /l./).each do |item|
+      item.should be_an_instance_of(String)
     end
   end
 
-  ruby_version_is ''...'3.0' do
-    it "returns subclass instances when called on a subclass" do
-      StringSpecs::MyString.new("hello").send(@method, StringSpecs::MyString.new("l")).each do |item|
-        item.should be_an_instance_of(StringSpecs::MyString)
-      end
+  it "returns before- and after- parts in the same encoding as self" do
+    strings = "hello".encode("US-ASCII").send(@method, "ello")
+    strings[0].encoding.should == Encoding::US_ASCII
+    strings[2].encoding.should == Encoding::US_ASCII
 
-      StringSpecs::MyString.new("hello").send(@method, "x").each do |item|
-        item.should be_an_instance_of(StringSpecs::MyString)
-      end
+    strings = "hello".encode("US-ASCII").send(@method, /ello/)
+    strings[0].encoding.should == Encoding::US_ASCII
+    strings[2].encoding.should == Encoding::US_ASCII
+  end
 
-      StringSpecs::MyString.new("hello").send(@method, /l./).each do |item|
-        item.should be_an_instance_of(StringSpecs::MyString)
-      end
-    end
+  it "returns the matching part in the separator's encoding" do
+    strings = "hello".encode("US-ASCII").send(@method, "ello")
+    strings[1].encoding.should == Encoding::UTF_8
   end
 end