1 files changed, 30 insertions, 49 deletions

diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index f09daa1b74..47fa7214c2 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes.rb', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "String#scan" do
   it "returns an array containing all matches" do
@@ -58,39 +58,30 @@ describe "String#scan" do
   end
 
   it "raises a TypeError if pattern isn't a Regexp and can't be converted to a String" do
-    lambda { "cruel world".scan(5)         }.should raise_error(TypeError)
+    -> { "cruel world".scan(5)         }.should.raise(TypeError)
     not_supported_on :opal do
-      lambda { "cruel world".scan(:test)   }.should raise_error(TypeError)
+      -> { "cruel world".scan(:test)   }.should.raise(TypeError)
     end
-    lambda { "cruel world".scan(mock('x')) }.should raise_error(TypeError)
+    -> { "cruel world".scan(mock('x')) }.should.raise(TypeError)
   end
 
-  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 }
+  # jruby/jruby#5513
+  it "does not raise any errors when passed a multi-byte string" do
+    "あああaaaあああ".scan("あああ").should == ["あああ", "あああ"]
   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 }
+  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
   it "returns self" do
     s = "foo"
-    s.scan(/./) {}.should equal(s)
-    s.scan(/roar/) {}.should equal(s)
+    s.scan(/./) {}.should.equal?(s)
+    s.scan(/roar/) {}.should.equal?(s)
   end
 
   it "passes each match to the block as one argument: an array" do
@@ -112,11 +103,11 @@ describe "String#scan with pattern and block" do
     offsets = []
 
     str.scan(/([aeiou])/) do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["e", "e"], ["o", "o"]]
@@ -126,11 +117,11 @@ describe "String#scan with pattern and block" do
     offsets = []
 
     str.scan("l") do
-       md = $~
-       md.string.should == str
-       matches << md.to_a
-       offsets << md.offset(0)
-       str
+      md = $~
+      md.string.should == str
+      matches << md.to_a
+      offsets << md.offset(0)
+      str
     end
 
     matches.should == [["l"], ["l"]]
@@ -166,22 +157,6 @@ describe "String#scan with pattern and block" do
     $~.should == nil
   end
 
-  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
-
   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';
@@ -189,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