1 files changed, 42 insertions, 14 deletions
diff --git a/spec/ruby/core/string/rstrip_spec.rb b/spec/ruby/core/string/rstrip_spec.rb
index 9dd686ce55..1638ea375d 100644
--- a/spec/ruby/core/string/rstrip_spec.rb
+++ b/spec/ruby/core/string/rstrip_spec.rb
@@ -1,30 +1,36 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes.rb', __FILE__)
+# frozen_string_literal: false
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require_relative 'shared/strip'
 
 describe "String#rstrip" do
+  it_behaves_like :string_strip, :rstrip
+
   it "returns a copy of self with trailing whitespace removed" do
     "  hello  ".rstrip.should == "  hello"
     "  hello world  ".rstrip.should == "  hello world"
     "  hello world \n\r\t\n\v\r".rstrip.should == "  hello world"
     "hello".rstrip.should == "hello"
     "hello\x00".rstrip.should == "hello"
+    "こにちわ ".rstrip.should == "こにちわ"
   end
 
-  it "returns a copy of self with all trailing whitespace and NULL bytes removed" do
-    "\x00 \x00hello\x00 \x00".rstrip.should == "\x00 \x00hello"
+  it "works with lazy substrings" do
+    "  hello  "[1...-1].rstrip.should == " hello"
+    "  hello world  "[1...-1].rstrip.should == " hello world"
+    "  hello world \n\r\t\n\v\r"[1...-1].rstrip.should == " hello world"
+    " こにちわ  "[1...-1].rstrip.should == "こにちわ"
   end
 
-  it "taints the result when self is tainted" do
-    "".taint.rstrip.tainted?.should == true
-    "ok".taint.rstrip.tainted?.should == true
-    "ok    ".taint.rstrip.tainted?.should == true
+  it "returns a copy of self with all trailing whitespace and NULL bytes removed" do
+    "\x00 \x00hello\x00 \x00".rstrip.should == "\x00 \x00hello"
   end
 end
 
 describe "String#rstrip!" do
   it "modifies self in place and returns self" do
     a = "  hello  "
-    a.rstrip!.should equal(a)
+    a.rstrip!.should.equal?(a)
     a.should == "  hello"
   end
 
@@ -40,13 +46,35 @@ describe "String#rstrip!" do
     a.should == "hello"
   end
 
-  it "raises a RuntimeError on a frozen instance that is modified" do
-    lambda { "  hello  ".freeze.rstrip! }.should raise_error(RuntimeError)
+  it "makes a string empty if it is only whitespace" do
+    "".rstrip!.should == nil
+    " ".rstrip.should == ""
+    "  ".rstrip.should == ""
+  end
+
+  it "removes trailing NULL bytes and whitespace" do
+    a = "\000 goodbye \000"
+    a.rstrip!
+    a.should == "\000 goodbye"
+  end
+
+  it "raises a FrozenError on a frozen instance that is modified" do
+    -> { "  hello  ".freeze.rstrip! }.should.raise(FrozenError)
   end
 
   # see [ruby-core:23666]
-  it "raises a RuntimeError on a frozen instance that would not be modified" do
-    lambda { "hello".freeze.rstrip! }.should raise_error(RuntimeError)
-    lambda { "".freeze.rstrip!      }.should raise_error(RuntimeError)
+  it "raises a FrozenError on a frozen instance that would not be modified" do
+    -> { "hello".freeze.rstrip! }.should.raise(FrozenError)
+    -> { "".freeze.rstrip!      }.should.raise(FrozenError)
+  end
+
+  it "raises an Encoding::CompatibilityError if the last non-space codepoint is invalid" do
+    s = "abc\xDF".force_encoding(Encoding::UTF_8)
+    s.valid_encoding?.should == false
+    -> { s.rstrip! }.should.raise(Encoding::CompatibilityError)
+
+    s = "abc\xDF   ".force_encoding(Encoding::UTF_8)
+    s.valid_encoding?.should == false
+    -> { s.rstrip! }.should.raise(Encoding::CompatibilityError)
   end
 end