Update to ruby/spec@c1b568b

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

spec/ruby/library/uri/decode_www_form_component_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.decode_www_form_component" do

spec/ruby/library/uri/decode_www_form_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.decode_www_form" do

spec/ruby/library/uri/encode_www_form_component_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.encode_www_form_component" do

spec/ruby/library/uri/encode_www_form_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.encode_www_form" do

spec/ruby/library/uri/eql_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/normalization', __FILE__)
-require File.expand_path('../shared/eql', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/normalization'
+require_relative 'shared/eql'
 require 'uri'
 
 describe "URI#eql?" do

spec/ruby/library/uri/equality_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/normalization', __FILE__)
-require File.expand_path('../shared/eql', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/normalization'
+require_relative 'shared/eql'
 require 'uri'
 
 describe "URI#==" do

spec/ruby/library/uri/escape/decode_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Escape#decode" do

spec/ruby/library/uri/escape/encode_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Escape#encode" do

spec/ruby/library/uri/escape/escape_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Escape#escape" do

spec/ruby/library/uri/escape/unescape_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Escape#unescape" do

spec/ruby/library/uri/extract_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.extract" do

spec/ruby/library/uri/ftp/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP.build" do

spec/ruby/library/uri/ftp/merge_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP#merge" do

spec/ruby/library/uri/ftp/new2_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP.new2" do

spec/ruby/library/uri/ftp/path_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP#path=" do

spec/ruby/library/uri/ftp/set_typecode_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP#set_typecode" do

spec/ruby/library/uri/ftp/to_s_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 

spec/ruby/library/uri/ftp/typecode_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::FTP#typecode" do

spec/ruby/library/uri/generic/absolute_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#absolute" do

spec/ruby/library/uri/generic/build2_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic.build2" do

spec/ruby/library/uri/generic/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic.build" do

spec/ruby/library/uri/generic/coerce_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#coerce" do

spec/ruby/library/uri/generic/component_ary_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#component_ary" do

spec/ruby/library/uri/generic/component_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#component" do

spec/ruby/library/uri/generic/default_port_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#default_port" do

spec/ruby/library/uri/generic/eql_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#eql?" do

spec/ruby/library/uri/generic/equal_value_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#==" do

spec/ruby/library/uri/generic/fragment_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#fragment" do

spec/ruby/library/uri/generic/hash_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#hash" do

spec/ruby/library/uri/generic/hierarchical_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#hierarchical?" do

spec/ruby/library/uri/generic/host_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#host" do

spec/ruby/library/uri/generic/inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#inspect" do

spec/ruby/library/uri/generic/merge_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#merge" do

spec/ruby/library/uri/generic/minus_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#-" do

spec/ruby/library/uri/generic/normalize_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#normalize" do

spec/ruby/library/uri/generic/opaque_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#opaque" do

spec/ruby/library/uri/generic/password_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#password" do

spec/ruby/library/uri/generic/path_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#path" do

spec/ruby/library/uri/generic/plus_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#+" do

spec/ruby/library/uri/generic/port_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#port" do

spec/ruby/library/uri/generic/query_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#query" do

spec/ruby/library/uri/generic/registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#registry" do

spec/ruby/library/uri/generic/relative_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#relative?" do

spec/ruby/library/uri/generic/route_from_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#route_from" do

spec/ruby/library/uri/generic/route_to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#route_to" do

spec/ruby/library/uri/generic/scheme_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#scheme" do

spec/ruby/library/uri/generic/select_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#select" do

spec/ruby/library/uri/generic/set_fragment_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_fragment" do

spec/ruby/library/uri/generic/set_host_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_host" do

spec/ruby/library/uri/generic/set_opaque_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_opaque" do

spec/ruby/library/uri/generic/set_password_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_password" do

spec/ruby/library/uri/generic/set_path_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_path" do

spec/ruby/library/uri/generic/set_port_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_port" do

spec/ruby/library/uri/generic/set_query_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_query" do

spec/ruby/library/uri/generic/set_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_registry" do

spec/ruby/library/uri/generic/set_scheme_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_scheme" do

spec/ruby/library/uri/generic/set_user_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_user" do

spec/ruby/library/uri/generic/set_userinfo_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#set_userinfo" do

spec/ruby/library/uri/generic/to_s_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#to_s" do

spec/ruby/library/uri/generic/use_registry_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic.use_registry" do

spec/ruby/library/uri/generic/user_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#user" do

spec/ruby/library/uri/generic/userinfo_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#userinfo" do

spec/ruby/library/uri/http/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::HTTP.build" do

spec/ruby/library/uri/http/request_uri_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::HTTP.request_uri" do

spec/ruby/library/uri/join_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.join" do

spec/ruby/library/uri/ldap/attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#attributes" do

spec/ruby/library/uri/ldap/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP.build" do

spec/ruby/library/uri/ldap/dn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#dn" do

spec/ruby/library/uri/ldap/extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#extensions" do

spec/ruby/library/uri/ldap/filter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#filter" do

spec/ruby/library/uri/ldap/hierarchical_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#hierarchical?" do

spec/ruby/library/uri/ldap/scope_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#scope" do

spec/ruby/library/uri/ldap/set_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#set_attributes" do

spec/ruby/library/uri/ldap/set_dn_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#set_dn" do

spec/ruby/library/uri/ldap/set_extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#set_extensions" do

spec/ruby/library/uri/ldap/set_filter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#set_filter" do

spec/ruby/library/uri/ldap/set_scope_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::LDAP#set_scope" do

spec/ruby/library/uri/mailto/build_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Mailto.build" do

spec/ruby/library/uri/mailto/headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#headers" do

spec/ruby/library/uri/mailto/set_headers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#set_headers" do

spec/ruby/library/uri/mailto/set_to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#set_to" do

spec/ruby/library/uri/mailto/to_mailtext_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#to_mailtext" do

spec/ruby/library/uri/mailto/to_rfc822text_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#to_rfc822text" do

spec/ruby/library/uri/mailto/to_s_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#to_s" do

spec/ruby/library/uri/mailto/to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::MailTo#to" do

spec/ruby/library/uri/merge_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI#merge" do

spec/ruby/library/uri/normalize_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/normalization', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/normalization'
 require 'uri'
 
 describe "URI#normalize" do

spec/ruby/library/uri/parse_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "URI.parse" do
 

spec/ruby/library/uri/parser/escape_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Parser#escape" do

spec/ruby/library/uri/parser/extract_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../shared/extract', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../shared/extract'
 require 'uri'
 
 describe "URI::Parser#extract" do

spec/ruby/library/uri/parser/inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Parser#split" do

spec/ruby/library/uri/parser/join_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../shared/join', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../shared/join'
 require 'uri'
 
 describe "URI::Parser#join" do

spec/ruby/library/uri/parser/make_regexp_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Parser#make_regexp" do

spec/ruby/library/uri/parser/parse_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
-require File.expand_path('../../shared/parse', __FILE__)
+require_relative '../../../spec_helper'
+require_relative '../fixtures/classes'
+require_relative '../shared/parse'
 
 describe "URI::Parser#parse" do
   it_behaves_like :uri_parse, :parse, URI::Parser.new

spec/ruby/library/uri/parser/split_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Parser#split" do

spec/ruby/library/uri/parser/unescape_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Parser#unescape" do

spec/ruby/library/uri/plus_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 #an alias of URI#merge

spec/ruby/library/uri/regexp_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 #I'm more or less ok with these limited tests, as the more extensive extract tests

spec/ruby/library/uri/route_from_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI#route_from" do

spec/ruby/library/uri/route_to_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI#route_to" do