1 files changed, 8 insertions, 15 deletions
diff --git a/spec/ruby/core/string/delete_suffix_spec.rb b/spec/ruby/core/string/delete_suffix_spec.rb
index 12d0ee175e..1842d75aa5 100644
--- a/spec/ruby/core/string/delete_suffix_spec.rb
+++ b/spec/ruby/core/string/delete_suffix_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
@@ -21,11 +22,8 @@ describe "String#delete_suffix" do
     r.should == s
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints resulting strings when other is tainted" do
-      'hello'.taint.delete_suffix('ello').should.tainted?
-      'hello'.taint.delete_suffix('').should.tainted?
-    end
+  it "does not remove partial bytes, only full characters" do
+    "\xe3\x81\x82".delete_suffix("\x82").should == "\xe3\x81\x82"
   end
 
   it "doesn't set $~" do
@@ -41,18 +39,13 @@ describe "String#delete_suffix" do
     'hello'.delete_suffix(o).should == 'h'
   end
 
-  ruby_version_is ''...'3.0' do
-    it "returns a subclass instance when called on a subclass instance" do
-      s = StringSpecs::MyString.new('hello')
-      s.delete_suffix('ello').should be_an_instance_of(StringSpecs::MyString)
-    end
+  it "returns a String instance when called on a subclass instance" do
+    s = StringSpecs::MyString.new('hello')
+    s.delete_suffix('ello').should be_an_instance_of(String)
   end
 
-  ruby_version_is '3.0' do
-    it "returns a String instance when called on a subclass instance" do
-      s = StringSpecs::MyString.new('hello')
-      s.delete_suffix('ello').should be_an_instance_of(String)
-    end
+  it "returns a String in the same encoding as self" do
+    "hello".encode("US-ASCII").delete_suffix("ello").encoding.should == Encoding::US_ASCII
   end
 end