1 files changed, 11 insertions, 23 deletions
diff --git a/spec/ruby/core/matchdata/pre_match_spec.rb b/spec/ruby/core/matchdata/pre_match_spec.rb
index 1f1f9daec6..106612a4f7 100644
--- a/spec/ruby/core/matchdata/pre_match_spec.rb
+++ b/spec/ruby/core/matchdata/pre_match_spec.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "MatchData#pre_match" do
   it "returns the string before the match, equiv. special var $`" do
@@ -6,31 +7,18 @@ describe "MatchData#pre_match" do
     $`.should == 'T'
   end
 
-  it "keeps taint status from the source string" do
-    str = "THX1138: The Movie"
-    str.taint
-    res = /(.)(.)(\d+)(\d)/.match(str).pre_match
-    res.tainted?.should be_true
-    $`.tainted?.should be_true
+  it "sets the encoding to the encoding of the source String" do
+    str = "abc".dup.force_encoding Encoding::EUC_JP
+    str.match(/b/).pre_match.encoding.should.equal?(Encoding::EUC_JP)
   end
 
-  it "keeps untrusted status from the source string" do
-    str = "THX1138: The Movie"
-    str.untrust
-    res = /(.)(.)(\d+)(\d)/.match(str).pre_match
-    res.untrusted?.should be_true
-    $`.untrusted?.should be_true
+  it "sets an empty result to the encoding of the source String" do
+    str = "abc".dup.force_encoding Encoding::ISO_8859_1
+    str.match(/a/).pre_match.encoding.should.equal?(Encoding::ISO_8859_1)
   end
 
-  with_feature :encoding do
-    it "sets the encoding to the encoding of the source String" do
-      str = "abc".force_encoding Encoding::EUC_JP
-      str.match(/b/).pre_match.encoding.should equal(Encoding::EUC_JP)
-    end
-
-    it "sets an empty result to the encoding of the source String" do
-      str = "abc".force_encoding Encoding::ISO_8859_1
-      str.match(/a/).pre_match.encoding.should equal(Encoding::ISO_8859_1)
-    end
+  it "returns an instance of String when given a String subclass" do
+    str = MatchDataSpecs::MyString.new("THX1138: The Movie")
+    /(.)(.)(\d+)(\d)/.match(str).pre_match.should.instance_of?(String)
   end
 end