Guard CGI examples with Ruby 3.5 and use cgi/escape for related examples

Merged: https://github.com/ruby/ruby/pull/13275

spec/ruby/library/cgi/cookie/domain_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#domain" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#domain" do
     it "returns self's domain" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.domain.should be_nil
@@ -9,9 +11,9 @@ describe "CGI::Cookie#domain" do
       cookie = CGI::Cookie.new("name" => "test-cookie", "domain" => "example.com")
       cookie.domain.should == "example.com"
     end
-end
+  end
 
-describe "CGI::Cookie#domain=" do
+  describe "CGI::Cookie#domain=" do
     it "sets self's domain" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.domain = "test.com"
@@ -20,4 +22,5 @@ describe "CGI::Cookie#domain=" do
       cookie.domain = "example.com"
       cookie.domain.should == "example.com"
     end
+  end
 end

spec/ruby/library/cgi/cookie/expires_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#expires" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#expires" do
     it "returns self's expiration date" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.expires.should be_nil
@@ -9,9 +11,9 @@ describe "CGI::Cookie#expires" do
       cookie = CGI::Cookie.new("name" => "test-cookie", "expires" => Time.at(1196524602))
       cookie.expires.should == Time.at(1196524602)
     end
-end
+  end
 
-describe "CGI::Cookie#expires=" do
+  describe "CGI::Cookie#expires=" do
     it "sets self's expiration date" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.expires = Time.at(1196524602)
@@ -20,4 +22,5 @@ describe "CGI::Cookie#expires=" do
       cookie.expires = Time.at(1196525000)
       cookie.expires.should == Time.at(1196525000)
     end
+  end
 end

spec/ruby/library/cgi/cookie/initialize_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#initialize when passed String" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#initialize when passed String" do
     before :each do
       @cookie = CGI::Cookie.allocate
     end
@@ -53,9 +55,9 @@ describe "CGI::Cookie#initialize when passed String" do
     it "does not set self's domain" do
       @cookie.domain.should be_nil
     end
-end
+  end
 
-describe "CGI::Cookie#initialize when passed Hash" do
+  describe "CGI::Cookie#initialize when passed Hash" do
     before :each do
       @cookie = CGI::Cookie.allocate
     end
@@ -123,9 +125,9 @@ describe "CGI::Cookie#initialize when passed Hash" do
       -> { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError)
       -> { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError)
     end
-end
+  end
 
-describe "CGI::Cookie#initialize when passed String, values ..." do
+  describe "CGI::Cookie#initialize when passed String, values ..." do
     before :each do
       @cookie = CGI::Cookie.allocate
     end
@@ -144,4 +146,5 @@ describe "CGI::Cookie#initialize when passed String, values ..." do
       @cookie.send(:initialize, "test", "one", "two", "three")
       @cookie.secure.should be_false
     end
+  end
 end

spec/ruby/library/cgi/cookie/name_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#name" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#name" do
     it "returns self's name" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.name.should == "test-cookie"
@@ -9,9 +11,9 @@ describe "CGI::Cookie#name" do
       cookie = CGI::Cookie.new("name" => "another-cookie")
       cookie.name.should == "another-cookie"
     end
-end
+  end
 
-describe "CGI::Cookie#name=" do
+  describe "CGI::Cookie#name=" do
     it "sets self's expiration date" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.name = "another-name"
@@ -20,4 +22,5 @@ describe "CGI::Cookie#name=" do
       cookie.name = "and-one-more"
       cookie.name.should == "and-one-more"
     end
+  end
 end

spec/ruby/library/cgi/cookie/parse_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie.parse" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie.parse" do
     it "parses a raw cookie string into a hash of Cookies" do
       expected = { "test-cookie" => ["one", "two", "three"] }
       CGI::Cookie.parse("test-cookie=one&two&three").should == expected
@@ -23,4 +25,5 @@ describe "CGI::Cookie.parse" do
       expected = { "test-cookie" => [ " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" ] }
       CGI::Cookie.parse(cookie).should == expected
     end
+  end
 end

spec/ruby/library/cgi/cookie/path_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#path" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#path" do
     it "returns self's path" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.path.should == ""
@@ -9,9 +11,9 @@ describe "CGI::Cookie#path" do
       cookie = CGI::Cookie.new("name" => "test-cookie", "path" => "/some/path/")
       cookie.path.should == "/some/path/"
     end
-end
+  end
 
-describe "CGI::Cookie#path=" do
+  describe "CGI::Cookie#path=" do
     it "sets self's path" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.path = "/some/path/"
@@ -20,4 +22,5 @@ describe "CGI::Cookie#path=" do
       cookie.path = "/another/path/"
       cookie.path.should == "/another/path/"
     end
+  end
 end

spec/ruby/library/cgi/cookie/secure_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#secure" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#secure" do
     before :each do
       @cookie = CGI::Cookie.new("test-cookie")
     end
@@ -13,9 +15,9 @@ describe "CGI::Cookie#secure" do
       @cookie.secure = false
       @cookie.secure.should be_false
     end
-end
+  end
 
-describe "CGI::Cookie#secure= when passed true" do
+  describe "CGI::Cookie#secure= when passed true" do
     before :each do
       @cookie = CGI::Cookie.new("test-cookie")
     end
@@ -28,9 +30,9 @@ describe "CGI::Cookie#secure= when passed true" do
       @cookie.secure = true
       @cookie.secure.should be_true
     end
-end
+  end
 
-describe "CGI::Cookie#secure= when passed false" do
+  describe "CGI::Cookie#secure= when passed false" do
     before :each do
       @cookie = CGI::Cookie.new("test-cookie")
     end
@@ -43,9 +45,9 @@ describe "CGI::Cookie#secure= when passed false" do
       @cookie.secure = false
       @cookie.secure.should be_false
     end
-end
+  end
 
-describe "CGI::Cookie#secure= when passed Object" do
+  describe "CGI::Cookie#secure= when passed Object" do
     before :each do
       @cookie = CGI::Cookie.new("test-cookie")
     end
@@ -67,4 +69,5 @@ describe "CGI::Cookie#secure= when passed Object" do
       @cookie.secure = "Test"
       @cookie.secure.should be_true
     end
+  end
 end

spec/ruby/library/cgi/cookie/to_s_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#to_s" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#to_s" do
     it "returns a String representation of self" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.to_s.should == "test-cookie=; path="
@@ -30,4 +32,5 @@ describe "CGI::Cookie#to_s" do
     it "does not escape tilde" do
       cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=~; path="
     end
+  end
 end

spec/ruby/library/cgi/cookie/value_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::Cookie#value" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::Cookie#value" do
     it "returns self's value" do
       cookie = CGI::Cookie.new("test-cookie")
       cookie.value.should == []
@@ -37,9 +39,9 @@ describe "CGI::Cookie#value" do
       end
       fail.should be_empty
     end
-end
+  end
 
-describe "CGI::Cookie#value=" do
+  describe "CGI::Cookie#value=" do
     before :each do
       @cookie = CGI::Cookie.new("test-cookie")
     end
@@ -73,4 +75,5 @@ describe "CGI::Cookie#value=" do
       @cookie[1].should == "two"
       @cookie[2].should == "three"
     end
+  end
 end

spec/ruby/library/cgi/escapeElement_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.escapeElement when passed String, elements, ..." do
   it "escapes only the tags of the passed elements in the passed String" do

spec/ruby/library/cgi/escapeHTML_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.escapeHTML" do
   it "escapes special HTML characters (&\"<>') in the passed argument" do

spec/ruby/library/cgi/escapeURIComponent_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 ruby_version_is "3.2" do
   describe "CGI.escapeURIComponent" do

spec/ruby/library/cgi/escape_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.escape" do
   it "url-encodes the passed argument" do

spec/ruby/library/cgi/htmlextension/a_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#a" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#a" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -46,4 +48,5 @@ describe "CGI::HtmlExtension#a" do
         CGISpecs.cgi_new("html4Tr").a { "link text" }.should == %(<A HREF="">link text</A>)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/base_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#base" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#base" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -30,4 +32,5 @@ describe "CGI::HtmlExtension#base" do
         output.should equal_element("BASE", {"HREF" => "http://www.example.com", "ID" => "test"}, nil, not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/blockquote_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#blockquote" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#blockquote" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -30,4 +32,5 @@ describe "CGI::HtmlExtension#blockquote" do
         output.should equal_element("BLOCKQUOTE", {"CITE" => "http://www.example.com/quotes/foo.html", "ID" => "test"}, "Foo!")
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/br_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#br" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#br" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -19,4 +21,5 @@ describe "CGI::HtmlExtension#br" do
         CGISpecs.cgi_new("html4Tr").br.should == "<BR>"
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/caption_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#caption" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#caption" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -30,4 +32,5 @@ describe "CGI::HtmlExtension#caption" do
         output.should equal_element("CAPTION", {"ALIGN" => "left", "ID" => "test"}, "Capital Cities")
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#checkbox_group" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#checkbox_group" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -73,4 +75,5 @@ describe "CGI::HtmlExtension#checkbox_group" do
         output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "checkbox", "VALUE" => "baz"}, "baz", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/checkbox_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#checkbox" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#checkbox" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -74,4 +76,5 @@ describe "CGI::HtmlExtension#checkbox" do
         output.should equal_element("INPUT", attributes, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/doctype_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#doctype" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#doctype" do
     describe "when each HTML generation" do
       it "returns the doctype declaration for HTML3" do
         expect = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
@@ -24,4 +26,5 @@ describe "CGI::HtmlExtension#doctype" do
         CGISpecs.cgi_new("html4Tr").doctype.should == expect
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/file_field_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#file_field" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#file_field" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -69,4 +71,5 @@ describe "CGI::HtmlExtension#file_field" do
         output.should equal_element("INPUT", {"NAME" => "test", "SIZE" => 40}, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/form_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#form" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#form" do
     before :each do
       @html = CGISpecs.cgi_new
       @html.stub!(:script_name).and_return("/path/to/some/script")
@@ -55,4 +57,5 @@ describe "CGI::HtmlExtension#form" do
         output.should equal_element("FORM", {"ENCTYPE" => "multipart/form-data", "METHOD" => "get", "ACTION" => "/some/other/script"}, "test")
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/frame_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
 
-describe "CGI::HtmlExtension#frame" do
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+
+  describe "CGI::HtmlExtension#frame" do
     before :each do
       @html = CGISpecs.cgi_new("html4Fr")
     end
@@ -11,4 +13,5 @@ describe "CGI::HtmlExtension#frame" do
       @html.frameset.should == "<FRAMESET></FRAMESET>"
       @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/frameset_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
 
-describe "CGI::HtmlExtension#frameset" do
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+
+  describe "CGI::HtmlExtension#frameset" do
     before :each do
       @html = CGISpecs.cgi_new("html4Fr")
     end
@@ -11,4 +13,5 @@ describe "CGI::HtmlExtension#frameset" do
       @html.frameset.should == "<FRAMESET></FRAMESET>"
       @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/hidden_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#hidden" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#hidden" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -56,4 +58,5 @@ describe "CGI::HtmlExtension#hidden" do
         output.should equal_element("INPUT", attributes, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/html_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#html" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#html" do
     before :each do
       @html = CGISpecs.cgi_new
       @html.stub!(:doctype).and_return("<!DOCTYPE SUPA-FUNKAY-RUBYSPEC-DOCTYPE>")
@@ -63,4 +65,5 @@ describe "CGI::HtmlExtension#html" do
         CGISpecs.cgi_new("html4Tr").html { "html body" }.should == expect + "<HTML>html body</HTML>"
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/image_button_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#image_button" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#image_button" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -66,4 +68,5 @@ describe "CGI::HtmlExtension#image_button" do
         output.should equal_element("INPUT", {"SRC" => "", "TYPE" => "image", "NAME" => "test", "VALUE" => "test-value"}, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/img_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#img" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#img" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -80,4 +82,5 @@ describe "CGI::HtmlExtension#img" do
         output.should equal_element("IMG", attributes, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#multipart_form" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#multipart_form" do
     before :each do
       @html = CGISpecs.cgi_new
       @html.stub!(:script_name).and_return("/path/to/some/script.rb")
@@ -61,4 +63,5 @@ describe "CGI::HtmlExtension#multipart_form" do
         output.should equal_element("FORM", { "ENCTYPE" => "application/x-www-form-urlencoded", "METHOD" => "get", "ID" => "test" }, "test")
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/password_field_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#password_field" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#password_field" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -81,4 +83,5 @@ describe "CGI::HtmlExtension#password_field" do
         output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "password" }, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb

@@ -1,8 +1,11 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
-require_relative 'shared/popup_menu'
 
-describe "CGI::HtmlExtension#popup_menu" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+  require_relative 'shared/popup_menu'
+
+  describe "CGI::HtmlExtension#popup_menu" do
     it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu
+  end
 end

spec/ruby/library/cgi/htmlextension/radio_button_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#radio_button" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#radio_button" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -74,4 +76,5 @@ describe "CGI::HtmlExtension#radio_button" do
         output.should equal_element("INPUT", attributes, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/radio_group_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#radio_group" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#radio_group" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -74,4 +76,5 @@ describe "CGI::HtmlExtension#radio_group" do
         output[2].should equal_element("INPUT", {"NAME" => "name", "TYPE" => "radio", "VALUE" => "baz"}, "baz", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/reset_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#reset" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#reset" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -54,4 +56,5 @@ describe "CGI::HtmlExtension#reset" do
         output.should equal_element("INPUT", {"TYPE" => "reset", "VALUE" => "Example"}, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb

@@ -1,8 +1,11 @@
 require_relative '../../../spec_helper'
-require_relative 'fixtures/common'
-require 'cgi'
-require_relative 'shared/popup_menu'
 
-describe "CGI::HtmlExtension#scrolling_list" do
+ruby_version_is ""..."3.5" do
+  require_relative 'fixtures/common'
+  require 'cgi'
+  require_relative 'shared/popup_menu'
+
+  describe "CGI::HtmlExtension#scrolling_list" do
     it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list
+  end
 end

spec/ruby/library/cgi/htmlextension/submit_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#submit" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#submit" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -54,4 +56,5 @@ describe "CGI::HtmlExtension#submit" do
         output.should equal_element("INPUT", {"TYPE" => "submit", "VALUE" => "Example"}, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/text_field_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#text_field" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#text_field" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -81,4 +83,5 @@ describe "CGI::HtmlExtension#text_field" do
         output.should equal_element("INPUT", { "NAME" => "test", "VALUE" => "some value", "TYPE" => "text" }, "", not_closed: true)
       end
     end
+  end
 end

spec/ruby/library/cgi/htmlextension/textarea_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'fixtures/common'
 
-describe "CGI::HtmlExtension#textarea" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'fixtures/common'
+
+  describe "CGI::HtmlExtension#textarea" do
     before :each do
       @html = CGISpecs.cgi_new
     end
@@ -70,4 +72,5 @@ describe "CGI::HtmlExtension#textarea" do
         output.should equal_element("TEXTAREA", attributes, "test")
       end
     end
+  end
 end

spec/ruby/library/cgi/http_header_spec.rb

@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-require_relative 'shared/http_header'
+ruby_version_is ""..."3.5" do
+  require 'cgi'
 
-describe "CGI#http_header" do
+  require_relative 'shared/http_header'
+
+  describe "CGI#http_header" do
     it_behaves_like :cgi_http_header, :http_header
+  end
 end

spec/ruby/library/cgi/initialize_spec.rb

@@ -1,13 +1,15 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#initialize" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI#initialize" do
     it "is private" do
       CGI.should have_private_instance_method(:initialize)
     end
-end
+  end
 
-describe "CGI#initialize when passed no arguments" do
+  describe "CGI#initialize when passed no arguments" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.allocate
@@ -69,9 +71,9 @@ describe "CGI#initialize when passed no arguments" do
         ENV["REQUEST_METHOD"] = old_env_method
       end
     end
-end
+  end
 
-describe "CGI#initialize when passed type" do
+  describe "CGI#initialize when passed type" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.allocate
@@ -130,4 +132,5 @@ describe "CGI#initialize when passed type" do
       @cgi.should_not be_kind_of(CGI::Html3)
       @cgi.should_not be_kind_of(CGI::Html4)
     end
+  end
 end

spec/ruby/library/cgi/out_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#out" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI#out" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -33,9 +35,9 @@ describe "CGI#out" do
       @cgi.out { "" }
       $stdout.should == "Content-Type: text/html\r\nContent-Length: 0\r\nSet-Cookie: multiple\r\nSet-Cookie: cookies\r\n\r\n"
     end
-end
+  end
 
-describe "CGI#out when passed no block" do
+  describe "CGI#out when passed no block" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -48,4 +50,5 @@ describe "CGI#out when passed no block" do
     it "raises a LocalJumpError" do
       -> { @cgi.out }.should raise_error(LocalJumpError)
     end
+  end
 end

spec/ruby/library/cgi/parse_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.parse when passed String" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI.parse when passed String" do
     it "parses a HTTP Query String into a Hash" do
       CGI.parse("test=test&a=b").should == { "a" => ["b"], "test" => ["test"] }
       CGI.parse("test=1,2,3").should == { "test" => ["1,2,3"] }
@@ -21,4 +23,5 @@ describe "CGI.parse when passed String" do
     it "unescapes keys and values" do
       CGI.parse("hello%3F=hello%21").should == { "hello?" => ["hello!"] }
     end
+  end
 end

spec/ruby/library/cgi/pretty_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.pretty when passed html" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI.pretty when passed html" do
     it "indents the passed html String with two spaces" do
       CGI.pretty("<HTML><BODY></BODY></HTML>").should == <<-EOS
 <HTML>
@@ -10,9 +12,9 @@ describe "CGI.pretty when passed html" do
 </HTML>
 EOS
     end
-end
+  end
 
-describe "CGI.pretty when passed html, indentation_unit" do
+  describe "CGI.pretty when passed html, indentation_unit" do
     it "indents the passed html String with the passed indentation_unit" do
       CGI.pretty("<HTML><BODY></BODY></HTML>", "\t").should == <<-EOS
 <HTML>
@@ -21,4 +23,5 @@ describe "CGI.pretty when passed html, indentation_unit" do
 </HTML>
 EOS
     end
+  end
 end

spec/ruby/library/cgi/print_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI#print" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI#print" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -23,4 +25,5 @@ describe "CGI#print" do
       $stdout.should_receive(:print).with("test").and_return(:expected)
       @cgi.print("test").should == :expected
     end
+  end
 end

spec/ruby/library/cgi/queryextension/accept_charset_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_charset" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#accept_charset" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#accept_charset" do
         ENV['HTTP_ACCEPT_CHARSET'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_encoding" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#accept_encoding" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#accept_encoding" do
         ENV['HTTP_ACCEPT_ENCODING'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/accept_language_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept_language" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#accept_language" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#accept_language" do
         ENV['HTTP_ACCEPT_LANGUAGE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/accept_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#accept" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#accept" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#accept" do
         ENV['HTTP_ACCEPT'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/auth_type_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#auth_type" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#auth_type" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#auth_type" do
         ENV['AUTH_TYPE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/cache_control_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#cache_control" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#cache_control" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#cache_control" do
         ENV['HTTP_CACHE_CONTROL'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/content_length_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#content_length" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#content_length" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -23,4 +25,5 @@ describe "CGI::QueryExtension#content_length" do
         ENV['CONTENT_LENGTH'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/content_type_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#content_type" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#content_type" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#content_type" do
         ENV['CONTENT_TYPE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/cookies_spec.rb

@@ -1,10 +1,13 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#cookies" do
+ruby_version_is ""..."3.5" do
-  it "needs to be reviewed for spec completeness"
+  require 'cgi'
-end
 
-describe "CGI::QueryExtension#cookies=" do
+  describe "CGI::QueryExtension#cookies" do
     it "needs to be reviewed for spec completeness"
+  end
+
+  describe "CGI::QueryExtension#cookies=" do
+    it "needs to be reviewed for spec completeness"
+  end
 end

spec/ruby/library/cgi/queryextension/element_reference_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#[]" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#[]" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c", ENV['QUERY_STRING']
@@ -24,4 +26,5 @@ describe "CGI::QueryExtension#[]" do
     it "returns a String" do
       @cgi["one"].should be_kind_of(String)
     end
+  end
 end

spec/ruby/library/cgi/queryextension/from_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#from" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#from" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#from" do
         ENV['HTTP_FROM'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#gateway_interface" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#gateway_interface" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#gateway_interface" do
         ENV['GATEWAY_INTERFACE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/has_key_spec.rb

@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#has_key?" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#has_key?" do
     it_behaves_like :cgi_query_extension_has_key_p, :has_key?
+  end
 end

spec/ruby/library/cgi/queryextension/host_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#host" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#host" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#host" do
         ENV['HTTP_HOST'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/include_spec.rb

@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#include?" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#include?" do
     it_behaves_like :cgi_query_extension_has_key_p, :include?
+  end
 end

spec/ruby/library/cgi/queryextension/key_spec.rb

@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require_relative 'shared/has_key'
 
-describe "CGI::QueryExtension#key?" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require_relative 'shared/has_key'
+
+  describe "CGI::QueryExtension#key?" do
     it_behaves_like :cgi_query_extension_has_key_p, :key?
+  end
 end

spec/ruby/library/cgi/queryextension/keys_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#keys" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#keys" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       ENV['QUERY_STRING'], @old_query_string = "one=a&two=b", ENV['QUERY_STRING']
@@ -17,4 +19,5 @@ describe "CGI::QueryExtension#keys" do
     it "returns all parameter keys as an Array" do
       @cgi.keys.sort.should == ["one", "two"]
     end
+  end
 end

spec/ruby/library/cgi/queryextension/multipart_spec.rb

@@ -1,8 +1,10 @@
 require_relative '../../../spec_helper'
-require 'cgi'
-require "stringio"
 
-describe "CGI::QueryExtension#multipart?" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+  require "stringio"
+
+  describe "CGI::QueryExtension#multipart?" do
     before :each do
       @old_stdin = $stdin
 
@@ -37,4 +39,5 @@ EOS
     it "returns true if the current Request is a multipart request" do
       @cgi.multipart?.should be_true
     end
+  end
 end

spec/ruby/library/cgi/queryextension/negotiate_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#negotiate" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#negotiate" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#negotiate" do
         ENV['HTTP_NEGOTIATE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/params_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#params" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#params" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       ENV['QUERY_STRING'], @old_query_string = "one=a&two=b&two=c&three", ENV['QUERY_STRING']
@@ -16,9 +18,9 @@ describe "CGI::QueryExtension#params" do
     it "returns the parsed HTTP Query Params" do
       @cgi.params.should == {"three"=>[], "two"=>["b", "c"], "one"=>["a"]}
     end
-end
+  end
 
-describe "CGI::QueryExtension#params=" do
+  describe "CGI::QueryExtension#params=" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -34,4 +36,5 @@ describe "CGI::QueryExtension#params=" do
       @cgi.params = {"one"=>["a"], "two"=>["b", "c"]}
       @cgi.params.should == {"one"=>["a"], "two"=>["b", "c"]}
     end
+  end
 end

spec/ruby/library/cgi/queryextension/path_info_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#path_info" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#path_info" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#path_info" do
         ENV['PATH_INFO'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/path_translated_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#path_translated" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#path_translated" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#path_translated" do
         ENV['PATH_TRANSLATED'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/pragma_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#pragma" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#pragma" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#pragma" do
         ENV['HTTP_PRAGMA'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/query_string_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#query_string" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#query_string" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#query_string" do
         ENV['QUERY_STRING'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#raw_cookie2" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#raw_cookie2" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#raw_cookie2" do
         ENV['HTTP_COOKIE2'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#raw_cookie" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#raw_cookie" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#raw_cookie" do
         ENV['HTTP_COOKIE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/referer_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#referer" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#referer" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#referer" do
         ENV['HTTP_REFERER'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/remote_addr_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_addr" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#remote_addr" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#remote_addr" do
         ENV['REMOTE_ADDR'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/remote_host_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_host" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#remote_host" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#remote_host" do
         ENV['REMOTE_HOST'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/remote_ident_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_ident" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#remote_ident" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#remote_ident" do
         ENV['REMOTE_IDENT'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/remote_user_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#remote_user" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#remote_user" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#remote_user" do
         ENV['REMOTE_USER'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/request_method_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#request_method" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#request_method" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#request_method" do
         ENV['REQUEST_METHOD'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/script_name_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#script_name" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#script_name" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#script_name" do
         ENV['SCRIPT_NAME'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/server_name_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_name" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#server_name" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#server_name" do
         ENV['SERVER_NAME'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/server_port_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_port" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#server_port" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -23,4 +25,5 @@ describe "CGI::QueryExtension#server_port" do
         ENV['SERVER_PORT'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/server_protocol_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_protocol" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#server_protocol" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#server_protocol" do
         ENV['SERVER_PROTOCOL'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/server_software_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#server_software" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#server_software" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#server_software" do
         ENV['SERVER_SOFTWARE'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/queryextension/user_agent_spec.rb

@@ -1,7 +1,9 @@
 require_relative '../../../spec_helper'
-require 'cgi'
 
-describe "CGI::QueryExtension#user_agent" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI::QueryExtension#user_agent" do
     before :each do
       ENV['REQUEST_METHOD'], @old_request_method = "GET", ENV['REQUEST_METHOD']
       @cgi = CGI.new
@@ -19,4 +21,5 @@ describe "CGI::QueryExtension#user_agent" do
         ENV['HTTP_USER_AGENT'] = old_value
       end
     end
+  end
 end

spec/ruby/library/cgi/rfc1123_date_spec.rb

@@ -1,10 +1,13 @@
 require_relative '../../spec_helper'
-require 'cgi'
 
-describe "CGI.rfc1123_date when passed Time" do
+ruby_version_is ""..."3.5" do
+  require 'cgi'
+
+  describe "CGI.rfc1123_date when passed Time" do
     it "returns the passed Time formatted in RFC1123 ('Sat, 01 Dec 2007 15:56:42 GMT')" do
       input = Time.at(1196524602)
       expected = 'Sat, 01 Dec 2007 15:56:42 GMT'
       CGI.rfc1123_date(input).should == expected
     end
+  end
 end

spec/ruby/library/cgi/unescapeElement_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.unescapeElement when passed String, elements, ..." do
   it "unescapes only the tags of the passed elements in the passed String" do

spec/ruby/library/cgi/unescapeHTML_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.unescapeHTML" do
   it "unescapes '&amp; &lt; &gt; &quot;' to '& < > \"'" do

spec/ruby/library/cgi/unescape_spec.rb

@@ -1,6 +1,10 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
-require 'cgi'
+begin
+  require 'cgi/escape'
+rescue LoadError
+  require 'cgi'
+end
 
 describe "CGI.unescape" do
   it "url-decodes the passed argument" do