16 files changed, 95 insertions, 87 deletions
diff --git a/spec/ruby/library/stringscanner/check_spec.rb b/spec/ruby/library/stringscanner/check_spec.rb
index c7f788f0b3..a97c26af83 100644
--- a/spec/ruby/library/stringscanner/check_spec.rb
+++ b/spec/ruby/library/stringscanner/check_spec.rb
@@ -13,4 +13,13 @@ describe "StringScanner#check" do
     @s.check(/is/).should == nil
     @s.matched.should == nil
   end
+
+  it "treats String as the pattern itself" do
+    @s.check("This").should == "This"
+    @s.matched.should == "This"
+    @s.pos.should == 0
+    @s.check(/is/).should == nil
+    @s.matched.should == nil
+  end
+
 end
diff --git a/spec/ruby/library/stringscanner/check_until_spec.rb b/spec/ruby/library/stringscanner/check_until_spec.rb
index e92ae5a2e9..ad222fd76b 100644
--- a/spec/ruby/library/stringscanner/check_until_spec.rb
+++ b/spec/ruby/library/stringscanner/check_until_spec.rb
@@ -12,4 +12,10 @@ describe "StringScanner#check_until" do
     @s.matched.should == "a"
     @s.check_until(/test/).should == "This is a test"
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.check_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/exist_spec.rb b/spec/ruby/library/stringscanner/exist_spec.rb
index beafadc07b..ff860a0d3e 100644
--- a/spec/ruby/library/stringscanner/exist_spec.rb
+++ b/spec/ruby/library/stringscanner/exist_spec.rb
@@ -21,4 +21,10 @@ describe "StringScanner#exist?" do
     @s.scan(/This is/)
     @s.exist?(/i/).should == nil
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.exist?('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/getch_spec.rb b/spec/ruby/library/stringscanner/getch_spec.rb
index a6be0d4221..449c20ad3b 100644
--- a/spec/ruby/library/stringscanner/getch_spec.rb
+++ b/spec/ruby/library/stringscanner/getch_spec.rb
@@ -13,7 +13,7 @@ describe "StringScanner#getch" do
 
   it "is multi-byte character sensitive" do
     # Japanese hiragana "A" in EUC-JP
-    src = "\244\242".force_encoding("euc-jp")
+    src = "\244\242".dup.force_encoding("euc-jp")
 
     s = StringScanner.new(src)
     s.getch.should == src
diff --git a/spec/ruby/library/stringscanner/matched_size_spec.rb b/spec/ruby/library/stringscanner/matched_size_spec.rb
index a36bd3aafe..d9c338a07e 100644
--- a/spec/ruby/library/stringscanner/matched_size_spec.rb
+++ b/spec/ruby/library/stringscanner/matched_size_spec.rb
@@ -1,7 +1,24 @@
 require_relative '../../spec_helper'
-require_relative 'shared/matched_size'
 require 'strscan'
 
 describe "StringScanner#matched_size" do
-  it_behaves_like :strscan_matched_size, :matched_size
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns the size of the most recent match" do
+    @s.check(/This/)
+    @s.matched_size.should == 4
+    @s.matched_size.should == 4
+    @s.scan(//)
+    @s.matched_size.should == 0
+  end
+
+  it "returns nil if there was no recent match" do
+    @s.matched_size.should == nil
+    @s.check(/\d+/)
+    @s.matched_size.should == nil
+    @s.terminate
+    @s.matched_size.should == nil
+  end
 end
diff --git a/spec/ruby/library/stringscanner/scan_spec.rb b/spec/ruby/library/stringscanner/scan_spec.rb
index 2269abd6b3..ea711767b9 100644
--- a/spec/ruby/library/stringscanner/scan_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_spec.rb
@@ -50,17 +50,9 @@ describe "StringScanner#scan" do
     @s.scan(/./).should be_nil
   end
 
-  ruby_version_is ""..."2.7" do
-    it "raises a TypeError if pattern is a String" do
-      -> { @s.scan("aoeu") }.should raise_error(TypeError)
-    end
-  end
-
-  ruby_version_is "2.7" do
-    it "treats String as the pattern itself" do
-      @s.scan("this").should be_nil
-      @s.scan("This").should == "This"
-    end
+  it "treats String as the pattern itself" do
+    @s.scan("this").should be_nil
+    @s.scan("This").should == "This"
   end
 
   it "raises a TypeError if pattern isn't a Regexp nor String" do
@@ -75,23 +67,21 @@ describe "StringScanner#scan with fixed_anchor: true" do
     @s = StringScanner.new("This\nis\na\ntest", fixed_anchor: true)
   end
 
-  ruby_version_is "2.7" do
-    it "returns the matched string" do
-      @s.scan(/\w+/).should == "This"
-      @s.scan(/.../m).should == "\nis"
-      @s.scan(//).should == ""
-      @s.scan(/\s+/).should == "\n"
-    end
+  it "returns the matched string" do
+    @s.scan(/\w+/).should == "This"
+    @s.scan(/.../m).should == "\nis"
+    @s.scan(//).should == ""
+    @s.scan(/\s+/).should == "\n"
+  end
 
-    it "treats ^ as matching from the beginning of line" do
-      @s.scan(/\w+\n/).should == "This\n"
-      @s.scan(/^\w/).should == "i"
-      @s.scan(/^\w/).should be_nil
-    end
+  it "treats ^ as matching from the beginning of line" do
+    @s.scan(/\w+\n/).should == "This\n"
+    @s.scan(/^\w/).should == "i"
+    @s.scan(/^\w/).should be_nil
+  end
 
-    it "treats \\A as matching from the beginning of string" do
-      @s.scan(/\A\w/).should == "T"
-      @s.scan(/\A\w/).should be_nil
-    end
+  it "treats \\A as matching from the beginning of string" do
+    @s.scan(/\A\w/).should == "T"
+    @s.scan(/\A\w/).should be_nil
   end
 end
diff --git a/spec/ruby/library/stringscanner/scan_until_spec.rb b/spec/ruby/library/stringscanner/scan_until_spec.rb
index 94239db50e..6b7782572d 100644
--- a/spec/ruby/library/stringscanner/scan_until_spec.rb
+++ b/spec/ruby/library/stringscanner/scan_until_spec.rb
@@ -20,4 +20,10 @@ describe "StringScanner#scan_until" do
     @s.scan(/T/)
     @s.scan_until(/^h/).should == "h"
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.scan_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/search_full_spec.rb b/spec/ruby/library/stringscanner/search_full_spec.rb
index da9067e012..7d2a714fa5 100644
--- a/spec/ruby/library/stringscanner/search_full_spec.rb
+++ b/spec/ruby/library/stringscanner/search_full_spec.rb
@@ -27,4 +27,10 @@ describe "StringScanner#search_full" do
     @s.search_full(/This/, true, true).should == "This"
     @s.pos.should == 4
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.search_full('T', true, true)
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/shared/concat.rb b/spec/ruby/library/stringscanner/shared/concat.rb
index cb884a5c01..1dbae11f7c 100644
--- a/spec/ruby/library/stringscanner/shared/concat.rb
+++ b/spec/ruby/library/stringscanner/shared/concat.rb
@@ -1,6 +1,6 @@
 describe :strscan_concat, shared: true do
   it "concatenates the given argument to self and returns self" do
-    s = StringScanner.new("hello ")
+    s = StringScanner.new(+"hello ")
     s.send(@method, 'world').should == s
     s.string.should == "hello world"
     s.eos?.should be_false
diff --git a/spec/ruby/library/stringscanner/shared/extract_range.rb b/spec/ruby/library/stringscanner/shared/extract_range.rb
index 1c14f716c9..e7404fd0cb 100644
--- a/spec/ruby/library/stringscanner/shared/extract_range.rb
+++ b/spec/ruby/library/stringscanner/shared/extract_range.rb
@@ -8,17 +8,4 @@ describe :extract_range, shared: true do
     ch.should_not be_kind_of(cls)
     ch.should be_an_instance_of(String)
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints the returned String if the input was tainted" do
-      str = 'abc'
-      str.taint
-
-      s = StringScanner.new(str)
-
-      s.send(@method).tainted?.should be_true
-      s.send(@method).tainted?.should be_true
-      s.send(@method).tainted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/library/stringscanner/shared/extract_range_matched.rb b/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
index 5c536f5c01..070a132812 100644
--- a/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
+++ b/spec/ruby/library/stringscanner/shared/extract_range_matched.rb
@@ -10,15 +10,4 @@ describe :extract_range_matched, shared: true do
     ch.should_not be_kind_of(cls)
     ch.should be_an_instance_of(String)
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints the returned String if the input was tainted" do
-      str = 'abc'
-      str.taint
-
-      s = StringScanner.new(str)
-      s.scan(/\w{1}/)
-      s.send(@method).tainted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/library/stringscanner/shared/matched_size.rb b/spec/ruby/library/stringscanner/shared/matched_size.rb
deleted file mode 100644
index 92174733f7..0000000000
--- a/spec/ruby/library/stringscanner/shared/matched_size.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-describe :strscan_matched_size, shared: true do
-  before :each do
-    @s = StringScanner.new("This is a test")
-  end
-
-  it "returns the size of the most recent match" do
-    @s.check(/This/)
-    @s.send(@method).should == 4
-    @s.send(@method).should == 4
-    @s.scan(//)
-    @s.send(@method).should == 0
-  end
-
-  it "returns nil if there was no recent match" do
-    @s.send(@method).should == nil
-    @s.check(/\d+/)
-    @s.send(@method).should == nil
-    @s.terminate
-    @s.send(@method).should == nil
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/peek.rb b/spec/ruby/library/stringscanner/shared/peek.rb
index 4e2e643353..4c757866c1 100644
--- a/spec/ruby/library/stringscanner/shared/peek.rb
+++ b/spec/ruby/library/stringscanner/shared/peek.rb
@@ -36,14 +36,4 @@ describe :strscan_peek, shared: true do
     ch.should_not be_kind_of(cls)
     ch.should be_an_instance_of(String)
   end
-
-  ruby_version_is ''...'2.7' do
-    it "taints the returned String if the input was tainted" do
-      str = 'abc'
-      str.taint
-
-      s = StringScanner.new(str)
-      s.send(@method, 1).tainted?.should be_true
-    end
-  end
 end
diff --git a/spec/ruby/library/stringscanner/size_spec.rb b/spec/ruby/library/stringscanner/size_spec.rb
new file mode 100644
index 0000000000..3e475489e3
--- /dev/null
+++ b/spec/ruby/library/stringscanner/size_spec.rb
@@ -0,0 +1,17 @@
+require_relative '../../spec_helper'
+require 'strscan'
+
+describe "StringScanner#size" do
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns the number of captures groups of the last match" do
+    @s.scan(/(.)(.)(.)/)
+    @s.size.should == 4
+  end
+
+  it "returns nil if there is no last match" do
+    @s.size.should == nil
+  end
+end
diff --git a/spec/ruby/library/stringscanner/skip_until_spec.rb b/spec/ruby/library/stringscanner/skip_until_spec.rb
index 73eb91b8ad..7b56f13e4f 100644
--- a/spec/ruby/library/stringscanner/skip_until_spec.rb
+++ b/spec/ruby/library/stringscanner/skip_until_spec.rb
@@ -15,4 +15,10 @@ describe "StringScanner#skip_until" do
   it "returns nil if no match was found" do
     @s.skip_until(/d+/).should == nil
   end
+
+  it "raises TypeError if given a String" do
+    -> {
+      @s.skip_until('T')
+    }.should raise_error(TypeError, 'wrong argument type String (expected Regexp)')
+  end
 end
diff --git a/spec/ruby/library/stringscanner/string_spec.rb b/spec/ruby/library/stringscanner/string_spec.rb
index 28e2f0ed37..cba6bd51dd 100644
--- a/spec/ruby/library/stringscanner/string_spec.rb
+++ b/spec/ruby/library/stringscanner/string_spec.rb
@@ -3,7 +3,7 @@ require 'strscan'
 
 describe "StringScanner#string" do
   before :each do
-    @string = "This is a test"
+    @string = +"This is a test"
     @s = StringScanner.new(@string)
   end