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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#domain" do
@@ -21,3 +23,4 @@ describe "CGI::Cookie#domain=" do
       cookie.domain.should == "example.com"
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#expires" do
@@ -21,3 +23,4 @@ describe "CGI::Cookie#expires=" do
       cookie.expires.should == Time.at(1196525000)
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#initialize when passed String" do
@@ -145,3 +147,4 @@ describe "CGI::Cookie#initialize when passed String, values ..." do
       @cookie.secure.should be_false
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#name" do
@@ -21,3 +23,4 @@ describe "CGI::Cookie#name=" do
       cookie.name.should == "and-one-more"
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie.parse" do
@@ -24,3 +26,4 @@ describe "CGI::Cookie.parse" do
       CGI::Cookie.parse(cookie).should == expected
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#path" do
@@ -21,3 +23,4 @@ describe "CGI::Cookie#path=" do
       cookie.path.should == "/another/path/"
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#secure" do
@@ -68,3 +70,4 @@ describe "CGI::Cookie#secure= when passed Object" do
       @cookie.secure.should be_true
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#to_s" do
@@ -31,3 +33,4 @@ describe "CGI::Cookie#to_s" 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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::Cookie#value" do
@@ -74,3 +76,4 @@ describe "CGI::Cookie#value=" do
       @cookie[2].should == "three"
     end
   end
+end

spec/ruby/library/cgi/escapeElement_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
+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'
+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'
+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'
+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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -47,3 +49,4 @@ describe "CGI::HtmlExtension#a" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -31,3 +33,4 @@ describe "CGI::HtmlExtension#base" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -31,3 +33,4 @@ describe "CGI::HtmlExtension#blockquote" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -20,3 +22,4 @@ describe "CGI::HtmlExtension#br" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -31,3 +33,4 @@ describe "CGI::HtmlExtension#caption" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -74,3 +76,4 @@ describe "CGI::HtmlExtension#checkbox_group" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -75,3 +77,4 @@ describe "CGI::HtmlExtension#checkbox" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -25,3 +27,4 @@ describe "CGI::HtmlExtension#doctype" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -70,3 +72,4 @@ describe "CGI::HtmlExtension#file_field" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -56,3 +58,4 @@ describe "CGI::HtmlExtension#form" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require_relative 'fixtures/common'
   require 'cgi'
 
@@ -12,3 +14,4 @@ describe "CGI::HtmlExtension#frame" do
       @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require_relative 'fixtures/common'
   require 'cgi'
 
@@ -12,3 +14,4 @@ describe "CGI::HtmlExtension#frameset" do
       @html.frameset { "link text" }.should == "<FRAMESET>link text</FRAMESET>"
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -57,3 +59,4 @@ describe "CGI::HtmlExtension#hidden" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -64,3 +66,4 @@ describe "CGI::HtmlExtension#html" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -67,3 +69,4 @@ describe "CGI::HtmlExtension#image_button" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -81,3 +83,4 @@ describe "CGI::HtmlExtension#img" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -62,3 +64,4 @@ describe "CGI::HtmlExtension#multipart_form" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -82,3 +84,4 @@ describe "CGI::HtmlExtension#password_field" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
   require_relative 'shared/popup_menu'
@@ -6,3 +8,4 @@ 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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -75,3 +77,4 @@ describe "CGI::HtmlExtension#radio_button" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -75,3 +77,4 @@ describe "CGI::HtmlExtension#radio_group" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -55,3 +57,4 @@ describe "CGI::HtmlExtension#reset" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require_relative 'fixtures/common'
   require 'cgi'
   require_relative 'shared/popup_menu'
@@ -6,3 +8,4 @@ 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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -55,3 +57,4 @@ describe "CGI::HtmlExtension#submit" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -82,3 +84,4 @@ describe "CGI::HtmlExtension#text_field" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require_relative 'fixtures/common'
 
@@ -71,3 +73,4 @@ describe "CGI::HtmlExtension#textarea" do
       end
     end
   end
+end

spec/ruby/library/cgi/http_header_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   require_relative 'shared/http_header'
@@ -6,3 +8,4 @@ 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,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI#initialize" do
@@ -131,3 +133,4 @@ describe "CGI#initialize when passed type" do
       @cgi.should_not be_kind_of(CGI::Html4)
     end
   end
+end

spec/ruby/library/cgi/out_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI#out" do
@@ -49,3 +51,4 @@ describe "CGI#out when passed no block" do
       -> { @cgi.out }.should raise_error(LocalJumpError)
     end
   end
+end

spec/ruby/library/cgi/parse_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI.parse when passed String" do
@@ -22,3 +24,4 @@ describe "CGI.parse when passed String" do
       CGI.parse("hello%3F=hello%21").should == { "hello?" => ["hello!"] }
     end
   end
+end

spec/ruby/library/cgi/pretty_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI.pretty when passed html" do
@@ -22,3 +24,4 @@ describe "CGI.pretty when passed html, indentation_unit" do
 EOS
     end
   end
+end

spec/ruby/library/cgi/print_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI#print" do
@@ -24,3 +26,4 @@ describe "CGI#print" do
       @cgi.print("test").should == :expected
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_charset" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#accept_charset" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_encoding" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#accept_encoding" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_language" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#accept_language" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#accept" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#auth_type" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#auth_type" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#cache_control" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#cache_control" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#content_length" do
@@ -24,3 +26,4 @@ describe "CGI::QueryExtension#content_length" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#content_type" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#content_type" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#cookies" do
@@ -8,3 +10,4 @@ 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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#[]" do
@@ -25,3 +27,4 @@ describe "CGI::QueryExtension#[]" do
       @cgi["one"].should be_kind_of(String)
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#from" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#from" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#gateway_interface" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#gateway_interface" do
       end
     end
   end
+end

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

@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
+
+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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#host" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#host" do
       end
     end
   end
+end

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

@@ -1,7 +1,10 @@
 require_relative '../../../spec_helper'
+
+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'
+
+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,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#keys" do
@@ -18,3 +20,4 @@ describe "CGI::QueryExtension#keys" do
       @cgi.keys.sort.should == ["one", "two"]
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
   require "stringio"
 
@@ -38,3 +40,4 @@ EOS
       @cgi.multipart?.should be_true
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#negotiate" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#negotiate" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#params" do
@@ -35,3 +37,4 @@ describe "CGI::QueryExtension#params=" do
       @cgi.params.should == {"one"=>["a"], "two"=>["b", "c"]}
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#path_info" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#path_info" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#path_translated" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#path_translated" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#pragma" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#pragma" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#query_string" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#query_string" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#raw_cookie2" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#raw_cookie2" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#raw_cookie" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#raw_cookie" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#referer" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#referer" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_addr" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#remote_addr" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_host" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#remote_host" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_ident" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#remote_ident" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_user" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#remote_user" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#request_method" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#request_method" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#script_name" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#script_name" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_name" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#server_name" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_port" do
@@ -24,3 +26,4 @@ describe "CGI::QueryExtension#server_port" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_protocol" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#server_protocol" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_software" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#server_software" do
       end
     end
   end
+end

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

@@ -1,4 +1,6 @@
 require_relative '../../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI::QueryExtension#user_agent" do
@@ -20,3 +22,4 @@ describe "CGI::QueryExtension#user_agent" do
       end
     end
   end
+end

spec/ruby/library/cgi/rfc1123_date_spec.rb

@@ -1,4 +1,6 @@
 require_relative '../../spec_helper'
+
+ruby_version_is ""..."3.5" do
   require 'cgi'
 
   describe "CGI.rfc1123_date when passed Time" do
@@ -8,3 +10,4 @@ describe "CGI.rfc1123_date when passed Time" do
       CGI.rfc1123_date(input).should == expected
     end
   end
+end

spec/ruby/library/cgi/unescapeElement_spec.rb

@@ -1,5 +1,9 @@
 require_relative '../../spec_helper'
+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'
+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'
+begin
+  require 'cgi/escape'
+rescue LoadError
   require 'cgi'
+end
 
 describe "CGI.unescape" do
   it "url-decodes the passed argument" do