Update to ruby/spec@c1b568b

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

105 files changed, 115 insertions, 115 deletions

diff --git a/spec/ruby/library/uri/decode_www_form_component_spec.rb b/spec/ruby/library/uri/decode_www_form_component_spec.rb
index 04cc634947..075cec1087 100644
--- a/spec/ruby/library/uri/decode_www_form_component_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/decode_www_form_spec.rb b/spec/ruby/library/uri/decode_www_form_spec.rb
index d4854a6ece..8dd37e514f 100644
--- a/spec/ruby/library/uri/decode_www_form_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/encode_www_form_component_spec.rb b/spec/ruby/library/uri/encode_www_form_component_spec.rb
index 753b6d50d0..a0508b207c 100644
--- a/spec/ruby/library/uri/encode_www_form_component_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/encode_www_form_spec.rb b/spec/ruby/library/uri/encode_www_form_spec.rb
index b72b928344..7f4aecf89b 100644
--- a/spec/ruby/library/uri/encode_www_form_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/eql_spec.rb b/spec/ruby/library/uri/eql_spec.rb
index 2bbc5291e9..2bbf8fd40c 100644
--- a/spec/ruby/library/uri/eql_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/equality_spec.rb b/spec/ruby/library/uri/equality_spec.rb
index 07d48a9583..1c247ce291 100644
--- a/spec/ruby/library/uri/equality_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/escape/decode_spec.rb b/spec/ruby/library/uri/escape/decode_spec.rb
index 34d3e787c4..b4ef799411 100644
--- a/spec/ruby/library/uri/escape/decode_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/escape/encode_spec.rb b/spec/ruby/library/uri/escape/encode_spec.rb
index edde60b3cd..2b61b7c152 100644
--- a/spec/ruby/library/uri/escape/encode_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/escape/escape_spec.rb b/spec/ruby/library/uri/escape/escape_spec.rb
index 3c6b957b18..dddbc60707 100644
--- a/spec/ruby/library/uri/escape/escape_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/escape/unescape_spec.rb b/spec/ruby/library/uri/escape/unescape_spec.rb
index 6a7165a0d3..7d574d13c1 100644
--- a/spec/ruby/library/uri/escape/unescape_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/extract_spec.rb b/spec/ruby/library/uri/extract_spec.rb
index 7b660851b6..1294a480f1 100644
--- a/spec/ruby/library/uri/extract_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/build_spec.rb b/spec/ruby/library/uri/ftp/build_spec.rb
index c7765e2868..9e0fb44cf1 100644
--- a/spec/ruby/library/uri/ftp/build_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/merge_spec.rb b/spec/ruby/library/uri/ftp/merge_spec.rb
index b766e992ca..7a9997bbac 100644
--- a/spec/ruby/library/uri/ftp/merge_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/new2_spec.rb b/spec/ruby/library/uri/ftp/new2_spec.rb
index a43916af6a..eb1b149c81 100644
--- a/spec/ruby/library/uri/ftp/new2_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/path_spec.rb b/spec/ruby/library/uri/ftp/path_spec.rb
index 9e1a00602f..5fec7f11b6 100644
--- a/spec/ruby/library/uri/ftp/path_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/set_typecode_spec.rb b/spec/ruby/library/uri/ftp/set_typecode_spec.rb
index b815bc8740..31067930c0 100644
--- a/spec/ruby/library/uri/ftp/set_typecode_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ftp/to_s_spec.rb b/spec/ruby/library/uri/ftp/to_s_spec.rb
index e4e2832e86..3b4ff2d906 100644
--- a/spec/ruby/library/uri/ftp/to_s_spec.rb
+++ b/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'
 
 
diff --git a/spec/ruby/library/uri/ftp/typecode_spec.rb b/spec/ruby/library/uri/ftp/typecode_spec.rb
index b298c2ae98..1f2bb02252 100644
--- a/spec/ruby/library/uri/ftp/typecode_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/absolute_spec.rb b/spec/ruby/library/uri/generic/absolute_spec.rb
index 4f6526b827..fe4b48d067 100644
--- a/spec/ruby/library/uri/generic/absolute_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/build2_spec.rb b/spec/ruby/library/uri/generic/build2_spec.rb
index 0b9a6788f6..9abd1d80ef 100644
--- a/spec/ruby/library/uri/generic/build2_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/build_spec.rb b/spec/ruby/library/uri/generic/build_spec.rb
index 6fa5d6ac55..50c27674ce 100644
--- a/spec/ruby/library/uri/generic/build_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/coerce_spec.rb b/spec/ruby/library/uri/generic/coerce_spec.rb
index 1b1a040f63..f695e560ac 100644
--- a/spec/ruby/library/uri/generic/coerce_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/component_ary_spec.rb b/spec/ruby/library/uri/generic/component_ary_spec.rb
index 3244073e0e..b39752f8d9 100644
--- a/spec/ruby/library/uri/generic/component_ary_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/component_spec.rb b/spec/ruby/library/uri/generic/component_spec.rb
index 6fb83d7796..f92409a0b0 100644
--- a/spec/ruby/library/uri/generic/component_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/default_port_spec.rb b/spec/ruby/library/uri/generic/default_port_spec.rb
index d1e0ce2d3f..4e10e34c9d 100644
--- a/spec/ruby/library/uri/generic/default_port_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/eql_spec.rb b/spec/ruby/library/uri/generic/eql_spec.rb
index 65f9204a19..df9987b524 100644
--- a/spec/ruby/library/uri/generic/eql_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/equal_value_spec.rb b/spec/ruby/library/uri/generic/equal_value_spec.rb
index f41b202498..bd2feb86d4 100644
--- a/spec/ruby/library/uri/generic/equal_value_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/fragment_spec.rb b/spec/ruby/library/uri/generic/fragment_spec.rb
index de6f4e078d..20126b207a 100644
--- a/spec/ruby/library/uri/generic/fragment_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/hash_spec.rb b/spec/ruby/library/uri/generic/hash_spec.rb
index 3410558067..286c1ab38d 100644
--- a/spec/ruby/library/uri/generic/hash_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/hierarchical_spec.rb b/spec/ruby/library/uri/generic/hierarchical_spec.rb
index 1c90dc4f8f..df9bbae202 100644
--- a/spec/ruby/library/uri/generic/hierarchical_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/host_spec.rb b/spec/ruby/library/uri/generic/host_spec.rb
index 6fb6c1c36a..f2076d2bc1 100644
--- a/spec/ruby/library/uri/generic/host_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/inspect_spec.rb b/spec/ruby/library/uri/generic/inspect_spec.rb
index 696c3308d4..4ff81eef82 100644
--- a/spec/ruby/library/uri/generic/inspect_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/merge_spec.rb b/spec/ruby/library/uri/generic/merge_spec.rb
index 63642197e1..017873cc90 100644
--- a/spec/ruby/library/uri/generic/merge_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/minus_spec.rb b/spec/ruby/library/uri/generic/minus_spec.rb
index 3426a6068b..ad8f816839 100644
--- a/spec/ruby/library/uri/generic/minus_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/normalize_spec.rb b/spec/ruby/library/uri/generic/normalize_spec.rb
index ac02b644d0..d70a77c044 100644
--- a/spec/ruby/library/uri/generic/normalize_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/opaque_spec.rb b/spec/ruby/library/uri/generic/opaque_spec.rb
index f418c220f2..e6d40da52b 100644
--- a/spec/ruby/library/uri/generic/opaque_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/password_spec.rb b/spec/ruby/library/uri/generic/password_spec.rb
index 087db60fb9..18db503883 100644
--- a/spec/ruby/library/uri/generic/password_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/path_spec.rb b/spec/ruby/library/uri/generic/path_spec.rb
index 5ea60b5418..d84975c579 100644
--- a/spec/ruby/library/uri/generic/path_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/plus_spec.rb b/spec/ruby/library/uri/generic/plus_spec.rb
index 3d1c031022..e6d2222dac 100644
--- a/spec/ruby/library/uri/generic/plus_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/port_spec.rb b/spec/ruby/library/uri/generic/port_spec.rb
index 148e84ff14..6e5ef01493 100644
--- a/spec/ruby/library/uri/generic/port_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/query_spec.rb b/spec/ruby/library/uri/generic/query_spec.rb
index 945fdc06a3..528cc3be02 100644
--- a/spec/ruby/library/uri/generic/query_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/registry_spec.rb b/spec/ruby/library/uri/generic/registry_spec.rb
index 6a48b25465..aece265a07 100644
--- a/spec/ruby/library/uri/generic/registry_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/relative_spec.rb b/spec/ruby/library/uri/generic/relative_spec.rb
index 09730fa4eb..a7de1f306a 100644
--- a/spec/ruby/library/uri/generic/relative_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/route_from_spec.rb b/spec/ruby/library/uri/generic/route_from_spec.rb
index 03321cbf0d..fd69816edf 100644
--- a/spec/ruby/library/uri/generic/route_from_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/route_to_spec.rb b/spec/ruby/library/uri/generic/route_to_spec.rb
index a12e1f7649..7ab9aff2e8 100644
--- a/spec/ruby/library/uri/generic/route_to_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/scheme_spec.rb b/spec/ruby/library/uri/generic/scheme_spec.rb
index fa3dfcb8aa..7922a8e977 100644
--- a/spec/ruby/library/uri/generic/scheme_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/select_spec.rb b/spec/ruby/library/uri/generic/select_spec.rb
index 5cc104f5dd..99aef83f99 100644
--- a/spec/ruby/library/uri/generic/select_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_fragment_spec.rb b/spec/ruby/library/uri/generic/set_fragment_spec.rb
index cebad46585..2476315f08 100644
--- a/spec/ruby/library/uri/generic/set_fragment_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_host_spec.rb b/spec/ruby/library/uri/generic/set_host_spec.rb
index 357b7a6889..c7f5c6884e 100644
--- a/spec/ruby/library/uri/generic/set_host_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_opaque_spec.rb b/spec/ruby/library/uri/generic/set_opaque_spec.rb
index afd6597675..8a494a7ee2 100644
--- a/spec/ruby/library/uri/generic/set_opaque_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_password_spec.rb b/spec/ruby/library/uri/generic/set_password_spec.rb
index 15b4fdc37d..93b05fe911 100644
--- a/spec/ruby/library/uri/generic/set_password_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_path_spec.rb b/spec/ruby/library/uri/generic/set_path_spec.rb
index b4366d789c..6d9f59d1a5 100644
--- a/spec/ruby/library/uri/generic/set_path_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_port_spec.rb b/spec/ruby/library/uri/generic/set_port_spec.rb
index aa65bb96e3..2c8a4edd22 100644
--- a/spec/ruby/library/uri/generic/set_port_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_query_spec.rb b/spec/ruby/library/uri/generic/set_query_spec.rb
index b1c25e56ca..3f3453ba8e 100644
--- a/spec/ruby/library/uri/generic/set_query_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_registry_spec.rb b/spec/ruby/library/uri/generic/set_registry_spec.rb
index 602f868ac1..44afe246d1 100644
--- a/spec/ruby/library/uri/generic/set_registry_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_scheme_spec.rb b/spec/ruby/library/uri/generic/set_scheme_spec.rb
index e1a94c5b1a..ffa29da446 100644
--- a/spec/ruby/library/uri/generic/set_scheme_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_user_spec.rb b/spec/ruby/library/uri/generic/set_user_spec.rb
index 36a6ac9e85..9a39e1f4c3 100644
--- a/spec/ruby/library/uri/generic/set_user_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/set_userinfo_spec.rb b/spec/ruby/library/uri/generic/set_userinfo_spec.rb
index cbe80d9809..76878204d2 100644
--- a/spec/ruby/library/uri/generic/set_userinfo_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/to_s_spec.rb b/spec/ruby/library/uri/generic/to_s_spec.rb
index c0a0f803ef..8c90d7645b 100644
--- a/spec/ruby/library/uri/generic/to_s_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/use_registry_spec.rb b/spec/ruby/library/uri/generic/use_registry_spec.rb
index 4e7ae6a5cf..bdfe27c048 100644
--- a/spec/ruby/library/uri/generic/use_registry_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/user_spec.rb b/spec/ruby/library/uri/generic/user_spec.rb
index b785ef6879..345412ca29 100644
--- a/spec/ruby/library/uri/generic/user_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/generic/userinfo_spec.rb b/spec/ruby/library/uri/generic/userinfo_spec.rb
index 5d0fc50b65..4bf111079c 100644
--- a/spec/ruby/library/uri/generic/userinfo_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/http/build_spec.rb b/spec/ruby/library/uri/http/build_spec.rb
index 85103167e0..d34cf83ecf 100644
--- a/spec/ruby/library/uri/http/build_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/http/request_uri_spec.rb b/spec/ruby/library/uri/http/request_uri_spec.rb
index 85d89aba77..7b05147d36 100644
--- a/spec/ruby/library/uri/http/request_uri_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/join_spec.rb b/spec/ruby/library/uri/join_spec.rb
index 3e0dbe7f2b..6033ecf44c 100644
--- a/spec/ruby/library/uri/join_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/attributes_spec.rb b/spec/ruby/library/uri/ldap/attributes_spec.rb
index 2309de7c62..88e3328bad 100644
--- a/spec/ruby/library/uri/ldap/attributes_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/build_spec.rb b/spec/ruby/library/uri/ldap/build_spec.rb
index 99e2611b1f..8d0e312d1a 100644
--- a/spec/ruby/library/uri/ldap/build_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/dn_spec.rb b/spec/ruby/library/uri/ldap/dn_spec.rb
index b1371611d3..a5ac02e891 100644
--- a/spec/ruby/library/uri/ldap/dn_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/extensions_spec.rb b/spec/ruby/library/uri/ldap/extensions_spec.rb
index 2d9b09e6a7..473222eb7a 100644
--- a/spec/ruby/library/uri/ldap/extensions_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/filter_spec.rb b/spec/ruby/library/uri/ldap/filter_spec.rb
index 1f996339db..d0b7fcc384 100644
--- a/spec/ruby/library/uri/ldap/filter_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/hierarchical_spec.rb b/spec/ruby/library/uri/ldap/hierarchical_spec.rb
index 97c23a7f0c..5471c53d76 100644
--- a/spec/ruby/library/uri/ldap/hierarchical_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/scope_spec.rb b/spec/ruby/library/uri/ldap/scope_spec.rb
index d4a02e08f0..5ea5581671 100644
--- a/spec/ruby/library/uri/ldap/scope_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/set_attributes_spec.rb b/spec/ruby/library/uri/ldap/set_attributes_spec.rb
index 1bbcb34837..fdaaa8344a 100644
--- a/spec/ruby/library/uri/ldap/set_attributes_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/set_dn_spec.rb b/spec/ruby/library/uri/ldap/set_dn_spec.rb
index abb640b585..c50ee6a98d 100644
--- a/spec/ruby/library/uri/ldap/set_dn_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/set_extensions_spec.rb b/spec/ruby/library/uri/ldap/set_extensions_spec.rb
index 5cd2077aab..5a39da4607 100644
--- a/spec/ruby/library/uri/ldap/set_extensions_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/set_filter_spec.rb b/spec/ruby/library/uri/ldap/set_filter_spec.rb
index f1b8e5e595..c3ede20bb4 100644
--- a/spec/ruby/library/uri/ldap/set_filter_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/ldap/set_scope_spec.rb b/spec/ruby/library/uri/ldap/set_scope_spec.rb
index 5a0841cfd8..43f3f68f86 100644
--- a/spec/ruby/library/uri/ldap/set_scope_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/build_spec.rb b/spec/ruby/library/uri/mailto/build_spec.rb
index cb57f0c794..80af931c8c 100644
--- a/spec/ruby/library/uri/mailto/build_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/headers_spec.rb b/spec/ruby/library/uri/mailto/headers_spec.rb
index 844fdee714..8aefec0e75 100644
--- a/spec/ruby/library/uri/mailto/headers_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/set_headers_spec.rb b/spec/ruby/library/uri/mailto/set_headers_spec.rb
index c1384d5dca..b6ce1a694b 100644
--- a/spec/ruby/library/uri/mailto/set_headers_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/set_to_spec.rb b/spec/ruby/library/uri/mailto/set_to_spec.rb
index a8351a2092..eabc47f9a8 100644
--- a/spec/ruby/library/uri/mailto/set_to_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/to_mailtext_spec.rb b/spec/ruby/library/uri/mailto/to_mailtext_spec.rb
index 4c7a48874f..3763a2d402 100644
--- a/spec/ruby/library/uri/mailto/to_mailtext_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/to_rfc822text_spec.rb b/spec/ruby/library/uri/mailto/to_rfc822text_spec.rb
index e769f62deb..2843b46848 100644
--- a/spec/ruby/library/uri/mailto/to_rfc822text_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/to_s_spec.rb b/spec/ruby/library/uri/mailto/to_s_spec.rb
index 2709d19d27..746e8356eb 100644
--- a/spec/ruby/library/uri/mailto/to_s_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/mailto/to_spec.rb b/spec/ruby/library/uri/mailto/to_spec.rb
index f30d23dd53..68dfadd359 100644
--- a/spec/ruby/library/uri/mailto/to_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/merge_spec.rb b/spec/ruby/library/uri/merge_spec.rb
index c62e80d6b2..e9644a7fd0 100644
--- a/spec/ruby/library/uri/merge_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/normalize_spec.rb b/spec/ruby/library/uri/normalize_spec.rb
index 079a9ad61d..3d4451990a 100644
--- a/spec/ruby/library/uri/normalize_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parse_spec.rb b/spec/ruby/library/uri/parse_spec.rb
index 4aa84ae2ee..e9ec59b490 100644
--- a/spec/ruby/library/uri/parse_spec.rb
+++ b/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
 
diff --git a/spec/ruby/library/uri/parser/escape_spec.rb b/spec/ruby/library/uri/parser/escape_spec.rb
index 8682e0ebce..66853d9fcb 100644
--- a/spec/ruby/library/uri/parser/escape_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/extract_spec.rb b/spec/ruby/library/uri/parser/extract_spec.rb
index 5dac947060..20d4565b08 100644
--- a/spec/ruby/library/uri/parser/extract_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/inspect_spec.rb b/spec/ruby/library/uri/parser/inspect_spec.rb
index 2eaeeeafee..44fbd4077c 100644
--- a/spec/ruby/library/uri/parser/inspect_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/join_spec.rb b/spec/ruby/library/uri/parser/join_spec.rb
index 1800a16236..0c9230be76 100644
--- a/spec/ruby/library/uri/parser/join_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/make_regexp_spec.rb b/spec/ruby/library/uri/parser/make_regexp_spec.rb
index e27f0d14db..0631d13ee6 100644
--- a/spec/ruby/library/uri/parser/make_regexp_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/parse_spec.rb b/spec/ruby/library/uri/parser/parse_spec.rb
index 76c1970645..df126eab6d 100644
--- a/spec/ruby/library/uri/parser/parse_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/split_spec.rb b/spec/ruby/library/uri/parser/split_spec.rb
index 2eaeeeafee..44fbd4077c 100644
--- a/spec/ruby/library/uri/parser/split_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/parser/unescape_spec.rb b/spec/ruby/library/uri/parser/unescape_spec.rb
index 8ffc534226..e18d2eb9d3 100644
--- a/spec/ruby/library/uri/parser/unescape_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/plus_spec.rb b/spec/ruby/library/uri/plus_spec.rb
index 45c1aa5e57..146cfddf90 100644
--- a/spec/ruby/library/uri/plus_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/regexp_spec.rb b/spec/ruby/library/uri/regexp_spec.rb
index cf63507013..6e8b3df4d0 100644
--- a/spec/ruby/library/uri/regexp_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/route_from_spec.rb b/spec/ruby/library/uri/route_from_spec.rb
index 11a2c44f90..501f455775 100644
--- a/spec/ruby/library/uri/route_from_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/route_to_spec.rb b/spec/ruby/library/uri/route_to_spec.rb
index 2eb68afdfd..ae9d38d23d 100644
--- a/spec/ruby/library/uri/route_to_spec.rb
+++ b/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
diff --git a/spec/ruby/library/uri/select_spec.rb b/spec/ruby/library/uri/select_spec.rb
index 46474757cc..6e8c68cf40 100644
--- a/spec/ruby/library/uri/select_spec.rb
+++ b/spec/ruby/library/uri/select_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI#select" do
diff --git a/spec/ruby/library/uri/set_component_spec.rb b/spec/ruby/library/uri/set_component_spec.rb
index 9b8372108a..38da49dbd7 100644
--- a/spec/ruby/library/uri/set_component_spec.rb
+++ b/spec/ruby/library/uri/set_component_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 #TODO: make this more BDD
diff --git a/spec/ruby/library/uri/split_spec.rb b/spec/ruby/library/uri/split_spec.rb
index f0ab6ff35c..9ad37e3b1f 100644
--- a/spec/ruby/library/uri/split_spec.rb
+++ b/spec/ruby/library/uri/split_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 describe "URI.split" do
diff --git a/spec/ruby/library/uri/uri_spec.rb b/spec/ruby/library/uri/uri_spec.rb
index 90936a770f..93ba07a207 100644
--- a/spec/ruby/library/uri/uri_spec.rb
+++ b/spec/ruby/library/uri/uri_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'uri'
 
 #the testing is light here as this is an alias for URI.parse
diff --git a/spec/ruby/library/uri/util/make_components_hash_spec.rb b/spec/ruby/library/uri/util/make_components_hash_spec.rb
index 0f491112e8..6d26b81130 100644
--- a/spec/ruby/library/uri/util/make_components_hash_spec.rb
+++ b/spec/ruby/library/uri/util/make_components_hash_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Util.make_components_hash" do