1 files changed, 21 insertions, 24 deletions
diff --git a/spec/ruby/core/string/lstrip_spec.rb b/spec/ruby/core/string/lstrip_spec.rb
index 75434613f1..5896f8d7da 100644
--- a/spec/ruby/core/string/lstrip_spec.rb
+++ b/spec/ruby/core/string/lstrip_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 require_relative 'shared/strip'
@@ -6,11 +7,11 @@ describe "String#lstrip" do
   it_behaves_like :string_strip, :lstrip
 
   it "returns a copy of self with leading whitespace removed" do
-   "  hello  ".lstrip.should == "hello  "
-   "  hello world  ".lstrip.should == "hello world  "
-   "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
-   "hello".lstrip.should == "hello"
-   " こにちわ".lstrip.should == "こにちわ"
+    "  hello  ".lstrip.should == "hello  "
+    "  hello world  ".lstrip.should == "hello world  "
+    "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
+    "hello".lstrip.should == "hello"
+    " こにちわ".lstrip.should == "こにちわ"
   end
 
   it "works with lazy substrings" do
@@ -20,18 +21,16 @@ describe "String#lstrip" do
     "   こにちわ "[1...-1].lstrip.should == "こにちわ"
   end
 
-  ruby_version_is '3.0' do
-    it "strips leading \\0" do
-     "\x00hello".lstrip.should == "hello"
-     "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
-    end
+  it "strips leading \\0" do
+    "\x00hello".lstrip.should == "hello"
+    "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
   end
 end
 
 describe "String#lstrip!" do
   it "modifies self in place and returns self" do
     a = "  hello  "
-    a.lstrip!.should equal(a)
+    a.lstrip!.should.equal?(a)
     a.should == "hello  "
   end
 
@@ -47,31 +46,29 @@ describe "String#lstrip!" do
     "  ".lstrip.should == ""
   end
 
-  ruby_version_is '3.0' do
-    it "removes leading NULL bytes and whitespace" do
-      a = "\000 \000hello\000 \000"
-      a.lstrip!
-      a.should == "hello\000 \000"
-    end
+  it "removes leading NULL bytes and whitespace" do
+    a = "\000 \000hello\000 \000"
+    a.lstrip!
+    a.should == "hello\000 \000"
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "  hello  ".freeze.lstrip! }.should raise_error(FrozenError)
+    -> { "  hello  ".freeze.lstrip! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23657]
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> { "hello".freeze.lstrip! }.should raise_error(FrozenError)
-    -> { "".freeze.lstrip!      }.should raise_error(FrozenError)
+    -> { "hello".freeze.lstrip! }.should.raise(FrozenError)
+    -> { "".freeze.lstrip!      }.should.raise(FrozenError)
   end
 
   it "raises an ArgumentError if the first non-space codepoint is invalid" do
     s = "\xDFabc".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.lstrip! }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.lstrip! }.should.raise(ArgumentError)
 
     s = "   \xDFabc".force_encoding(Encoding::UTF_8)
-    s.valid_encoding?.should be_false
-    -> { s.lstrip! }.should raise_error(ArgumentError)
+    s.valid_encoding?.should == false
+    -> { s.lstrip! }.should.raise(ArgumentError)
   end
 end