1 files changed, 27 insertions, 2 deletions
diff --git a/spec/ruby/core/string/rpartition_spec.rb b/spec/ruby/core/string/rpartition_spec.rb
index fc37f8b427..a7dd7430b7 100644
--- a/spec/ruby/core/string/rpartition_spec.rb
+++ b/spec/ruby/core/string/rpartition_spec.rb
@@ -1,7 +1,10 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/partition'
 
 describe "String#rpartition with String" do
+  it_behaves_like :string_partition, :rpartition
+
   it "returns an array of substrings based on splitting on the given string" do
     "hello world".rpartition("o").should == ["hello w", "o", "rld"]
   end
@@ -40,7 +43,29 @@ describe "String#rpartition with String" do
   end
 
   it "raises an error if not convertible to string" do
-    ->{ "hello".rpartition(5) }.should raise_error(TypeError)
-    ->{ "hello".rpartition(nil) }.should raise_error(TypeError)
+    ->{ "hello".rpartition(5) }.should.raise(TypeError)
+    ->{ "hello".rpartition(nil) }.should.raise(TypeError)
+  end
+
+  it "handles a pattern in a superset encoding" do
+    string = "hello".dup.force_encoding(Encoding::US_ASCII)
+
+    result = string.rpartition("é")
+
+    result.should == ["", "", "hello"]
+    result[0].encoding.should == Encoding::US_ASCII
+    result[1].encoding.should == Encoding::US_ASCII
+    result[2].encoding.should == Encoding::US_ASCII
+  end
+
+  it "handles a pattern in a subset encoding" do
+    pattern = "o".dup.force_encoding(Encoding::US_ASCII)
+
+    result = "héllo world".rpartition(pattern)
+
+    result.should == ["héllo w", "o", "rld"]
+    result[0].encoding.should == Encoding::UTF_8
+    result[1].encoding.should == Encoding::US_ASCII
+    result[2].encoding.should == Encoding::UTF_8
   end
 end