1 files changed, 26 insertions, 14 deletions
diff --git a/spec/ruby/core/string/reverse_spec.rb b/spec/ruby/core/string/reverse_spec.rb
index bade4685d9..aa6abe6036 100644
--- a/spec/ruby/core/string/reverse_spec.rb
+++ b/spec/ruby/core/string/reverse_spec.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: false
 
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
@@ -10,25 +11,27 @@ describe "String#reverse" do
     "".reverse.should == ""
   end
 
-  ruby_version_is '3.0' do
-    it "returns String instances when called on a subclass" do
-      StringSpecs::MyString.new("stressed").reverse.should be_an_instance_of(String)
-      StringSpecs::MyString.new("m").reverse.should be_an_instance_of(String)
-      StringSpecs::MyString.new("").reverse.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("stressed").reverse.should be_an_instance_of(StringSpecs::MyString)
-      StringSpecs::MyString.new("m").reverse.should be_an_instance_of(StringSpecs::MyString)
-      StringSpecs::MyString.new("").reverse.should be_an_instance_of(StringSpecs::MyString)
-    end
+  it "returns String instances when called on a subclass" do
+    StringSpecs::MyString.new("stressed").reverse.should be_an_instance_of(String)
+    StringSpecs::MyString.new("m").reverse.should be_an_instance_of(String)
+    StringSpecs::MyString.new("").reverse.should be_an_instance_of(String)
   end
 
   it "reverses a string with multi byte characters" do
     "微軟正黑體".reverse.should == "體黑正軟微"
   end
+
+  it "works with a broken string" do
+    str = "微軟\xDF\xDE正黑體".force_encoding(Encoding::UTF_8)
+
+    str.valid_encoding?.should be_false
+
+    str.reverse.should == "體黑正\xDE\xDF軟微"
+  end
+
+  it "returns a String in the same encoding as self" do
+    "stressed".encode("US-ASCII").reverse.encoding.should == Encoding::US_ASCII
+  end
 end
 
 describe "String#reverse!" do
@@ -55,4 +58,13 @@ describe "String#reverse!" do
     str.reverse!
     str.should == "體黑正軟微"
   end
+
+  it "works with a broken string" do
+    str = "微軟\xDF\xDE正黑體".force_encoding(Encoding::UTF_8)
+
+    str.valid_encoding?.should be_false
+    str.reverse!
+
+    str.should == "體黑正\xDE\xDF軟微"
+  end
 end