1 files changed, 12 insertions, 40 deletions
diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index 024e97022a..70c3b7fb7b 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -65,32 +65,16 @@ describe "String#scan" do
     -> { "cruel world".scan(mock('x')) }.should raise_error(TypeError)
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints the results if the String argument is tainted" do
-      a = "hello hello hello".scan("hello".taint)
-      a.each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results when passed a String argument if self is tainted" do
-      a = "hello hello hello".taint.scan("hello")
-      a.each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results if the Regexp argument is tainted" do
-      a = "hello".scan(/./.taint)
-      a.each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results when passed a Regexp argument if self is tainted" do
-      a = "hello".taint.scan(/./)
-      a.each { |m| m.tainted?.should be_true }
-    end
-  end
-
   # jruby/jruby#5513
   it "does not raise any errors when passed a multi-byte string" do
     "あああaaaあああ".scan("あああ").should == ["あああ", "あああ"]
   end
+
+  it "returns Strings in the same encoding as self" do
+    "cruel world".encode("US-ASCII").scan(/\w+/).each do |s|
+      s.encoding.should == Encoding::US_ASCII
+    end
+  end
 end
 
 describe "String#scan with pattern and block" do
@@ -173,24 +157,6 @@ describe "String#scan with pattern and block" do
     $~.should == nil
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints the results if the String argument is tainted" do
-      "hello hello hello".scan("hello".taint).each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results when passed a String argument if self is tainted" do
-      "hello hello hello".taint.scan("hello").each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results if the Regexp argument is tainted" do
-      "hello".scan(/./.taint).each { |m| m.tainted?.should be_true }
-    end
-
-    it "taints the results when passed a Regexp argument if self is tainted" do
-      "hello".taint.scan(/./).each { |m| m.tainted?.should be_true }
-    end
-  end
-
   it "passes block arguments as individual arguments when blocks are provided" do
     "a b c\na b c\na b c".scan(/(\w*) (\w*) (\w*)/) do |first,second,third|
       first.should == 'a';
@@ -198,4 +164,10 @@ describe "String#scan with pattern and block" do
       third.should == 'c';
     end
   end
+
+  it "yields String instances for subclasses" do
+    a = []
+    StringSpecs::MyString.new("abc").scan(/./) { |s| a << s.class }
+    a.should == [String, String, String]
+  end
 end