Update to ruby/spec@c1b568b

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

15 files changed, 31 insertions, 31 deletions

diff --git a/spec/ruby/library/thread/sizedqueue/append_spec.rb b/spec/ruby/library/thread/sizedqueue/append_spec.rb
index 2799472767..daf65178de 100644
--- a/spec/ruby/library/thread/sizedqueue/append_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/append_spec.rb
@@ -1,7 +1,7 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/enque', __FILE__)
-require File.expand_path('../shared/enque', __FILE__)
+require_relative '../shared/queue/enque'
+require_relative 'shared/enque'
 
 describe "Thread::SizedQueue#<<" do
   it_behaves_like :queue_enq, :<<, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/clear_spec.rb b/spec/ruby/library/thread/sizedqueue/clear_spec.rb
index 7dc328803a..86e16f275e 100644
--- a/spec/ruby/library/thread/sizedqueue/clear_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/clear_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/clear', __FILE__)
+require_relative '../shared/queue/clear'
 
 describe "Thread::SizedQueue#clear" do
   it_behaves_like :queue_clear, :clear, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/close_spec.rb b/spec/ruby/library/thread/sizedqueue/close_spec.rb
index 465b9ea091..79ba87c127 100644
--- a/spec/ruby/library/thread/sizedqueue/close_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/close_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/close', __FILE__)
+require_relative '../shared/queue/close'
 
 ruby_version_is "2.3" do
   describe "SizedQueue#close" do
diff --git a/spec/ruby/library/thread/sizedqueue/closed_spec.rb b/spec/ruby/library/thread/sizedqueue/closed_spec.rb
index 9ec72c1aa7..1cc68078c0 100644
--- a/spec/ruby/library/thread/sizedqueue/closed_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/closed_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/closed', __FILE__)
+require_relative '../shared/queue/closed'
 
 ruby_version_is "2.3" do
   describe "SizedQueue#closed?" do
diff --git a/spec/ruby/library/thread/sizedqueue/deq_spec.rb b/spec/ruby/library/thread/sizedqueue/deq_spec.rb
index cc11319d22..0ed42cba91 100644
--- a/spec/ruby/library/thread/sizedqueue/deq_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/deq_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/deque', __FILE__)
+require_relative '../shared/queue/deque'
 
 describe "Thread::SizedQueue#deq" do
   it_behaves_like :queue_deq, :deq, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/empty_spec.rb b/spec/ruby/library/thread/sizedqueue/empty_spec.rb
index 368bb00d5f..d44ea405d5 100644
--- a/spec/ruby/library/thread/sizedqueue/empty_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/empty_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/empty', __FILE__)
+require_relative '../shared/queue/empty'
 
 describe "Thread::SizedQueue#empty?" do
   it_behaves_like :queue_empty?, :empty?, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/enq_spec.rb b/spec/ruby/library/thread/sizedqueue/enq_spec.rb
index a0be7bbf05..b81fd2b225 100644
--- a/spec/ruby/library/thread/sizedqueue/enq_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/enq_spec.rb
@@ -1,7 +1,7 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/enque', __FILE__)
-require File.expand_path('../shared/enque', __FILE__)
+require_relative '../shared/queue/enque'
+require_relative 'shared/enque'
 
 describe "Thread::SizedQueue#enq" do
   it_behaves_like :queue_enq, :enq, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/length_spec.rb b/spec/ruby/library/thread/sizedqueue/length_spec.rb
index c292883a8e..e15db85f82 100644
--- a/spec/ruby/library/thread/sizedqueue/length_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/length_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/length', __FILE__)
+require_relative '../shared/queue/length'
 
 describe "Thread::SizedQueue#length" do
   it_behaves_like :queue_length, :length, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/max_spec.rb b/spec/ruby/library/thread/sizedqueue/max_spec.rb
index 54cc6351bd..75b1957e86 100644
--- a/spec/ruby/library/thread/sizedqueue/max_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/max_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
 
 describe "Thread::SizedQueue#max" do
diff --git a/spec/ruby/library/thread/sizedqueue/new_spec.rb b/spec/ruby/library/thread/sizedqueue/new_spec.rb
index a36aa5ed18..364e10f694 100644
--- a/spec/ruby/library/thread/sizedqueue/new_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/new_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
 
 describe "Thread::SizedQueue#new" do
diff --git a/spec/ruby/library/thread/sizedqueue/num_waiting_spec.rb b/spec/ruby/library/thread/sizedqueue/num_waiting_spec.rb
index 2ce53875cc..7c5243250d 100644
--- a/spec/ruby/library/thread/sizedqueue/num_waiting_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/num_waiting_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/num_waiting', __FILE__)
+require_relative '../shared/queue/num_waiting'
 
 describe "Thread::SizedQueue#num_waiting" do
   it_behaves_like :queue_num_waiting, :num_waiting, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/pop_spec.rb b/spec/ruby/library/thread/sizedqueue/pop_spec.rb
index a83ea6406a..21508bd26b 100644
--- a/spec/ruby/library/thread/sizedqueue/pop_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/pop_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/deque', __FILE__)
+require_relative '../shared/queue/deque'
 
 describe "Thread::SizedQueue#pop" do
   it_behaves_like :queue_deq, :pop, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/push_spec.rb b/spec/ruby/library/thread/sizedqueue/push_spec.rb
index 6021a043c9..aefe6eb28a 100644
--- a/spec/ruby/library/thread/sizedqueue/push_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/push_spec.rb
@@ -1,7 +1,7 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/enque', __FILE__)
-require File.expand_path('../shared/enque', __FILE__)
+require_relative '../shared/queue/enque'
+require_relative 'shared/enque'
 
 describe "Thread::SizedQueue#push" do
   it_behaves_like :queue_enq, :push, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/shift_spec.rb b/spec/ruby/library/thread/sizedqueue/shift_spec.rb
index 89345718df..6c2adfce9d 100644
--- a/spec/ruby/library/thread/sizedqueue/shift_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/shift_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/deque', __FILE__)
+require_relative '../shared/queue/deque'
 
 describe "Thread::SizedQueue#shift" do
   it_behaves_like :queue_deq, :shift, -> { SizedQueue.new(10) }
diff --git a/spec/ruby/library/thread/sizedqueue/size_spec.rb b/spec/ruby/library/thread/sizedqueue/size_spec.rb
index 7ab72d91b1..1bacef1eb1 100644
--- a/spec/ruby/library/thread/sizedqueue/size_spec.rb
+++ b/spec/ruby/library/thread/sizedqueue/size_spec.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
+require_relative '../../../spec_helper'
 require 'thread'
-require File.expand_path('../../shared/queue/length', __FILE__)
+require_relative '../shared/queue/length'
 
 describe "Thread::SizedQueue#size" do
   it_behaves_like :queue_length, :size, -> { SizedQueue.new(10) }