Update to ruby/spec@c1b568b

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

spec/ruby/core/encoding/_dump_spec.rb

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

spec/ruby/core/encoding/_load_spec.rb

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

spec/ruby/core/encoding/aliases_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.aliases" do

spec/ruby/core/encoding/ascii_compatible_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding#ascii_compatible?" do

spec/ruby/core/encoding/compatible_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: ascii-8bit -*-
 
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   # TODO: add IO

spec/ruby/core/encoding/converter/asciicompat_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter.asciicompat_encoding" do

spec/ruby/core/encoding/converter/constants_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter::INVALID_MASK" do

spec/ruby/core/encoding/converter/convert_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#convert" do

spec/ruby/core/encoding/converter/convpath_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#convpath" do

spec/ruby/core/encoding/converter/destination_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#destination_encoding" do

spec/ruby/core/encoding/converter/finish_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#finish" do

spec/ruby/core/encoding/converter/insert_output_spec.rb

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

spec/ruby/core/encoding/converter/inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Encoding::Converter#inspect" do
   it "includes the source and destination encodings in the return value" do

spec/ruby/core/encoding/converter/last_error_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#last_error" do

spec/ruby/core/encoding/converter/new_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: ascii-8bit -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter.new" do

spec/ruby/core/encoding/converter/primitive_convert_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#primitive_convert" do

spec/ruby/core/encoding/converter/primitive_errinfo_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#primitive_errinfo" do

spec/ruby/core/encoding/converter/putback_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#putback" do

spec/ruby/core/encoding/converter/replacement_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#replacement" do

spec/ruby/core/encoding/converter/search_convpath_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter.search_convpath" do

spec/ruby/core/encoding/converter/source_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::Converter#source_encoding" do

spec/ruby/core/encoding/default_external_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.default_external" do

spec/ruby/core/encoding/default_internal_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.default_internal" do

spec/ruby/core/encoding/dummy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding#dummy?" do

spec/ruby/core/encoding/find_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.find" do

spec/ruby/core/encoding/inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding#inspect" do

spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_name_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#destination_encoding_name" do

spec/ruby/core/encoding/invalid_byte_sequence_error/destination_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#destination_encoding" do

spec/ruby/core/encoding/invalid_byte_sequence_error/error_bytes_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#error_bytes" do

spec/ruby/core/encoding/invalid_byte_sequence_error/incomplete_input_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#incomplete_input?" do

spec/ruby/core/encoding/invalid_byte_sequence_error/readagain_bytes_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#readagain_bytes" do

spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_name_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#source_encoding_name" do

spec/ruby/core/encoding/invalid_byte_sequence_error/source_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::InvalidByteSequenceError#source_encoding" do

spec/ruby/core/encoding/list_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.list" do

spec/ruby/core/encoding/locale_charmap_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.locale_charmap" do

spec/ruby/core/encoding/name_list_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding.name_list" do

spec/ruby/core/encoding/name_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../shared/name', __FILE__)
+require_relative 'shared/name'
 
 with_feature :encoding do
   describe "Encoding#name" do

spec/ruby/core/encoding/names_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding#names" do

spec/ruby/core/encoding/replicate_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: binary -*-
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 with_feature :encoding do
   describe "Encoding#replicate" do

spec/ruby/core/encoding/shared/name.rb

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

spec/ruby/core/encoding/to_s_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../shared/name', __FILE__)
+require_relative 'shared/name'
 
 with_feature :encoding do
   describe "Encoding#to_s" do

spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_name_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#destination_encoding_name" do

spec/ruby/core/encoding/undefined_conversion_error/destination_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#destination_encoding" do

spec/ruby/core/encoding/undefined_conversion_error/error_char_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#error_char" do

spec/ruby/core/encoding/undefined_conversion_error/source_encoding_name_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#source_encoding_name" do

spec/ruby/core/encoding/undefined_conversion_error/source_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../fixtures/classes'
 
 with_feature :encoding do
   describe "Encoding::UndefinedConversionError#source_encoding" do