1 files changed, 91 insertions, 109 deletions
diff --git a/spec/ruby/core/string/upcase_spec.rb b/spec/ruby/core/string/upcase_spec.rb
index 347f567be9..eb736ebfa1 100644
--- a/spec/ruby/core/string/upcase_spec.rb
+++ b/spec/ruby/core/string/upcase_spec.rb
@@ -8,79 +8,63 @@ 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 == "äöü"
+  describe "full Unicode case mapping" do
+    it "works for all of Unicode with no option" do
+      "äöü".upcase.should == "ÄÖÜ"
+    end
 
-      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
+    it "updates string metadata" do
+      upcased = "aßet".upcase
 
-      str.upcase.should == expected
+      upcased.should == "ASSET"
+      upcased.size.should == 5
+      upcased.bytesize.should == 5
+      upcased.ascii_only?.should be_true
     end
   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
-
-      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
+  describe "ASCII-only case mapping" do
+    it "does not upcase non-ASCII characters" do
+      "aßet".upcase(:ascii).should == "AßET"
     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 "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 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 "does not allow any other additional option" do
-        lambda { "i".upcase(:turkic, :ascii) }.should raise_error(ArgumentError)
-      end
+    it "allows Lithuanian as an extra option" do
+      "i".upcase(:turkic, :lithuanian).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 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
+      lambda { "i".upcase(:turkic, :ascii) }.should raise_error(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
+      lambda { "iß".upcase(:lithuanian, :ascii) }.should raise_error(ArgumentError)
     end
   end
 
+  it "does not allow the :fold option for upcasing" do
+    lambda { "abc".upcase(:fold) }.should raise_error(ArgumentError)
+  end
+
+  it "does not allow invalid options" do
+    lambda { "abc".upcase(:invalid_option) }.should raise_error(ArgumentError)
+  end
+
   it "taints result when self is tainted" do
     "".taint.upcase.tainted?.should == true
     "X".taint.upcase.tainted?.should == true
@@ -99,78 +83,76 @@ describe "String#upcase!" do
     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
+  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 "updates string metadata for self" do
-        upcased = "aßet"
-        upcased.upcase!
+    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 be_true
-      end
+      upcased.should == "ASSET"
+      upcased.size.should == 5
+      upcased.bytesize.should == 5
+      upcased.ascii_only?.should be_true
     end
+  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
+  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
+  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
-
-      it "allows Lithuanian as an extra option" do
-        a = "i"
-        a.upcase!(:turkic, :lithuanian)
-        a.should == "İ"
-      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
+      lambda { a = "i"; a.upcase!(:turkic, :ascii) }.should raise_error(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
+      lambda { a = "iß"; a.upcase!(:lithuanian, :ascii) }.should raise_error(ArgumentError)
     end
   end
 
+  it "does not allow the :fold option for upcasing" do
+    lambda { a = "abc"; a.upcase!(:fold) }.should raise_error(ArgumentError)
+  end
+
+  it "does not allow invalid options" do
+    lambda { a = "abc"; a.upcase!(:invalid_option) }.should raise_error(ArgumentError)
+  end
+
   it "returns nil if no modifications were made" do
     a = "HELLO"
     a.upcase!.should == nil