1 files changed, 19 insertions, 23 deletions
diff --git a/spec/ruby/core/string/strip_spec.rb b/spec/ruby/core/string/strip_spec.rb
index 252d4a9cc3..81994a7f2e 100644
--- a/spec/ruby/core/string/strip_spec.rb
+++ b/spec/ruby/core/string/strip_spec.rb
@@ -1,41 +1,31 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/strip'
 
 describe "String#strip" do
+  it_behaves_like :string_strip, :strip
+
   it "returns a new string with leading and trailing whitespace removed" do
     "   hello   ".strip.should == "hello"
     "   hello world   ".strip.should == "hello world"
     "\tgoodbye\r\v\n".strip.should == "goodbye"
-    "\x00 goodbye \x00".strip.should == "\x00 goodbye"
-  end
-
-  it "returns a copy of self with trailing NULL bytes and whitespace" do
-    " \x00 goodbye \x00 ".strip.should == "\x00 goodbye"
   end
 
-  ruby_version_is ''...'2.7' do
-    it "taints the result when self is tainted" do
-      "".taint.strip.should.tainted?
-      "ok".taint.strip.should.tainted?
-      "  ok  ".taint.strip.should.tainted?
-    end
+  it "returns a copy of self without leading and trailing NULL bytes and whitespace" do
+    " \x00 goodbye \x00 ".strip.should == "goodbye"
   end
 end
 
 describe "String#strip!" do
   it "modifies self in place and returns self" do
     a = "   hello   "
-    a.strip!.should equal(a)
+    a.strip!.should.equal?(a)
     a.should == "hello"
 
     a = "\tgoodbye\r\v\n"
     a.strip!
     a.should == "goodbye"
-
-    a = "\000 goodbye \000"
-    a.strip!
-    a.should == "\000 goodbye"
-
   end
 
   it "returns nil if no modifications where made" do
@@ -44,19 +34,25 @@ describe "String#strip!" do
     a.should == "hello"
   end
 
-  it "modifies self removing trailing NULL bytes and whitespace" do
-    a = " \x00 goodbye \x00 "
+  it "makes a string empty if it is only whitespace" do
+    "".strip!.should == nil
+    " ".strip.should == ""
+    "  ".strip.should == ""
+  end
+
+  it "removes leading and trailing NULL bytes and whitespace" do
+    a = "\000 goodbye \000"
     a.strip!
-    a.should == "\x00 goodbye"
+    a.should == "goodbye"
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-    -> { "  hello  ".freeze.strip! }.should raise_error(FrozenError)
+    -> { "  hello  ".freeze.strip! }.should.raise(FrozenError)
   end
 
   # see #1552
   it "raises a FrozenError on a frozen instance that would not be modified" do
-    -> {"hello".freeze.strip! }.should raise_error(FrozenError)
-    -> {"".freeze.strip!      }.should raise_error(FrozenError)
+    -> {"hello".freeze.strip! }.should.raise(FrozenError)
+    -> {"".freeze.strip!      }.should.raise(FrozenError)
   end
 end