Update to ruby/spec@c1b568b

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

spec/ruby/shared/basicobject/method_missing.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../fixtures/basicobject/method_missing', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../fixtures/basicobject/method_missing'
 
 describe :method_missing_defined_module, shared: true do
   describe "for a Module with #method_missing defined" do

spec/ruby/shared/complex/Complex.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :kernel_Complex, shared: true do
   describe "when passed [Complex, Complex]" do

spec/ruby/shared/complex/abs.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_abs, shared: true do
   it "returns the modulus: |a + bi| = sqrt((a ^ 2) + (b ^ 2))" do

spec/ruby/shared/complex/abs2.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_abs2, shared: true do
   it "returns the sum of the squares of the real and imaginary parts" do

spec/ruby/shared/complex/coerce.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_coerce, shared: true do
   before :each do

spec/ruby/shared/complex/constants.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_I, shared: true do
   it "is Complex(0, 1)" do

spec/ruby/shared/complex/denominator.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_denominator, shared: true do
   it "returns the least common multiple denominator of the real and imaginary parts" do

spec/ruby/shared/complex/divide.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_divide, shared: true do
   describe "with Complex" do

spec/ruby/shared/complex/equal_value.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_equal_value, shared: true do
   describe "with Complex" do

spec/ruby/shared/complex/exponent.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_exponent, shared: true do
   describe "with Fixnum 0" do

spec/ruby/shared/complex/float/arg.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :float_arg, shared: true do
   it "returns NaN if NaN" do

spec/ruby/shared/complex/image.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_image, shared: true do
   it "returns the imaginary part of self" do

spec/ruby/shared/complex/minus.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_minus, shared: true do
   describe "with Complex" do

spec/ruby/shared/complex/multiply.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_multiply, shared: true do
   describe "with Complex" do

spec/ruby/shared/complex/numerator.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_numerator, shared: true do
   it "returns self's numerator" do

spec/ruby/shared/complex/numeric/arg.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :numeric_arg, shared: true do
   before :each do

spec/ruby/shared/complex/numeric/conj.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :numeric_conj, shared: true do
   before :each do

spec/ruby/shared/complex/numeric/imag.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :numeric_imag, shared: true do
   before :each do

spec/ruby/shared/complex/numeric/polar.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :numeric_polar, shared: true do
   before :each do

spec/ruby/shared/complex/numeric/real.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe :numeric_real, shared: true do
   before :each do

spec/ruby/shared/complex/plus.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_plus, shared: true do
   describe "with Complex" do

spec/ruby/shared/complex/polar.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_polar_class, shared: true do
   it "returns a complex number in terms of radius and angle" do

spec/ruby/shared/complex/rect.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_rect, shared: true do
   before :each do

spec/ruby/shared/complex/to_s.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :complex_to_s, shared: true do
   describe "when self's real component is 0" do

spec/ruby/shared/enumerator/enum_cons.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../fixtures/enumerator/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../fixtures/enumerator/classes'
 
 describe :enum_cons, shared: true do
   it "returns an enumerator of the receiver with iteration of each_cons for each array of n concecutive elements" do

spec/ruby/shared/enumerator/new.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :enum_new, shared: true do
   it "creates a new custom enumerator with the given object, iterator and arguments" do

spec/ruby/shared/enumerator/next.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :enum_next, shared: true do
 

spec/ruby/shared/enumerator/rewind.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :enum_rewind, shared: true do
 

spec/ruby/shared/enumerator/with_index.rb

@@ -1,8 +1,8 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :enum_with_index, shared: true do
 
-  require File.expand_path('../../../fixtures/enumerator/classes', __FILE__)
+  require_relative '../../fixtures/enumerator/classes'
 
   before :each do
     @enum = [1, 2, 3, 4].to_enum

spec/ruby/shared/enumerator/with_object.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :enum_with_object, shared: true do
   before :each do

spec/ruby/shared/file/world_readable.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :file_world_readable, shared: true do
 

spec/ruby/shared/file/world_writable.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :file_world_writable, shared: true do
 

spec/ruby/shared/rational/Rational.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../fixtures/rational', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../fixtures/rational'
 
 describe :kernel_Rational, shared: true do
   describe "passed Integer" do

spec/ruby/shared/rational/abs.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_abs, shared: true do
   it "returns self's absolute value" do

spec/ruby/shared/rational/arithmetic_exception_in_coerce.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../fixtures/rational', __FILE__)
+require_relative '../../fixtures/rational'
 
 describe :rational_arithmetic_exception_in_coerce, shared: true do
   ruby_version_is ""..."2.5" do

spec/ruby/shared/rational/ceil.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_ceil, shared: true do
   before do

spec/ruby/shared/rational/coerce.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_coerce, shared: true do
   it "returns the passed argument, self as Float, when given a Float" do

spec/ruby/shared/rational/comparison.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../fixtures/rational', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../fixtures/rational'
 
 describe :rational_cmp_rat, shared: true do
   it "returns 1 when self is greater than the passed argument" do

spec/ruby/shared/rational/denominator.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_denominator, shared: true do
   it "returns the denominator" do

spec/ruby/shared/rational/div.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_div_rat, shared: true do
   it "performs integer division and returns the result" do

spec/ruby/shared/rational/divide.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_divide_rat, shared: true do
   it "returns self divided by other as a Rational" do

spec/ruby/shared/rational/divmod.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_divmod_rat, shared: true do
   it "returns the quotient as Integer and the remainder as Rational" do

spec/ruby/shared/rational/equal_value.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_equal_value_rat, shared: true do
   it "returns true if self has the same numerator and denominator as the passed argument" do

spec/ruby/shared/rational/exponent.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_exponent, shared: true do
   describe "when passed Rational" do

spec/ruby/shared/rational/fdiv.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_fdiv, shared: true do
   it "needs to be reviewed for spec completeness"

spec/ruby/shared/rational/floor.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_floor, shared: true do
   before do

spec/ruby/shared/rational/hash.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_hash, shared: true do
   # BUG: Rational(2, 3).hash == Rational(3, 2).hash

spec/ruby/shared/rational/inspect.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_inspect, shared: true do
   conflicts_with :Prime do

spec/ruby/shared/rational/marshal_dump.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_marshal_dump, shared: true do
   it "needs to be reviewed for spec completeness"

spec/ruby/shared/rational/marshal_load.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_marshal_load, shared: true do
   it "needs to be reviewed for spec completeness"

spec/ruby/shared/rational/minus.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_minus_rat, shared: true do
   it "returns the result of subtracting other from self as a Rational" do

spec/ruby/shared/rational/modulo.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_modulo, shared: true do
   it "returns the remainder when this value is divided by other" do

spec/ruby/shared/rational/multiply.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_multiply_rat, shared: true do
   it "returns self divided by other as a Rational" do

spec/ruby/shared/rational/numerator.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_numerator, shared: true do
   it "returns the numerator" do

spec/ruby/shared/rational/plus.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_plus_rat, shared: true do
   it "returns the result of subtracting other from self as a Rational" do

spec/ruby/shared/rational/quo.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_quo, shared: true do
   it "needs to be reviewed for spec completeness"

spec/ruby/shared/rational/remainder.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_remainder, shared: true do
   it "needs to be reviewed for spec completeness"

spec/ruby/shared/rational/round.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_round, shared: true do
   before do

spec/ruby/shared/rational/to_f.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_to_f, shared: true do
   it "returns self converted to a Float" do

spec/ruby/shared/rational/to_i.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_to_i, shared: true do
   it "converts self to an Integer by truncation" do

spec/ruby/shared/rational/to_r.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_to_r, shared: true do
   conflicts_with :Prime do

spec/ruby/shared/rational/to_s.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_to_s, shared: true do
   it "returns a string representation of self" do

spec/ruby/shared/rational/truncate.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe :rational_truncate, shared: true do
   before do