1 files changed, 119 insertions, 116 deletions

diff --git a/spec/ruby/core/string/upcase_spec.rb b/spec/ruby/core/string/upcase_spec.rb
index 347f567be9..a6e1869267 100644
--- a/spec/ruby/core/string/upcase_spec.rb
+++ b/spec/ruby/core/string/upcase_spec.rb
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
@@ -8,177 +9,179 @@ describe "String#upcase" do
     "hello".upcase.should == "HELLO"
   end
 
-  ruby_version_is ''...'2.4' do
-    it "is locale insensitive (only replaces a-z)" do
-      "äöü".upcase.should == "äöü"
-
-      str = Array.new(256) { |c| c.chr }.join
-      expected = Array.new(256) do |i|
-        c = i.chr
-        c.between?("a", "z") ? c.upcase : c
-      end.join
-
-      str.upcase.should == expected
-    end
+  it "returns a String in the same encoding as self" do
+    "hello".encode("US-ASCII").upcase.encoding.should == Encoding::US_ASCII
   end
 
-  ruby_version_is '2.4' do
-    describe "full Unicode case mapping" do
-      it "works for all of Unicode with no option" do
-        "äöü".upcase.should == "ÄÖÜ"
-      end
+  describe "full Unicode case mapping" do
+    it "works for all of Unicode with no option" do
+      "äöü".upcase.should == "ÄÖÜ"
+    end
 
-      it "updates string metadata" do
-        upcased = "aßet".upcase
+    it "updates string metadata" do
+      upcased = "aßet".upcase
 
-        upcased.should == "ASSET"
-        upcased.size.should == 5
-        upcased.bytesize.should == 5
-        upcased.ascii_only?.should be_true
-      end
+      upcased.should == "ASSET"
+      upcased.size.should == 5
+      upcased.bytesize.should == 5
+      upcased.ascii_only?.should == true
     end
+  end
 
-    describe "ASCII-only case mapping" do
-      it "does not upcase non-ASCII characters" do
-        "aßet".upcase(:ascii).should == "AßET"
-      end
+  describe "ASCII-only case mapping" do
+    it "does not upcase non-ASCII characters" do
+      "aßet".upcase(:ascii).should == "AßET"
     end
 
-    describe "full Unicode case mapping adapted for Turkic languages" do
-      it "upcases ASCII characters according to Turkic semantics" do
-        "i".upcase(:turkic).should == "İ"
-      end
-
-      it "allows Lithuanian as an extra option" do
-        "i".upcase(:turkic, :lithuanian).should == "İ"
-      end
+    it "works with substrings" do
+      "prefix té"[-2..-1].upcase(:ascii).should == "Té"
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { "i".upcase(:turkic, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "full Unicode case mapping adapted for Turkic languages" do
+    it "upcases ASCII characters according to Turkic semantics" do
+      "i".upcase(:turkic).should == "İ"
     end
 
-    describe "full Unicode case mapping adapted for Lithuanian" do
-      it "currently works the same as full Unicode case mapping" do
-        "iß".upcase(:lithuanian).should == "ISS"
-      end
+    it "allows Lithuanian as an extra option" do
+      "i".upcase(:turkic, :lithuanian).should == "İ"
+    end
 
-      it "allows Turkic as an extra option (and applies Turkic semantics)" do
-        "iß".upcase(:lithuanian, :turkic).should == "İSS"
-      end
+    it "does not allow any other additional option" do
+      -> { "i".upcase(:turkic, :ascii) }.should.raise(ArgumentError)
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { "iß".upcase(: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ß".upcase(:lithuanian).should == "ISS"
     end
 
-    it "does not allow the :fold option for upcasing" do
-      lambda { "abc".upcase(:fold) }.should raise_error(ArgumentError)
+    it "allows Turkic as an extra option (and applies Turkic semantics)" do
+      "iß".upcase(:lithuanian, :turkic).should == "İSS"
     end
 
-    it "does not allow invalid options" do
-      lambda { "abc".upcase(:invalid_option) }.should raise_error(ArgumentError)
+    it "does not allow any other additional option" do
+      -> { "iß".upcase(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
-  it "taints result when self is tainted" do
-    "".taint.upcase.tainted?.should == true
-    "X".taint.upcase.tainted?.should == true
-    "x".taint.upcase.tainted?.should == true
+  it "does not allow the :fold option for upcasing" do
+    -> { "abc".upcase(:fold) }.should.raise(ArgumentError)
   end
 
-  it "returns a subclass instance for subclasses" do
-    StringSpecs::MyString.new("fooBAR").upcase.should be_an_instance_of(StringSpecs::MyString)
+  it "does not allow invalid options" do
+    -> { "abc".upcase(:invalid_option) }.should.raise(ArgumentError)
+  end
+
+  it "returns a String instance for subclasses" do
+    StringSpecs::MyString.new("fooBAR").upcase.should.instance_of?(String)
   end
 end
 
 describe "String#upcase!" do
   it "modifies self in place" do
     a = "HeLlO"
-    a.upcase!.should equal(a)
+    a.upcase!.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.upcase!
-        a.should == "ÄÖÜ"
-      end
+  it "modifies self in place for non-ascii-compatible encodings" do
+    a = "HeLlO".encode("utf-16le")
+    a.upcase!
+    a.should == "HELLO".encode("utf-16le")
+  end
 
-      it "updates string metadata for self" do
-        upcased = "aßet"
-        upcased.upcase!
+  describe "full Unicode case mapping" do
+    it "modifies self in place for all of Unicode with no option" do
+      a = "äöü"
+      a.upcase!
+      a.should == "ÄÖÜ"
+    end
 
-        upcased.should == "ASSET"
-        upcased.size.should == 5
-        upcased.bytesize.should == 5
-        upcased.ascii_only?.should be_true
-      end
+    it "works for non-ascii-compatible encodings" do
+      a = "äöü".encode("utf-16le")
+      a.upcase!
+      a.should == "ÄÖÜ".encode("utf-16le")
     end
 
-    describe "modifies self in place for ASCII-only case mapping" do
-      it "does not upcase non-ASCII characters" do
-        a = "aßet"
-        a.upcase!(:ascii)
-        a.should == "AßET"
-      end
+    it "updates string metadata for self" do
+      upcased = "aßet"
+      upcased.upcase!
+
+      upcased.should == "ASSET"
+      upcased.size.should == 5
+      upcased.bytesize.should == 5
+      upcased.ascii_only?.should == true
     end
+  end
 
-    describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do
-      it "upcases ASCII characters according to Turkic semantics" do
-        a = "i"
-        a.upcase!(:turkic)
-        a.should == "İ"
-      end
+  describe "modifies self in place for ASCII-only case mapping" do
+    it "does not upcase non-ASCII characters" do
+      a = "aßet"
+      a.upcase!(:ascii)
+      a.should == "AßET"
+    end
 
-      it "allows Lithuanian as an extra option" do
-        a = "i"
-        a.upcase!(:turkic, :lithuanian)
-        a.should == "İ"
-      end
+    it "works for non-ascii-compatible encodings" do
+      a = "abc".encode("utf-16le")
+      a.upcase!(:ascii)
+      a.should == "ABC".encode("utf-16le")
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { a = "i"; a.upcase!(:turkic, :ascii) }.should raise_error(ArgumentError)
-      end
+  describe "modifies self in place for full Unicode case mapping adapted for Turkic languages" do
+    it "upcases ASCII characters according to Turkic semantics" do
+      a = "i"
+      a.upcase!(:turkic)
+      a.should == "İ"
     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.upcase!(:lithuanian)
-        a.should == "ISS"
-      end
+    it "allows Lithuanian as an extra option" do
+      a = "i"
+      a.upcase!(:turkic, :lithuanian)
+      a.should == "İ"
+    end
 
-      it "allows Turkic as an extra option (and applies Turkic semantics)" do
-        a = "iß"
-        a.upcase!(:lithuanian, :turkic)
-        a.should == "İSS"
-      end
+    it "does not allow any other additional option" do
+      -> { a = "i"; a.upcase!(:turkic, :ascii) }.should.raise(ArgumentError)
+    end
+  end
 
-      it "does not allow any other additional option" do
-        lambda { a = "iß"; a.upcase!(: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.upcase!(:lithuanian)
+      a.should == "ISS"
     end
 
-    it "does not allow the :fold option for upcasing" do
-      lambda { a = "abc"; a.upcase!(:fold) }.should raise_error(ArgumentError)
+    it "allows Turkic as an extra option (and applies Turkic semantics)" do
+      a = "iß"
+      a.upcase!(:lithuanian, :turkic)
+      a.should == "İSS"
     end
 
-    it "does not allow invalid options" do
-      lambda { a = "abc"; a.upcase!(:invalid_option) }.should raise_error(ArgumentError)
+    it "does not allow any other additional option" do
+      -> { a = "iß"; a.upcase!(:lithuanian, :ascii) }.should.raise(ArgumentError)
     end
   end
 
+  it "does not allow the :fold option for upcasing" do
+    -> { a = "abc"; a.upcase!(:fold) }.should.raise(ArgumentError)
+  end
+
+  it "does not allow invalid options" do
+    -> { a = "abc"; a.upcase!(:invalid_option) }.should.raise(ArgumentError)
+  end
+
   it "returns nil if no modifications were made" do
     a = "HELLO"
     a.upcase!.should == nil
     a.should == "HELLO"
   end
 
-  it "raises a #{frozen_error_class} when self is frozen" do
-    lambda { "HeLlo".freeze.upcase! }.should raise_error(frozen_error_class)
-    lambda { "HELLO".freeze.upcase! }.should raise_error(frozen_error_class)
+  it "raises a FrozenError when self is frozen" do
+    -> { "HeLlo".freeze.upcase! }.should.raise(FrozenError)
+    -> { "HELLO".freeze.upcase! }.should.raise(FrozenError)
   end
 end