4 files changed, 69 insertions, 12 deletions
diff --git a/spec/ruby/library/cgi/cookie/name_spec.rb b/spec/ruby/library/cgi/cookie/name_spec.rb
index 14226824c8..326a43ade3 100644
--- a/spec/ruby/library/cgi/cookie/name_spec.rb
+++ b/spec/ruby/library/cgi/cookie/name_spec.rb
@@ -6,18 +6,18 @@ describe "CGI::Cookie#name" do
     cookie = CGI::Cookie.new("test-cookie")
     cookie.name.should == "test-cookie"
 
-    cookie = CGI::Cookie.new("name" => "another cookie")
-    cookie.name.should == "another cookie"
+    cookie = CGI::Cookie.new("name" => "another-cookie")
+    cookie.name.should == "another-cookie"
   end
 end
 
 describe "CGI::Cookie#name=" do
   it "sets self's expiration date" do
     cookie = CGI::Cookie.new("test-cookie")
-    cookie.name = "another name"
-    cookie.name.should == "another name"
+    cookie.name = "another-name"
+    cookie.name.should == "another-name"
 
-    cookie.name = "and one more"
-    cookie.name.should == "and one more"
+    cookie.name = "and-one-more"
+    cookie.name.should == "and-one-more"
   end
 end
diff --git a/spec/ruby/library/cgi/cookie/parse_spec.rb b/spec/ruby/library/cgi/cookie/parse_spec.rb
index 90d2c3d148..d484c7bad9 100644
--- a/spec/ruby/library/cgi/cookie/parse_spec.rb
+++ b/spec/ruby/library/cgi/cookie/parse_spec.rb
@@ -6,16 +6,16 @@ describe "CGI::Cookie.parse" do
     expected = { "test-cookie" => ["one", "two", "three"] }
     CGI::Cookie.parse("test-cookie=one&two&three").should == expected
 
-    expected = { "second cookie" => ["three", "four"], "first cookie" => ["one", "two"] }
-    CGI::Cookie.parse("first cookie=one&two;second cookie=three&four").should == expected
+    expected = { "second-cookie" => ["three", "four"], "first-cookie" => ["one", "two"] }
+    CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four").should == expected
   end
 
   it "does not use , for cookie separators" do
     expected = {
-      "first cookie" => ["one", "two"],
-      "second cookie" => ["three", "four,third_cookie=five", "six"]
+      "first-cookie" => ["one", "two"],
+      "second-cookie" => ["three", "four,third_cookie=five", "six"]
     }
-    CGI::Cookie.parse("first cookie=one&two;second cookie=three&four,third_cookie=five&six").should == expected
+    CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four,third_cookie=five&six").should == expected
   end
 
   it "unescapes the Cookie values" do
diff --git a/spec/ruby/library/cgi/escapeURIComponent_spec.rb b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
new file mode 100644
index 0000000000..f05795a2f5
--- /dev/null
+++ b/spec/ruby/library/cgi/escapeURIComponent_spec.rb
@@ -0,0 +1,57 @@
+require_relative '../../spec_helper'
+require 'cgi'
+
+ruby_version_is "3.2" do
+  describe "CGI.escapeURIComponent" do
+    it "escapes whitespace" do
+      string = "&<>\" \xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93"
+      CGI.escapeURIComponent(string).should == '%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'
+    end
+
+    it "does not escape with unreserved characters" do
+      string = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"
+      CGI.escapeURIComponent(string).should == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"
+    end
+
+    it "supports String with invalid encoding" do
+      string = "\xC0\<\<".dup.force_encoding("UTF-8")
+      CGI.escapeURIComponent(string).should == "%C0%3C%3C"
+    end
+
+    it "processes String bytes one by one, not characters" do
+      CGI.escapeURIComponent("β").should == "%CE%B2" # "β" bytes representation is CE B2
+    end
+
+    it "raises a TypeError with nil" do
+      -> {
+        CGI.escapeURIComponent(nil)
+      }.should raise_error(TypeError, 'no implicit conversion of nil into String')
+    end
+
+    it "encodes empty string" do
+      CGI.escapeURIComponent("").should == ""
+    end
+
+    it "encodes single whitespace" do
+      CGI.escapeURIComponent(" ").should == "%20"
+    end
+
+    it "encodes double whitespace" do
+      CGI.escapeURIComponent("  ").should == "%20%20"
+    end
+
+    it "preserves encoding" do
+      string = "whatever".encode("ASCII-8BIT")
+      CGI.escapeURIComponent(string).encoding.should == Encoding::ASCII_8BIT
+    end
+
+    it "uses implicit type conversion to String" do
+      object = Object.new
+      def object.to_str
+        "a b"
+      end
+
+      CGI.escapeURIComponent(object).should == "a%20b"
+    end
+  end
+end
diff --git a/spec/ruby/library/cgi/initialize_spec.rb b/spec/ruby/library/cgi/initialize_spec.rb
index f794f157f0..61bc971d49 100644
--- a/spec/ruby/library/cgi/initialize_spec.rb
+++ b/spec/ruby/library/cgi/initialize_spec.rb
@@ -29,8 +29,8 @@ describe "CGI#initialize when passed no arguments" do
 
   it "does not extend self with any of the other HTML modules" do
     @cgi.send(:initialize)
-    @cgi.should_not be_kind_of(CGI::Html3)
     @cgi.should_not be_kind_of(CGI::HtmlExtension)
+    @cgi.should_not be_kind_of(CGI::Html3)
     @cgi.should_not be_kind_of(CGI::Html4)
     @cgi.should_not be_kind_of(CGI::Html4Tr)
     @cgi.should_not be_kind_of(CGI::Html4Fr)