1 files changed, 19 insertions, 21 deletions
diff --git a/spec/ruby/core/string/scan_spec.rb b/spec/ruby/core/string/scan_spec.rb
index a2d1815132..47fa7214c2 100644
--- a/spec/ruby/core/string/scan_spec.rb
+++ b/spec/ruby/core/string/scan_spec.rb
@@ -58,11 +58,11 @@ describe "String#scan" do
   end
 
   it "raises a TypeError if pattern isn't a Regexp and can't be converted to a String" do
-    -> { "cruel world".scan(5)         }.should raise_error(TypeError)
+    -> { "cruel world".scan(5)         }.should.raise(TypeError)
     not_supported_on :opal do
-      -> { "cruel world".scan(:test)   }.should raise_error(TypeError)
+      -> { "cruel world".scan(:test)   }.should.raise(TypeError)
     end
-    -> { "cruel world".scan(mock('x')) }.should raise_error(TypeError)
+    -> { "cruel world".scan(mock('x')) }.should.raise(TypeError)
   end
 
   # jruby/jruby#5513
@@ -80,8 +80,8 @@ 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
@@ -103,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"]]
@@ -117,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"]]
@@ -165,11 +165,9 @@ describe "String#scan with pattern and block" do
     end
   end
 
-  ruby_version_is '3.0' do
-    it "yields String instances for subclasses" do
-      a = []
-      StringSpecs::MyString.new("abc").scan(/./) { |s| a << s.class }
-      a.should == [String, String, String]
-    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