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/enumerator/each_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../shared/enumerator/each', __FILE__)
+require_relative '../../shared/enumerator/each'
 
 describe "Enumerator#each" do
   it_behaves_like :enum_each, :each

spec/ruby/core/enumerator/each_with_index_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
-require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/with_index'
+require_relative '../enumerable/shared/enumeratorized'
 
 describe "Enumerator#each_with_index" do
   it_behaves_like :enum_with_index, :each_with_index

spec/ruby/core/enumerator/each_with_object_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/with_object', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/with_object'
 
 describe "Enumerator#each_with_object" do
   it_behaves_like :enum_with_object, :each_with_object

spec/ruby/core/enumerator/enum_for_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/enum_for'
 
 describe "Enumerator#enum_for" do
   it_behaves_like :enum_for, :enum_for

spec/ruby/core/enumerator/enumerator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator" do
   it "includes Enumerable" do

spec/ruby/core/enumerator/feed_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/common', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/common'
 
 describe "Enumerator#feed" do
   before :each do

spec/ruby/core/enumerator/first_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#first" do
   it "returns arrays correctly when calling #first (2376)" do

spec/ruby/core/enumerator/generator/each_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Generator#each" do
   before :each do

spec/ruby/core/enumerator/generator/initialize_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Generator#initialize" do
   before :each do

spec/ruby/core/enumerator/initialize_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#initialize" do
   before :each do

spec/ruby/core/enumerator/inject_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../shared/enumerator/each', __FILE__)
+require_relative '../../shared/enumerator/each'
 
 describe "Enumerator#inject" do
   it_behaves_like :enum_each, :each

spec/ruby/core/enumerator/inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#inspect" do
   describe "shows a representation of the Enumerator" do

spec/ruby/core/enumerator/lazy/chunk_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#chunk" do
 

spec/ruby/core/enumerator/lazy/collect_concat_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/collect_concat', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/collect_concat'
 
 describe "Enumerator::Lazy#collect_concat" do
   it_behaves_like :enumerator_lazy_collect_concat, :collect_concat

spec/ruby/core/enumerator/lazy/collect_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/collect', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/collect'
 
 describe "Enumerator::Lazy#collect" do
   it_behaves_like :enumerator_lazy_collect, :collect

spec/ruby/core/enumerator/lazy/drop_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#drop" do
   before :each do

spec/ruby/core/enumerator/lazy/drop_while_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#drop_while" do
   before :each do

spec/ruby/core/enumerator/lazy/enum_for_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/to_enum', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/to_enum'
 
 describe "Enumerator::Lazy#enum_for" do
   it_behaves_like :enumerator_lazy_to_enum, :enum_for

spec/ruby/core/enumerator/lazy/find_all_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/select', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/select'
 
 describe "Enumerator::Lazy#find_all" do
   it_behaves_like :enumerator_lazy_select, :find_all

spec/ruby/core/enumerator/lazy/flat_map_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/collect_concat', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/collect_concat'
 
 describe "Enumerator::Lazy#flat_map" do
   it_behaves_like :enumerator_lazy_collect_concat, :flat_map

spec/ruby/core/enumerator/lazy/force_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#force" do
   before :each do

spec/ruby/core/enumerator/lazy/grep_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#grep" do
   before :each do

spec/ruby/core/enumerator/lazy/grep_v_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'
 
 ruby_version_is "2.3" do
   describe "Enumerator::Lazy#grep_v" do

spec/ruby/core/enumerator/lazy/initialize_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Lazy#initialize" do
   before :each do

spec/ruby/core/enumerator/lazy/lazy_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Lazy" do
   it "is a subclass of Enumerator" do

spec/ruby/core/enumerator/lazy/map_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/collect', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/collect'
 
 describe "Enumerator::Lazy#map" do
   it_behaves_like :enumerator_lazy_collect, :map

spec/ruby/core/enumerator/lazy/reject_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#reject" do
   before :each do

spec/ruby/core/enumerator/lazy/select_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/select', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/select'
 
 describe "Enumerator::Lazy#select" do
   it_behaves_like :enumerator_lazy_select, :select

spec/ruby/core/enumerator/lazy/shared/collect.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../../../../spec_helper'
+require_relative '../fixtures/classes'
 
 describe :enumerator_lazy_collect, shared: true do
   before :each do

spec/ruby/core/enumerator/lazy/shared/collect_concat.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../../../../spec_helper'
+require_relative '../fixtures/classes'
 
 describe :enumerator_lazy_collect_concat, shared: true do
   before :each do

spec/ruby/core/enumerator/lazy/shared/select.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
+require_relative '../../../../spec_helper'
+require_relative '../fixtures/classes'
 
 describe :enumerator_lazy_select, shared: true do
   before :each do

spec/ruby/core/enumerator/lazy/shared/to_enum.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../../spec_helper', __FILE__)
+require_relative '../../../../spec_helper'
 
 describe :enumerator_lazy_to_enum, shared: true do
   before :each do

spec/ruby/core/enumerator/lazy/take_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#take" do
   before :each do

spec/ruby/core/enumerator/lazy/take_while_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#take_while" do
   before :each do

spec/ruby/core/enumerator/lazy/to_enum_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../shared/to_enum', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'shared/to_enum'
 
 describe "Enumerator::Lazy#to_enum" do
   it_behaves_like :enumerator_lazy_to_enum, :to_enum

spec/ruby/core/enumerator/lazy/uniq_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'
 
 ruby_version_is '2.4' do
   describe 'Enumerator::Lazy#uniq' do

spec/ruby/core/enumerator/lazy/zip_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "Enumerator::Lazy#zip" do
   before :each do

spec/ruby/core/enumerator/new_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/new', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/new'
 
 describe "Enumerator.new" do
   it_behaves_like :enum_new, :new

spec/ruby/core/enumerator/next_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/next', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/next'
 
 describe "Enumerator#next" do
   it_behaves_like :enum_next,:next

spec/ruby/core/enumerator/next_values_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#next_values" do
   before :each do

spec/ruby/core/enumerator/peek_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#peek" do
   before :each do

spec/ruby/core/enumerator/peek_values_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#peek_values" do
   before :each do

spec/ruby/core/enumerator/rewind_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/rewind', __FILE__)
-require File.expand_path('../fixtures/common', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/rewind'
+require_relative 'fixtures/common'
 
 describe "Enumerator#rewind" do
   it_behaves_like :enum_rewind, :rewind

spec/ruby/core/enumerator/size_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Enumerator#size" do
   it "returns same value if set size is an Integer" do

spec/ruby/core/enumerator/to_enum_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/enum_for', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/enum_for'
 
 describe "Enumerator#to_enum" do
   it_behaves_like :enum_for, :enum_for

spec/ruby/core/enumerator/with_index_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/with_index', __FILE__)
-require File.expand_path('../../enumerable/shared/enumeratorized', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/with_index'
+require_relative '../enumerable/shared/enumeratorized'
 
 describe "Enumerator#with_index" do
   it_behaves_like :enum_with_index, :with_index

spec/ruby/core/enumerator/with_object_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../../../shared/enumerator/with_object', __FILE__)
+require_relative '../../spec_helper'
+require_relative '../../shared/enumerator/with_object'
 
 describe "Enumerator#with_object" do
   it_behaves_like :enum_with_object, :with_object

spec/ruby/core/enumerator/yielder/append_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Yielder#<<" do
   # TODO: There's some common behavior between yield and <<; move to a shared spec

spec/ruby/core/enumerator/yielder/initialize_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Yielder#initialize" do
   before :each do

spec/ruby/core/enumerator/yielder/yield_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 
 describe "Enumerator::Yielder#yield" do
   it "yields the value to the block" do