diff options
Diffstat (limited to 'spec/ruby/library/cgi')
88 files changed, 177 insertions, 213 deletions
diff --git a/spec/ruby/library/cgi/cookie/domain_spec.rb b/spec/ruby/library/cgi/cookie/domain_spec.rb index 962609ebaf..05137dd4d1 100644 --- a/spec/ruby/library/cgi/cookie/domain_spec.rb +++ b/spec/ruby/library/cgi/cookie/domain_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#domain" do diff --git a/spec/ruby/library/cgi/cookie/expires_spec.rb b/spec/ruby/library/cgi/cookie/expires_spec.rb index c8f26d01cd..89f18fe071 100644 --- a/spec/ruby/library/cgi/cookie/expires_spec.rb +++ b/spec/ruby/library/cgi/cookie/expires_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#expires" do diff --git a/spec/ruby/library/cgi/cookie/initialize_spec.rb b/spec/ruby/library/cgi/cookie/initialize_spec.rb index 4b6e104b10..02f2a8ed2b 100644 --- a/spec/ruby/library/cgi/cookie/initialize_spec.rb +++ b/spec/ruby/library/cgi/cookie/initialize_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#initialize when passed String" do @@ -120,8 +120,8 @@ describe "CGI::Cookie#initialize when passed Hash" do end it "raises a ArgumentError when the passed Hash has no 'name' entry" do - -> { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError) - -> { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError) + lambda { @cookie.send(:initialize, {}) }.should raise_error(ArgumentError) + lambda { @cookie.send(:initialize, "value" => "test") }.should raise_error(ArgumentError) end end diff --git a/spec/ruby/library/cgi/cookie/name_spec.rb b/spec/ruby/library/cgi/cookie/name_spec.rb index 326a43ade3..8a6be95944 100644 --- a/spec/ruby/library/cgi/cookie/name_spec.rb +++ b/spec/ruby/library/cgi/cookie/name_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#name" do @@ -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 d484c7bad9..6f615c0d23 100644 --- a/spec/ruby/library/cgi/cookie/parse_spec.rb +++ b/spec/ruby/library/cgi/cookie/parse_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie.parse" do @@ -6,16 +6,29 @@ 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"] - } - CGI::Cookie.parse("first-cookie=one&two;second-cookie=three&four,third_cookie=five&six").should == expected + ruby_version_is ""..."2.4" do + it "uses , for cookie separators" do + expected = { + "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 + end + end + + ruby_version_is "2.4" do + it "does not use , for cookie separators" do + expected = { + "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 + end end it "unescapes the Cookie values" do diff --git a/spec/ruby/library/cgi/cookie/path_spec.rb b/spec/ruby/library/cgi/cookie/path_spec.rb index 8a2f05aa50..2a21a55264 100644 --- a/spec/ruby/library/cgi/cookie/path_spec.rb +++ b/spec/ruby/library/cgi/cookie/path_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#path" do diff --git a/spec/ruby/library/cgi/cookie/secure_spec.rb b/spec/ruby/library/cgi/cookie/secure_spec.rb index 694bc2eeed..37e9dbfda9 100644 --- a/spec/ruby/library/cgi/cookie/secure_spec.rb +++ b/spec/ruby/library/cgi/cookie/secure_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#secure" do diff --git a/spec/ruby/library/cgi/cookie/to_s_spec.rb b/spec/ruby/library/cgi/cookie/to_s_spec.rb index da15e6ed2a..806071ba69 100644 --- a/spec/ruby/library/cgi/cookie/to_s_spec.rb +++ b/spec/ruby/library/cgi/cookie/to_s_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#to_s" do @@ -27,7 +27,16 @@ describe "CGI::Cookie#to_s" do cookie.to_s.should == "test-cookie=+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D; path=" end - it "does not escape tilde" do - cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=~; path=" + ruby_version_is ""..."2.5" do + it "escapes tilde" do + cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=%7E; path=" + end end + + ruby_version_is "2.5" do + it "does not escape tilde" do + cookie = CGI::Cookie.new("test-cookie", "~").to_s.should == "test-cookie=~; path=" + end + end + end diff --git a/spec/ruby/library/cgi/cookie/value_spec.rb b/spec/ruby/library/cgi/cookie/value_spec.rb index 1d5da3a3ac..81e3daf7de 100644 --- a/spec/ruby/library/cgi/cookie/value_spec.rb +++ b/spec/ruby/library/cgi/cookie/value_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::Cookie#value" do diff --git a/spec/ruby/library/cgi/escapeElement_spec.rb b/spec/ruby/library/cgi/escapeElement_spec.rb index 148926c453..18f804c7da 100644 --- a/spec/ruby/library/cgi/escapeElement_spec.rb +++ b/spec/ruby/library/cgi/escapeElement_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.escapeElement when passed String, elements, ..." do diff --git a/spec/ruby/library/cgi/escapeHTML_spec.rb b/spec/ruby/library/cgi/escapeHTML_spec.rb index 421aac5d4a..a3267db4a1 100644 --- a/spec/ruby/library/cgi/escapeHTML_spec.rb +++ b/spec/ruby/library/cgi/escapeHTML_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.escapeHTML" do @@ -6,10 +6,6 @@ describe "CGI.escapeHTML" do CGI.escapeHTML(%[& < > " ']).should == '& < > " '' end - it "escapes invalid encoding" do - CGI.escapeHTML(%[<\xA4??>]).should == "<\xA4??>" - end - it "does not escape any other characters" do chars = " !\#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" CGI.escapeHTML(chars).should == chars diff --git a/spec/ruby/library/cgi/escapeURIComponent_spec.rb b/spec/ruby/library/cgi/escapeURIComponent_spec.rb deleted file mode 100644 index f05795a2f5..0000000000 --- a/spec/ruby/library/cgi/escapeURIComponent_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -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/escape_spec.rb b/spec/ruby/library/cgi/escape_spec.rb index c599a73cf0..cf8861a39f 100644 --- a/spec/ruby/library/cgi/escape_spec.rb +++ b/spec/ruby/library/cgi/escape_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.escape" do @@ -7,12 +7,20 @@ describe "CGI.escape" do expected = "+%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F0123456789%3A%3B%3C%3D%3E%3F%40ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D" CGI.escape(input).should == expected - input = "https://ja.wikipedia.org/wiki/\343\203\255\343\203\240\343\202\271\343\202\253\343\203\273\343\203\221\343\203\255\343\203\273\343\202\246\343\203\253\343\203\273\343\203\251\343\203\224\343\203\245\343\202\277" - expected = 'https%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%E3%83%AD%E3%83%A0%E3%82%B9%E3%82%AB%E3%83%BB%E3%83%91%E3%83%AD%E3%83%BB%E3%82%A6%E3%83%AB%E3%83%BB%E3%83%A9%E3%83%94%E3%83%A5%E3%82%BF' + input = "http://ja.wikipedia.org/wiki/\343\203\255\343\203\240\343\202\271\343\202\253\343\203\273\343\203\221\343\203\255\343\203\273\343\202\246\343\203\253\343\203\273\343\203\251\343\203\224\343\203\245\343\202\277" + expected = 'http%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%E3%83%AD%E3%83%A0%E3%82%B9%E3%82%AB%E3%83%BB%E3%83%91%E3%83%AD%E3%83%BB%E3%82%A6%E3%83%AB%E3%83%BB%E3%83%A9%E3%83%94%E3%83%A5%E3%82%BF' CGI.escape(input).should == expected end - it "does not escape tilde" do - CGI.escape("~").should == "~" + ruby_version_is ""..."2.5" do + it "escapes tilde" do + CGI.escape("~").should == "%7E" + end + end + + ruby_version_is "2.5" do + it "does not escape tilde" do + CGI.escape("~").should == "~" + end end end diff --git a/spec/ruby/library/cgi/htmlextension/a_spec.rb b/spec/ruby/library/cgi/htmlextension/a_spec.rb index 05b4c2d14c..a4c0ee684c 100644 --- a/spec/ruby/library/cgi/htmlextension/a_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/a_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#a" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/base_spec.rb b/spec/ruby/library/cgi/htmlextension/base_spec.rb index 877ac321cd..36a8cc55c8 100644 --- a/spec/ruby/library/cgi/htmlextension/base_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/base_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#base" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb b/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb index a7b833b1c5..f9848375e8 100644 --- a/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/blockquote_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#blockquote" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/br_spec.rb b/spec/ruby/library/cgi/htmlextension/br_spec.rb index dfca121884..875d335fe5 100644 --- a/spec/ruby/library/cgi/htmlextension/br_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/br_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#br" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/caption_spec.rb b/spec/ruby/library/cgi/htmlextension/caption_spec.rb index 16615028b8..a1b5f4d964 100644 --- a/spec/ruby/library/cgi/htmlextension/caption_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/caption_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#caption" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb b/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb index 64f852cc52..f739d92a53 100644 --- a/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/checkbox_group_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#checkbox_group" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb b/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb index af76fa1da9..3abb3b4a31 100644 --- a/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/checkbox_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#checkbox" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/doctype_spec.rb b/spec/ruby/library/cgi/htmlextension/doctype_spec.rb index 9a28a8883b..339ef20db9 100644 --- a/spec/ruby/library/cgi/htmlextension/doctype_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/doctype_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#doctype" do describe "when each HTML generation" do diff --git a/spec/ruby/library/cgi/htmlextension/file_field_spec.rb b/spec/ruby/library/cgi/htmlextension/file_field_spec.rb index 2a0632fd58..57d91b5fd9 100644 --- a/spec/ruby/library/cgi/htmlextension/file_field_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/file_field_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#file_field" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/form_spec.rb b/spec/ruby/library/cgi/htmlextension/form_spec.rb index 8c0ac97735..0389910cd6 100644 --- a/spec/ruby/library/cgi/htmlextension/form_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/form_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#form" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/frame_spec.rb b/spec/ruby/library/cgi/htmlextension/frame_spec.rb index 2ddd4e1ef0..d433d058e7 100644 --- a/spec/ruby/library/cgi/htmlextension/frame_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/frame_spec.rb @@ -1,5 +1,5 @@ -require_relative '../../../spec_helper' -require_relative 'fixtures/common' +require File.expand_path('../../../../spec_helper', __FILE__) +require File.expand_path('../fixtures/common', __FILE__) require 'cgi' describe "CGI::HtmlExtension#frame" do diff --git a/spec/ruby/library/cgi/htmlextension/frameset_spec.rb b/spec/ruby/library/cgi/htmlextension/frameset_spec.rb index baeb446593..81e92089e4 100644 --- a/spec/ruby/library/cgi/htmlextension/frameset_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/frameset_spec.rb @@ -1,5 +1,5 @@ -require_relative '../../../spec_helper' -require_relative 'fixtures/common' +require File.expand_path('../../../../spec_helper', __FILE__) +require File.expand_path('../fixtures/common', __FILE__) require 'cgi' describe "CGI::HtmlExtension#frameset" do diff --git a/spec/ruby/library/cgi/htmlextension/hidden_spec.rb b/spec/ruby/library/cgi/htmlextension/hidden_spec.rb index 52ebd8c261..dd06dfc354 100644 --- a/spec/ruby/library/cgi/htmlextension/hidden_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/hidden_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#hidden" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/html_spec.rb b/spec/ruby/library/cgi/htmlextension/html_spec.rb index 5d89c82086..0dfba297d2 100644 --- a/spec/ruby/library/cgi/htmlextension/html_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/html_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#html" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/image_button_spec.rb b/spec/ruby/library/cgi/htmlextension/image_button_spec.rb index d14bec9ca3..f4e39d8028 100644 --- a/spec/ruby/library/cgi/htmlextension/image_button_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/image_button_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#image_button" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/img_spec.rb b/spec/ruby/library/cgi/htmlextension/img_spec.rb index 994ae7fedf..8109bcd6c6 100644 --- a/spec/ruby/library/cgi/htmlextension/img_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/img_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#img" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb index 0bf2042a33..75d1b54666 100644 --- a/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/multipart_form_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#multipart_form" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/password_field_spec.rb b/spec/ruby/library/cgi/htmlextension/password_field_spec.rb index 683bc428ba..bb1181de75 100644 --- a/spec/ruby/library/cgi/htmlextension/password_field_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/password_field_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#password_field" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb b/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb index 3462be09b0..5e94ec1a3e 100644 --- a/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/popup_menu_spec.rb @@ -1,7 +1,7 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' -require_relative 'shared/popup_menu' +require File.expand_path('../fixtures/common', __FILE__) +require File.expand_path('../shared/popup_menu', __FILE__) describe "CGI::HtmlExtension#popup_menu" do it_behaves_like :cgi_htmlextension_popup_menu, :popup_menu diff --git a/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb b/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb index 3dc3c879b5..0ce88f20d7 100644 --- a/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/radio_button_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#radio_button" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb b/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb index 1bfd43449d..69d3444072 100644 --- a/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/radio_group_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#radio_group" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/reset_spec.rb b/spec/ruby/library/cgi/htmlextension/reset_spec.rb index 86fa25fc8a..09184347d0 100644 --- a/spec/ruby/library/cgi/htmlextension/reset_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/reset_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#reset" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb b/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb index 4eb0c86c1a..da295278b1 100644 --- a/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/scrolling_list_spec.rb @@ -1,7 +1,7 @@ -require_relative '../../../spec_helper' -require_relative 'fixtures/common' +require File.expand_path('../../../../spec_helper', __FILE__) +require File.expand_path('../fixtures/common', __FILE__) require 'cgi' -require_relative 'shared/popup_menu' +require File.expand_path('../shared/popup_menu', __FILE__) describe "CGI::HtmlExtension#scrolling_list" do it_behaves_like :cgi_htmlextension_popup_menu, :scrolling_list diff --git a/spec/ruby/library/cgi/htmlextension/submit_spec.rb b/spec/ruby/library/cgi/htmlextension/submit_spec.rb index 063891b959..8b9d9b02d8 100644 --- a/spec/ruby/library/cgi/htmlextension/submit_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/submit_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#submit" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/text_field_spec.rb b/spec/ruby/library/cgi/htmlextension/text_field_spec.rb index 44b5a5e69f..b8031d6ff5 100644 --- a/spec/ruby/library/cgi/htmlextension/text_field_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/text_field_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#text_field" do before :each do diff --git a/spec/ruby/library/cgi/htmlextension/textarea_spec.rb b/spec/ruby/library/cgi/htmlextension/textarea_spec.rb index db84a973d2..e47e6ed417 100644 --- a/spec/ruby/library/cgi/htmlextension/textarea_spec.rb +++ b/spec/ruby/library/cgi/htmlextension/textarea_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'fixtures/common' +require File.expand_path('../fixtures/common', __FILE__) describe "CGI::HtmlExtension#textarea" do before :each do diff --git a/spec/ruby/library/cgi/http_header_spec.rb b/spec/ruby/library/cgi/http_header_spec.rb index 4094bebed3..1960d009e4 100644 --- a/spec/ruby/library/cgi/http_header_spec.rb +++ b/spec/ruby/library/cgi/http_header_spec.rb @@ -1,8 +1,8 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' -require_relative 'shared/http_header' +require File.expand_path('../shared/http_header', __FILE__) describe "CGI#http_header" do - it_behaves_like :cgi_http_header, :http_header + it_behaves_like(:cgi_http_header, :http_header) end diff --git a/spec/ruby/library/cgi/initialize_spec.rb b/spec/ruby/library/cgi/initialize_spec.rb index 61bc971d49..6526aab5e8 100644 --- a/spec/ruby/library/cgi/initialize_spec.rb +++ b/spec/ruby/library/cgi/initialize_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI#initialize" do @@ -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::HtmlExtension) @cgi.should_not be_kind_of(CGI::Html3) + @cgi.should_not be_kind_of(CGI::HtmlExtension) @cgi.should_not be_kind_of(CGI::Html4) @cgi.should_not be_kind_of(CGI::Html4Tr) @cgi.should_not be_kind_of(CGI::Html4Fr) diff --git a/spec/ruby/library/cgi/out_spec.rb b/spec/ruby/library/cgi/out_spec.rb index bc09f5bcbb..05fe2662dc 100644 --- a/spec/ruby/library/cgi/out_spec.rb +++ b/spec/ruby/library/cgi/out_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI#out" do @@ -46,6 +46,6 @@ describe "CGI#out when passed no block" do end it "raises a LocalJumpError" do - -> { @cgi.out }.should raise_error(LocalJumpError) + lambda { @cgi.out }.should raise_error(LocalJumpError) end end diff --git a/spec/ruby/library/cgi/parse_spec.rb b/spec/ruby/library/cgi/parse_spec.rb index 04539b1226..8f05c91c7b 100644 --- a/spec/ruby/library/cgi/parse_spec.rb +++ b/spec/ruby/library/cgi/parse_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.parse when passed String" do diff --git a/spec/ruby/library/cgi/pretty_spec.rb b/spec/ruby/library/cgi/pretty_spec.rb index a7b7505c15..e09c327ef6 100644 --- a/spec/ruby/library/cgi/pretty_spec.rb +++ b/spec/ruby/library/cgi/pretty_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.pretty when passed html" do diff --git a/spec/ruby/library/cgi/print_spec.rb b/spec/ruby/library/cgi/print_spec.rb index 18ab8d673b..0db5efa0dd 100644 --- a/spec/ruby/library/cgi/print_spec.rb +++ b/spec/ruby/library/cgi/print_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI#print" do diff --git a/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb b/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb index 0487569b9c..be340b26f0 100644 --- a/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb +++ b/spec/ruby/library/cgi/queryextension/accept_charset_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#accept_charset" do diff --git a/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb b/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb index 35ff3c2b30..a828ae7a42 100644 --- a/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb +++ b/spec/ruby/library/cgi/queryextension/accept_encoding_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#accept_encoding" do diff --git a/spec/ruby/library/cgi/queryextension/accept_language_spec.rb b/spec/ruby/library/cgi/queryextension/accept_language_spec.rb index 4a15d58914..77b4740251 100644 --- a/spec/ruby/library/cgi/queryextension/accept_language_spec.rb +++ b/spec/ruby/library/cgi/queryextension/accept_language_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#accept_language" do diff --git a/spec/ruby/library/cgi/queryextension/accept_spec.rb b/spec/ruby/library/cgi/queryextension/accept_spec.rb index af5209ffbe..0c7aa2ab1f 100644 --- a/spec/ruby/library/cgi/queryextension/accept_spec.rb +++ b/spec/ruby/library/cgi/queryextension/accept_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#accept" do diff --git a/spec/ruby/library/cgi/queryextension/auth_type_spec.rb b/spec/ruby/library/cgi/queryextension/auth_type_spec.rb index 25318269b1..0ec2835053 100644 --- a/spec/ruby/library/cgi/queryextension/auth_type_spec.rb +++ b/spec/ruby/library/cgi/queryextension/auth_type_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#auth_type" do diff --git a/spec/ruby/library/cgi/queryextension/cache_control_spec.rb b/spec/ruby/library/cgi/queryextension/cache_control_spec.rb index 0471307c22..f1718b0871 100644 --- a/spec/ruby/library/cgi/queryextension/cache_control_spec.rb +++ b/spec/ruby/library/cgi/queryextension/cache_control_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#cache_control" do diff --git a/spec/ruby/library/cgi/queryextension/content_length_spec.rb b/spec/ruby/library/cgi/queryextension/content_length_spec.rb index de823f7119..c9f0708f69 100644 --- a/spec/ruby/library/cgi/queryextension/content_length_spec.rb +++ b/spec/ruby/library/cgi/queryextension/content_length_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#content_length" do diff --git a/spec/ruby/library/cgi/queryextension/content_type_spec.rb b/spec/ruby/library/cgi/queryextension/content_type_spec.rb index 49b8389c87..a65b0a6103 100644 --- a/spec/ruby/library/cgi/queryextension/content_type_spec.rb +++ b/spec/ruby/library/cgi/queryextension/content_type_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#content_type" do diff --git a/spec/ruby/library/cgi/queryextension/cookies_spec.rb b/spec/ruby/library/cgi/queryextension/cookies_spec.rb index 4befd61ab7..5df457f11c 100644 --- a/spec/ruby/library/cgi/queryextension/cookies_spec.rb +++ b/spec/ruby/library/cgi/queryextension/cookies_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#cookies" do diff --git a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb index 6ac5b46407..4aabfaa277 100644 --- a/spec/ruby/library/cgi/queryextension/element_reference_spec.rb +++ b/spec/ruby/library/cgi/queryextension/element_reference_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#[]" do diff --git a/spec/ruby/library/cgi/queryextension/from_spec.rb b/spec/ruby/library/cgi/queryextension/from_spec.rb index 04a992cfc7..aabd9b9bb3 100644 --- a/spec/ruby/library/cgi/queryextension/from_spec.rb +++ b/spec/ruby/library/cgi/queryextension/from_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#from" do diff --git a/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb b/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb index 3ead5bd8bf..8b006063d8 100644 --- a/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb +++ b/spec/ruby/library/cgi/queryextension/gateway_interface_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#gateway_interface" do diff --git a/spec/ruby/library/cgi/queryextension/has_key_spec.rb b/spec/ruby/library/cgi/queryextension/has_key_spec.rb index 525b45b507..86ec3d0a29 100644 --- a/spec/ruby/library/cgi/queryextension/has_key_spec.rb +++ b/spec/ruby/library/cgi/queryextension/has_key_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'shared/has_key' +require File.expand_path('../shared/has_key', __FILE__) describe "CGI::QueryExtension#has_key?" do it_behaves_like :cgi_query_extension_has_key_p, :has_key? diff --git a/spec/ruby/library/cgi/queryextension/host_spec.rb b/spec/ruby/library/cgi/queryextension/host_spec.rb index e820e0afc3..89e2610ba7 100644 --- a/spec/ruby/library/cgi/queryextension/host_spec.rb +++ b/spec/ruby/library/cgi/queryextension/host_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#host" do diff --git a/spec/ruby/library/cgi/queryextension/include_spec.rb b/spec/ruby/library/cgi/queryextension/include_spec.rb index 12365ea284..e8f1bf14ec 100644 --- a/spec/ruby/library/cgi/queryextension/include_spec.rb +++ b/spec/ruby/library/cgi/queryextension/include_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'shared/has_key' +require File.expand_path('../shared/has_key', __FILE__) describe "CGI::QueryExtension#include?" do it_behaves_like :cgi_query_extension_has_key_p, :include? diff --git a/spec/ruby/library/cgi/queryextension/key_spec.rb b/spec/ruby/library/cgi/queryextension/key_spec.rb index d0f1e4cee2..525a0210b2 100644 --- a/spec/ruby/library/cgi/queryextension/key_spec.rb +++ b/spec/ruby/library/cgi/queryextension/key_spec.rb @@ -1,6 +1,6 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' -require_relative 'shared/has_key' +require File.expand_path('../shared/has_key', __FILE__) describe "CGI::QueryExtension#key?" do it_behaves_like :cgi_query_extension_has_key_p, :key? diff --git a/spec/ruby/library/cgi/queryextension/keys_spec.rb b/spec/ruby/library/cgi/queryextension/keys_spec.rb index 14d77180fa..f60b1fb369 100644 --- a/spec/ruby/library/cgi/queryextension/keys_spec.rb +++ b/spec/ruby/library/cgi/queryextension/keys_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#keys" do diff --git a/spec/ruby/library/cgi/queryextension/multipart_spec.rb b/spec/ruby/library/cgi/queryextension/multipart_spec.rb index ced4cb05a1..021c847fa3 100644 --- a/spec/ruby/library/cgi/queryextension/multipart_spec.rb +++ b/spec/ruby/library/cgi/queryextension/multipart_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' require "stringio" diff --git a/spec/ruby/library/cgi/queryextension/negotiate_spec.rb b/spec/ruby/library/cgi/queryextension/negotiate_spec.rb index b6fe036042..503ae583bf 100644 --- a/spec/ruby/library/cgi/queryextension/negotiate_spec.rb +++ b/spec/ruby/library/cgi/queryextension/negotiate_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#negotiate" do diff --git a/spec/ruby/library/cgi/queryextension/params_spec.rb b/spec/ruby/library/cgi/queryextension/params_spec.rb index f4449e3c8a..6d47b3eeee 100644 --- a/spec/ruby/library/cgi/queryextension/params_spec.rb +++ b/spec/ruby/library/cgi/queryextension/params_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#params" do diff --git a/spec/ruby/library/cgi/queryextension/path_info_spec.rb b/spec/ruby/library/cgi/queryextension/path_info_spec.rb index 9785df85f1..8c8af27fc9 100644 --- a/spec/ruby/library/cgi/queryextension/path_info_spec.rb +++ b/spec/ruby/library/cgi/queryextension/path_info_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#path_info" do diff --git a/spec/ruby/library/cgi/queryextension/path_translated_spec.rb b/spec/ruby/library/cgi/queryextension/path_translated_spec.rb index 417a749341..6e9db707b3 100644 --- a/spec/ruby/library/cgi/queryextension/path_translated_spec.rb +++ b/spec/ruby/library/cgi/queryextension/path_translated_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#path_translated" do diff --git a/spec/ruby/library/cgi/queryextension/pragma_spec.rb b/spec/ruby/library/cgi/queryextension/pragma_spec.rb index 02d5c91221..c0c7b20514 100644 --- a/spec/ruby/library/cgi/queryextension/pragma_spec.rb +++ b/spec/ruby/library/cgi/queryextension/pragma_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#pragma" do diff --git a/spec/ruby/library/cgi/queryextension/query_string_spec.rb b/spec/ruby/library/cgi/queryextension/query_string_spec.rb index a6b454a7eb..1065bac7ef 100644 --- a/spec/ruby/library/cgi/queryextension/query_string_spec.rb +++ b/spec/ruby/library/cgi/queryextension/query_string_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#query_string" do diff --git a/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb b/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb index 3d7072e346..84b0e0c0dc 100644 --- a/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb +++ b/spec/ruby/library/cgi/queryextension/raw_cookie2_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#raw_cookie2" do diff --git a/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb b/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb index ede7b9ff87..096bcf9fab 100644 --- a/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb +++ b/spec/ruby/library/cgi/queryextension/raw_cookie_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#raw_cookie" do diff --git a/spec/ruby/library/cgi/queryextension/referer_spec.rb b/spec/ruby/library/cgi/queryextension/referer_spec.rb index 6cd5dc96f8..d52b3a501a 100644 --- a/spec/ruby/library/cgi/queryextension/referer_spec.rb +++ b/spec/ruby/library/cgi/queryextension/referer_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#referer" do diff --git a/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb b/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb index 0259402b23..dc94e2c953 100644 --- a/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb +++ b/spec/ruby/library/cgi/queryextension/remote_addr_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#remote_addr" do diff --git a/spec/ruby/library/cgi/queryextension/remote_host_spec.rb b/spec/ruby/library/cgi/queryextension/remote_host_spec.rb index cf77e0031b..f62664b9a7 100644 --- a/spec/ruby/library/cgi/queryextension/remote_host_spec.rb +++ b/spec/ruby/library/cgi/queryextension/remote_host_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#remote_host" do diff --git a/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb b/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb index 5b51d6b8ee..3aab059a7e 100644 --- a/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb +++ b/spec/ruby/library/cgi/queryextension/remote_ident_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#remote_ident" do diff --git a/spec/ruby/library/cgi/queryextension/remote_user_spec.rb b/spec/ruby/library/cgi/queryextension/remote_user_spec.rb index 1a93bb6561..5aae6bc755 100644 --- a/spec/ruby/library/cgi/queryextension/remote_user_spec.rb +++ b/spec/ruby/library/cgi/queryextension/remote_user_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#remote_user" do diff --git a/spec/ruby/library/cgi/queryextension/request_method_spec.rb b/spec/ruby/library/cgi/queryextension/request_method_spec.rb index eabdd6998b..7fa85a3b34 100644 --- a/spec/ruby/library/cgi/queryextension/request_method_spec.rb +++ b/spec/ruby/library/cgi/queryextension/request_method_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#request_method" do diff --git a/spec/ruby/library/cgi/queryextension/script_name_spec.rb b/spec/ruby/library/cgi/queryextension/script_name_spec.rb index 341b7b6fea..7509e002d4 100644 --- a/spec/ruby/library/cgi/queryextension/script_name_spec.rb +++ b/spec/ruby/library/cgi/queryextension/script_name_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#script_name" do diff --git a/spec/ruby/library/cgi/queryextension/server_name_spec.rb b/spec/ruby/library/cgi/queryextension/server_name_spec.rb index b12aaf8c5c..acc8f9e4aa 100644 --- a/spec/ruby/library/cgi/queryextension/server_name_spec.rb +++ b/spec/ruby/library/cgi/queryextension/server_name_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#server_name" do diff --git a/spec/ruby/library/cgi/queryextension/server_port_spec.rb b/spec/ruby/library/cgi/queryextension/server_port_spec.rb index 0e688a99bf..adeabfda65 100644 --- a/spec/ruby/library/cgi/queryextension/server_port_spec.rb +++ b/spec/ruby/library/cgi/queryextension/server_port_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#server_port" do diff --git a/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb b/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb index f9dcf3c5b8..f1285bbd20 100644 --- a/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb +++ b/spec/ruby/library/cgi/queryextension/server_protocol_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#server_protocol" do diff --git a/spec/ruby/library/cgi/queryextension/server_software_spec.rb b/spec/ruby/library/cgi/queryextension/server_software_spec.rb index df349cdf2e..e982a6f31c 100644 --- a/spec/ruby/library/cgi/queryextension/server_software_spec.rb +++ b/spec/ruby/library/cgi/queryextension/server_software_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#server_software" do diff --git a/spec/ruby/library/cgi/queryextension/user_agent_spec.rb b/spec/ruby/library/cgi/queryextension/user_agent_spec.rb index ec5ef187dd..8bbfed17c5 100644 --- a/spec/ruby/library/cgi/queryextension/user_agent_spec.rb +++ b/spec/ruby/library/cgi/queryextension/user_agent_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe "CGI::QueryExtension#user_agent" do diff --git a/spec/ruby/library/cgi/rfc1123_date_spec.rb b/spec/ruby/library/cgi/rfc1123_date_spec.rb index 6904eeabaa..73e07c6fbd 100644 --- a/spec/ruby/library/cgi/rfc1123_date_spec.rb +++ b/spec/ruby/library/cgi/rfc1123_date_spec.rb @@ -1,7 +1,7 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' -describe "CGI.rfc1123_date when passed Time" do +describe "CGI.rfc1123_date when passsed 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' diff --git a/spec/ruby/library/cgi/shared/http_header.rb b/spec/ruby/library/cgi/shared/http_header.rb index b225b5925e..b6d81d2e0e 100644 --- a/spec/ruby/library/cgi/shared/http_header.rb +++ b/spec/ruby/library/cgi/shared/http_header.rb @@ -1,4 +1,4 @@ -require_relative '../../../spec_helper' +require File.expand_path('../../../../spec_helper', __FILE__) require 'cgi' describe :cgi_http_header, shared: true do diff --git a/spec/ruby/library/cgi/unescapeElement_spec.rb b/spec/ruby/library/cgi/unescapeElement_spec.rb index ae4d50b076..cc26f9b484 100644 --- a/spec/ruby/library/cgi/unescapeElement_spec.rb +++ b/spec/ruby/library/cgi/unescapeElement_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.unescapeElement when passed String, elements, ..." do diff --git a/spec/ruby/library/cgi/unescapeHTML_spec.rb b/spec/ruby/library/cgi/unescapeHTML_spec.rb index 84b30c6aa6..611ce0a6f1 100644 --- a/spec/ruby/library/cgi/unescapeHTML_spec.rb +++ b/spec/ruby/library/cgi/unescapeHTML_spec.rb @@ -1,4 +1,4 @@ -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.unescapeHTML" do @@ -36,9 +36,4 @@ describe "CGI.unescapeHTML" do input = "fooooooo&#" CGI.unescapeHTML(input).should == input end - - it "unescapes invalid encoding" do - input = "\xFF&" - CGI.unescapeHTML(input).should == input - end end diff --git a/spec/ruby/library/cgi/unescape_spec.rb b/spec/ruby/library/cgi/unescape_spec.rb index c593e24b4a..8cf988b9dd 100644 --- a/spec/ruby/library/cgi/unescape_spec.rb +++ b/spec/ruby/library/cgi/unescape_spec.rb @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -require_relative '../../spec_helper' +require File.expand_path('../../../spec_helper', __FILE__) require 'cgi' describe "CGI.unescape" do @@ -8,8 +8,8 @@ describe "CGI.unescape" do expected = " !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" CGI.unescape(input).should == expected - input = 'https%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%E3%83%AD%E3%83%A0%E3%82%B9%E3%82%AB%E3%83%BB%E3%83%91%E3%83%AD%E3%83%BB%E3%82%A6%E3%83%AB%E3%83%BB%E3%83%A9%E3%83%94%E3%83%A5%E3%82%BF' - expected = "https://ja.wikipedia.org/wiki/\343\203\255\343\203\240\343\202\271\343\202\253\343\203\273\343\203\221\343\203\255\343\203\273\343\202\246\343\203\253\343\203\273\343\203\251\343\203\224\343\203\245\343\202\277" + input = 'http%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%E3%83%AD%E3%83%A0%E3%82%B9%E3%82%AB%E3%83%BB%E3%83%91%E3%83%AD%E3%83%BB%E3%82%A6%E3%83%AB%E3%83%BB%E3%83%A9%E3%83%94%E3%83%A5%E3%82%BF' + expected = "http://ja.wikipedia.org/wiki/\343\203\255\343\203\240\343\202\271\343\202\253\343\203\273\343\203\221\343\203\255\343\203\273\343\202\246\343\203\253\343\203\273\343\203\251\343\203\224\343\203\245\343\202\277" CGI.unescape(input).should == expected end end |