1 files changed, 134 insertions, 124 deletions
diff --git a/spec/ruby/core/string/capitalize_spec.rb b/spec/ruby/core/string/capitalize_spec.rb
index 10f9ab00a1..12b1675c2e 100644
--- a/spec/ruby/core/string/capitalize_spec.rb
+++ b/spec/ruby/core/string/capitalize_spec.rb
@@ -10,188 +10,198 @@ describe "String#capitalize" do
     "hello".capitalize.should == "Hello"
     "HELLO".capitalize.should == "Hello"
     "123ABC".capitalize.should == "123abc"
+    "abcdef"[1...-1].capitalize.should == "Bcde"
   end
 
-  it "taints resulting string when self is tainted" do
-    "".taint.capitalize.tainted?.should == true
-    "hello".taint.capitalize.tainted?.should == true
-  end
-
-  ruby_version_is ''...'2.4' do
-    it "is locale insensitive (only upcases a-z and only downcases A-Z)" do
-      "ÄÖÜ".capitalize.should == "ÄÖÜ"
-      "ärger".capitalize.should == "ärger"
-      "BÄR".capitalize.should == "BÄr"
+  describe "full Unicode case mapping" do
+    it "works for all of Unicode with no option" do
+      "äöÜ".capitalize.should == "Äöü"
     end
-  end
 
-  ruby_version_is '2.4' do
-    describe "full Unicode case mapping" do
-      it "works for all of Unicode with no option" do
-        "äöÜ".capitalize.should == "Äöü"
-      end
-
-      it "only capitalizes the first resulting character when upcasing a character produces a multi-character sequence" do
-        "ß".capitalize.should == "Ss"
-      end
+    it "only capitalizes the first resulting character when upcasing a character produces a multi-character sequence" do
+      "ß".capitalize.should == "Ss"
+    end
 
-      it "updates string metadata" do
-        capitalized = "ßeT".capitalize
+    it "updates string metadata" do
+      capitalized = "ßeT".capitalize
 
-        capitalized.should == "Sset"
-        capitalized.size.should == 4
-        capitalized.bytesize.should == 4
-        capitalized.ascii_only?.should be_true
-      end
+      capitalized.should == "Sset"
+      capitalized.size.should == 4
+      capitalized.bytesize.should == 4
+      capitalized.ascii_only?.should == true
     end
+  end
 
-    describe "ASCII-only case mapping" do
-      it "does not capitalize non-ASCII characters" do
-        "ßet".capitalize(:ascii).should == "ßet"
-      end
+  describe "ASCII-only case mapping" do
+    it "does not capitalize non-ASCII characters" do
+      "ßet".capitalize(:ascii).should == "ßet"
     end
 
-    describe "full Unicode case mapping adapted for Turkic languages" do
-      it "capitalizes ASCII characters according to Turkic semantics" do
-        "iSa".capitalize(:turkic).should == "İsa"
-      end
-
-      it "allows Lithuanian as an extra option" do
-        "iSa".capitalize(:turkic, :lithuanian).should == "İsa"
-      end
+    it "handles non-ASCII substrings properly" do
+      "garçon"[1...-1].capitalize(:ascii).should == "Arço"
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { "iSa".capitalize(:turkic, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "full Unicode case mapping adapted for Turkic languages" do
+    it "capitalizes ASCII characters according to Turkic semantics" do
+      "iSa".capitalize(:turkic).should == "İsa"
     end
 
-    describe "full Unicode case mapping adapted for Lithuanian" do
-      it "currently works the same as full Unicode case mapping" do
-        "iß".capitalize(:lithuanian).should == "Iß"
-      end
+    it "allows Lithuanian as an extra option" do
+      "iSa".capitalize(:turkic, :lithuanian).should == "İsa"
+    end
 
-      it "allows Turkic as an extra option (and applies Turkic semantics)" do
-        "iß".capitalize(:lithuanian, :turkic).should == "İß"
-      end
+    it "does not allow any other additional option" do
+      -> { "iSa".capitalize(:turkic, :ascii) }.should.raise(ArgumentError)
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { "iß".capitalize(:lithuanian, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "full Unicode case mapping adapted for Lithuanian" do
+    it "currently works the same as full Unicode case mapping" do
+      "iß".capitalize(:lithuanian).should == "Iß"
     end
 
-    it "does not allow the :fold option for upcasing" do
-      lambda { "abc".capitalize(:fold) }.should raise_error(ArgumentError)
+    it "allows Turkic as an extra option (and applies Turkic semantics)" do
+      "iß".capitalize(:lithuanian, :turkic).should == "İß"
     end
 
-    it "does not allow invalid options" do
-      lambda { "abc".capitalize(:invalid_option) }.should raise_error(ArgumentError)
+    it "does not allow any other additional option" do
+      -> { "iß".capitalize(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
-  it "returns subclass instances when called on a subclass" do
-    StringSpecs::MyString.new("hello").capitalize.should be_an_instance_of(StringSpecs::MyString)
-    StringSpecs::MyString.new("Hello").capitalize.should be_an_instance_of(StringSpecs::MyString)
+  it "does not allow the :fold option for upcasing" do
+    -> { "abc".capitalize(:fold) }.should.raise(ArgumentError)
+  end
+
+  it "does not allow invalid options" do
+    -> { "abc".capitalize(:invalid_option) }.should.raise(ArgumentError)
+  end
+
+  it "returns String instances when called on a subclass" do
+    StringSpecs::MyString.new("hello").capitalize.should.instance_of?(String)
+    StringSpecs::MyString.new("Hello").capitalize.should.instance_of?(String)
+  end
+
+  it "returns a String in the same encoding as self" do
+    "h".encode("US-ASCII").capitalize.encoding.should == Encoding::US_ASCII
   end
 end
 
 describe "String#capitalize!" do
   it "capitalizes self in place" do
-    a = "hello"
-    a.capitalize!.should equal(a)
+    a = +"hello"
+    a.capitalize!.should.equal?(a)
     a.should == "Hello"
   end
 
-  ruby_version_is '2.4' do
-    describe "full Unicode case mapping" do
-      it "modifies self in place for all of Unicode with no option" do
-        a = "äöÜ"
-        a.capitalize!
-        a.should == "Äöü"
-      end
+  it "modifies self in place for non-ascii-compatible encodings" do
+    a = "heLLo".encode("utf-16le")
+    a.capitalize!
+    a.should == "Hello".encode("utf-16le")
+  end
 
-      it "only capitalizes the first resulting character when upcasing a character produces a multi-character sequence" do
-        a = "ß"
-        a.capitalize!
-        a.should == "Ss"
-      end
+  describe "full Unicode case mapping" do
+    it "modifies self in place for all of Unicode with no option" do
+      a = +"äöÜ"
+      a.capitalize!
+      a.should == "Äöü"
+    end
 
-      it "updates string metadata" do
-        capitalized = "ßeT"
-        capitalized.capitalize!
+    it "only capitalizes the first resulting character when upcasing a character produces a multi-character sequence" do
+      a = +"ß"
+      a.capitalize!
+      a.should == "Ss"
+    end
 
-        capitalized.should == "Sset"
-        capitalized.size.should == 4
-        capitalized.bytesize.should == 4
-        capitalized.ascii_only?.should be_true
-      end
+    it "works for non-ascii-compatible encodings" do
+      a = "äöü".encode("utf-16le")
+      a.capitalize!
+      a.should == "Äöü".encode("utf-16le")
     end
 
-    describe "modifies self in place for ASCII-only case mapping" do
-      it "does not capitalize non-ASCII characters" do
-        a = "ßet"
-        a.capitalize!(:ascii)
-        a.should == "ßet"
-      end
+    it "updates string metadata" do
+      capitalized = +"ßeT"
+      capitalized.capitalize!
+
+      capitalized.should == "Sset"
+      capitalized.size.should == 4
+      capitalized.bytesize.should == 4
+      capitalized.ascii_only?.should == true
     end
+  end
 
-    describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do
-      it "capitalizes ASCII characters according to Turkic semantics" do
-        a = "iSa"
-        a.capitalize!(:turkic)
-        a.should == "İsa"
-      end
+  describe "modifies self in place for ASCII-only case mapping" do
+    it "does not capitalize non-ASCII characters" do
+      a = +"ßet"
+      a.capitalize!(:ascii)
+      a.should == "ßet"
+    end
 
-      it "allows Lithuanian as an extra option" do
-        a = "iSa"
-        a.capitalize!(:turkic, :lithuanian)
-        a.should == "İsa"
-      end
+    it "works for non-ascii-compatible encodings" do
+      a = "aBc".encode("utf-16le")
+      a.capitalize!(:ascii)
+      a.should == "Abc".encode("utf-16le")
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { a = "iSa"; a.capitalize!(:turkic, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do
+    it "capitalizes ASCII characters according to Turkic semantics" do
+      a = +"iSa"
+      a.capitalize!(:turkic)
+      a.should == "İsa"
     end
 
-    describe "modifies self in place for full Unicode case mapping adapted for Lithuanian" do
-      it "currently works the same as full Unicode case mapping" do
-        a = "iß"
-        a.capitalize!(:lithuanian)
-        a.should == "Iß"
-      end
+    it "allows Lithuanian as an extra option" do
+      a = +"iSa"
+      a.capitalize!(:turkic, :lithuanian)
+      a.should == "İsa"
+    end
 
-      it "allows Turkic as an extra option (and applies Turkic semantics)" do
-        a = "iß"
-        a.capitalize!(:lithuanian, :turkic)
-        a.should == "İß"
-      end
+    it "does not allow any other additional option" do
+      -> { a = "iSa"; a.capitalize!(:turkic, :ascii) }.should.raise(ArgumentError)
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { a = "iß"; a.capitalize!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "modifies self in place for full Unicode case mapping adapted for Lithuanian" do
+    it "currently works the same as full Unicode case mapping" do
+      a = +"iß"
+      a.capitalize!(:lithuanian)
+      a.should == "Iß"
     end
 
-    it "does not allow the :fold option for upcasing" do
-      lambda { a = "abc"; a.capitalize!(:fold) }.should raise_error(ArgumentError)
+    it "allows Turkic as an extra option (and applies Turkic semantics)" do
+      a = +"iß"
+      a.capitalize!(:lithuanian, :turkic)
+      a.should == "İß"
     end
 
-    it "does not allow invalid options" do
-      lambda { a = "abc"; a.capitalize!(:invalid_option) }.should raise_error(ArgumentError)
+    it "does not allow any other additional option" do
+      -> { a = "iß"; a.capitalize!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
+  it "does not allow the :fold option for upcasing" do
+    -> { a = "abc"; a.capitalize!(:fold) }.should.raise(ArgumentError)
+  end
+
+  it "does not allow invalid options" do
+    -> { a = "abc"; a.capitalize!(:invalid_option) }.should.raise(ArgumentError)
+  end
+
   it "returns nil when no changes are made" do
-    a = "Hello"
+    a = +"Hello"
     a.capitalize!.should == nil
     a.should == "Hello"
 
-    "".capitalize!.should == nil
-    "H".capitalize!.should == nil
+    (+"").capitalize!.should == nil
+    (+"H").capitalize!.should == nil
   end
 
-  it "raises a #{frozen_error_class} when self is frozen" do
+  it "raises a FrozenError when self is frozen" do
     ["", "Hello", "hello"].each do |a|
       a.freeze
-      lambda { a.capitalize! }.should raise_error(frozen_error_class)
+      -> { a.capitalize! }.should.raise(FrozenError)
     end
   end
 end