From 401b64c4e840bc8887219e9e445a64b3d5943656 Mon Sep 17 00:00:00 2001 From: eregon Date: Sun, 4 Mar 2018 15:09:32 +0000 Subject: 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/thread/abort_on_exception_spec.rb | 4 ++-- spec/ruby/core/thread/add_trace_func_spec.rb | 2 +- spec/ruby/core/thread/alive_spec.rb | 4 ++-- spec/ruby/core/thread/allocate_spec.rb | 2 +- spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/base_label_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/inspect_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/label_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/lineno_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/path_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace/location/to_s_spec.rb | 4 ++-- spec/ruby/core/thread/backtrace_spec.rb | 2 +- spec/ruby/core/thread/current_spec.rb | 4 ++-- spec/ruby/core/thread/element_reference_spec.rb | 4 ++-- spec/ruby/core/thread/element_set_spec.rb | 4 ++-- spec/ruby/core/thread/exclusive_spec.rb | 2 +- spec/ruby/core/thread/exit_spec.rb | 6 +++--- spec/ruby/core/thread/fetch_spec.rb | 2 +- spec/ruby/core/thread/fork_spec.rb | 6 +++--- spec/ruby/core/thread/group_spec.rb | 4 ++-- spec/ruby/core/thread/initialize_spec.rb | 4 ++-- spec/ruby/core/thread/inspect_spec.rb | 4 ++-- spec/ruby/core/thread/join_spec.rb | 4 ++-- spec/ruby/core/thread/key_spec.rb | 4 ++-- spec/ruby/core/thread/keys_spec.rb | 4 ++-- spec/ruby/core/thread/kill_spec.rb | 6 +++--- spec/ruby/core/thread/list_spec.rb | 4 ++-- spec/ruby/core/thread/main_spec.rb | 4 ++-- spec/ruby/core/thread/name_spec.rb | 2 +- spec/ruby/core/thread/new_spec.rb | 4 ++-- spec/ruby/core/thread/pass_spec.rb | 4 ++-- spec/ruby/core/thread/priority_spec.rb | 4 ++-- spec/ruby/core/thread/raise_spec.rb | 6 +++--- spec/ruby/core/thread/report_on_exception_spec.rb | 2 +- spec/ruby/core/thread/run_spec.rb | 6 +++--- spec/ruby/core/thread/set_trace_func_spec.rb | 2 +- spec/ruby/core/thread/start_spec.rb | 6 +++--- spec/ruby/core/thread/status_spec.rb | 4 ++-- spec/ruby/core/thread/stop_spec.rb | 4 ++-- spec/ruby/core/thread/terminate_spec.rb | 6 +++--- spec/ruby/core/thread/thread_variable_get_spec.rb | 2 +- spec/ruby/core/thread/thread_variable_set_spec.rb | 2 +- spec/ruby/core/thread/thread_variable_spec.rb | 2 +- spec/ruby/core/thread/thread_variables_spec.rb | 2 +- spec/ruby/core/thread/value_spec.rb | 4 ++-- spec/ruby/core/thread/wakeup_spec.rb | 6 +++--- 46 files changed, 88 insertions(+), 88 deletions(-) (limited to 'spec/ruby/core/thread') diff --git a/spec/ruby/core/thread/abort_on_exception_spec.rb b/spec/ruby/core/thread/abort_on_exception_spec.rb index e424b2fd26..88de77b1a8 100644 --- a/spec/ruby/core/thread/abort_on_exception_spec.rb +++ b/spec/ruby/core/thread/abort_on_exception_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 "Thread#abort_on_exception" do before do diff --git a/spec/ruby/core/thread/add_trace_func_spec.rb b/spec/ruby/core/thread/add_trace_func_spec.rb index c2010ef317..0abae81a78 100644 --- a/spec/ruby/core/thread/add_trace_func_spec.rb +++ b/spec/ruby/core/thread/add_trace_func_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#add_trace_func" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/thread/alive_spec.rb b/spec/ruby/core/thread/alive_spec.rb index c1459ac693..d4ba149d87 100644 --- a/spec/ruby/core/thread/alive_spec.rb +++ b/spec/ruby/core/thread/alive_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 "Thread#alive?" do it "can check it's own status" do diff --git a/spec/ruby/core/thread/allocate_spec.rb b/spec/ruby/core/thread/allocate_spec.rb index 1db05878ba..cd9aa1ee43 100644 --- a/spec/ruby/core/thread/allocate_spec.rb +++ b/spec/ruby/core/thread/allocate_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread.allocate" do it "raises a TypeError" do diff --git a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb b/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb index 6810bdcd78..aeae6b77c6 100644 --- a/spec/ruby/core/thread/backtrace/location/absolute_path_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/absolute_path_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 'Thread::Backtrace::Location#absolute_path' do before :each do diff --git a/spec/ruby/core/thread/backtrace/location/base_label_spec.rb b/spec/ruby/core/thread/backtrace/location/base_label_spec.rb index cba7e3f34c..d7302c26be 100644 --- a/spec/ruby/core/thread/backtrace/location/base_label_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/base_label_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 'Thread::Backtrace::Location#base_label' do before :each do diff --git a/spec/ruby/core/thread/backtrace/location/inspect_spec.rb b/spec/ruby/core/thread/backtrace/location/inspect_spec.rb index 56d440c04a..20e477a5a6 100644 --- a/spec/ruby/core/thread/backtrace/location/inspect_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/inspect_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 'Thread::Backtrace::Location#inspect' do before :each do diff --git a/spec/ruby/core/thread/backtrace/location/label_spec.rb b/spec/ruby/core/thread/backtrace/location/label_spec.rb index 4e67509d0f..be8da5646f 100644 --- a/spec/ruby/core/thread/backtrace/location/label_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/label_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 'Thread::Backtrace::Location#label' do it 'returns the base label of the call frame' do diff --git a/spec/ruby/core/thread/backtrace/location/lineno_spec.rb b/spec/ruby/core/thread/backtrace/location/lineno_spec.rb index 7d203008e5..dc93d32d75 100644 --- a/spec/ruby/core/thread/backtrace/location/lineno_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/lineno_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 'Thread::Backtrace::Location#lineno' do before :each do diff --git a/spec/ruby/core/thread/backtrace/location/path_spec.rb b/spec/ruby/core/thread/backtrace/location/path_spec.rb index c2f2058990..e493dee8d0 100644 --- a/spec/ruby/core/thread/backtrace/location/path_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/path_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 'Thread::Backtrace::Location#path' do context 'outside a main script' do diff --git a/spec/ruby/core/thread/backtrace/location/to_s_spec.rb b/spec/ruby/core/thread/backtrace/location/to_s_spec.rb index 486d7da4c9..5911cdced0 100644 --- a/spec/ruby/core/thread/backtrace/location/to_s_spec.rb +++ b/spec/ruby/core/thread/backtrace/location/to_s_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 'Thread::Backtrace::Location#to_s' do before :each do diff --git a/spec/ruby/core/thread/backtrace_spec.rb b/spec/ruby/core/thread/backtrace_spec.rb index 532d7a8f4e..84ed574d5c 100644 --- a/spec/ruby/core/thread/backtrace_spec.rb +++ b/spec/ruby/core/thread/backtrace_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#backtrace" do it "returns the current backtrace of a thread" do diff --git a/spec/ruby/core/thread/current_spec.rb b/spec/ruby/core/thread/current_spec.rb index 6c4dcfae43..f5ed1d95cd 100644 --- a/spec/ruby/core/thread/current_spec.rb +++ b/spec/ruby/core/thread/current_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 "Thread.current" do it "returns a thread" do diff --git a/spec/ruby/core/thread/element_reference_spec.rb b/spec/ruby/core/thread/element_reference_spec.rb index 81b11d2c09..4de33e1456 100644 --- a/spec/ruby/core/thread/element_reference_spec.rb +++ b/spec/ruby/core/thread/element_reference_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 "Thread#[]" do it "gives access to thread local values" do diff --git a/spec/ruby/core/thread/element_set_spec.rb b/spec/ruby/core/thread/element_set_spec.rb index 097f8def13..c109468a5e 100644 --- a/spec/ruby/core/thread/element_set_spec.rb +++ b/spec/ruby/core/thread/element_set_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 "Thread#[]=" do after :each do diff --git a/spec/ruby/core/thread/exclusive_spec.rb b/spec/ruby/core/thread/exclusive_spec.rb index 66c87f4713..522a43cac5 100644 --- a/spec/ruby/core/thread/exclusive_spec.rb +++ b/spec/ruby/core/thread/exclusive_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread.exclusive" do before :each do diff --git a/spec/ruby/core/thread/exit_spec.rb b/spec/ruby/core/thread/exit_spec.rb index 0fb329e66f..c3f710920e 100644 --- a/spec/ruby/core/thread/exit_spec.rb +++ b/spec/ruby/core/thread/exit_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/exit', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/exit' describe "Thread#exit!" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/thread/fetch_spec.rb b/spec/ruby/core/thread/fetch_spec.rb index 33ac3e0433..d71c938880 100644 --- a/spec/ruby/core/thread/fetch_spec.rb +++ b/spec/ruby/core/thread/fetch_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' ruby_version_is '2.5' do describe 'Thread#fetch' do diff --git a/spec/ruby/core/thread/fork_spec.rb b/spec/ruby/core/thread/fork_spec.rb index d321230812..a2f4181298 100644 --- a/spec/ruby/core/thread/fork_spec.rb +++ b/spec/ruby/core/thread/fork_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/start', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/start' describe "Thread.fork" do describe "Thread.start" do diff --git a/spec/ruby/core/thread/group_spec.rb b/spec/ruby/core/thread/group_spec.rb index aecc1422ba..59f5ac37c8 100644 --- a/spec/ruby/core/thread/group_spec.rb +++ b/spec/ruby/core/thread/group_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 "Thread#group" do it "needs to be reviewed for spec completeness" end diff --git a/spec/ruby/core/thread/initialize_spec.rb b/spec/ruby/core/thread/initialize_spec.rb index b6345f03de..80e058a120 100644 --- a/spec/ruby/core/thread/initialize_spec.rb +++ b/spec/ruby/core/thread/initialize_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 "Thread#initialize" do diff --git a/spec/ruby/core/thread/inspect_spec.rb b/spec/ruby/core/thread/inspect_spec.rb index 95e598eb6a..4c635b7aaa 100644 --- a/spec/ruby/core/thread/inspect_spec.rb +++ b/spec/ruby/core/thread/inspect_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 "Thread#inspect" do it "can check it's own status" do diff --git a/spec/ruby/core/thread/join_spec.rb b/spec/ruby/core/thread/join_spec.rb index 249b3d333e..f60f91e436 100644 --- a/spec/ruby/core/thread/join_spec.rb +++ b/spec/ruby/core/thread/join_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 "Thread#join" do it "returns the thread when it is finished" do diff --git a/spec/ruby/core/thread/key_spec.rb b/spec/ruby/core/thread/key_spec.rb index d82a21ab39..c4ed0f9c0d 100644 --- a/spec/ruby/core/thread/key_spec.rb +++ b/spec/ruby/core/thread/key_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 "Thread#key?" do before :each do diff --git a/spec/ruby/core/thread/keys_spec.rb b/spec/ruby/core/thread/keys_spec.rb index 0fc8184e06..15efda51d6 100644 --- a/spec/ruby/core/thread/keys_spec.rb +++ b/spec/ruby/core/thread/keys_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 "Thread#keys" do it "returns an array of the names of the thread-local variables as symbols" do diff --git a/spec/ruby/core/thread/kill_spec.rb b/spec/ruby/core/thread/kill_spec.rb index cf71307af5..2c58475f8f 100644 --- a/spec/ruby/core/thread/kill_spec.rb +++ b/spec/ruby/core/thread/kill_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/exit', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/exit' describe "Thread#kill" do it_behaves_like :thread_exit, :kill diff --git a/spec/ruby/core/thread/list_spec.rb b/spec/ruby/core/thread/list_spec.rb index b8deb98260..bd56cb4c52 100644 --- a/spec/ruby/core/thread/list_spec.rb +++ b/spec/ruby/core/thread/list_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 "Thread.list" do it "includes the current and main thread" do diff --git a/spec/ruby/core/thread/main_spec.rb b/spec/ruby/core/thread/main_spec.rb index 0cada8f59d..ec91709576 100644 --- a/spec/ruby/core/thread/main_spec.rb +++ b/spec/ruby/core/thread/main_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 "Thread.main" do it "returns the main thread" do diff --git a/spec/ruby/core/thread/name_spec.rb b/spec/ruby/core/thread/name_spec.rb index 0417d7a500..503a909158 100644 --- a/spec/ruby/core/thread/name_spec.rb +++ b/spec/ruby/core/thread/name_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' ruby_version_is '2.3' do describe "Thread#name" do diff --git a/spec/ruby/core/thread/new_spec.rb b/spec/ruby/core/thread/new_spec.rb index b1ed5560a1..c1e0e2a5ad 100644 --- a/spec/ruby/core/thread/new_spec.rb +++ b/spec/ruby/core/thread/new_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 "Thread.new" do it "creates a thread executing the given block" do diff --git a/spec/ruby/core/thread/pass_spec.rb b/spec/ruby/core/thread/pass_spec.rb index 128de934ac..a5ac11a58c 100644 --- a/spec/ruby/core/thread/pass_spec.rb +++ b/spec/ruby/core/thread/pass_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 "Thread.pass" do it "returns nil" do diff --git a/spec/ruby/core/thread/priority_spec.rb b/spec/ruby/core/thread/priority_spec.rb index 40022da80d..5da6216b53 100644 --- a/spec/ruby/core/thread/priority_spec.rb +++ b/spec/ruby/core/thread/priority_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 "Thread#priority" do before :each do diff --git a/spec/ruby/core/thread/raise_spec.rb b/spec/ruby/core/thread/raise_spec.rb index 8724d26202..f5dd18b7e5 100644 --- a/spec/ruby/core/thread/raise_spec.rb +++ b/spec/ruby/core/thread/raise_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/kernel/raise', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative '../../shared/kernel/raise' describe "Thread#raise" do it "ignores dead threads" do diff --git a/spec/ruby/core/thread/report_on_exception_spec.rb b/spec/ruby/core/thread/report_on_exception_spec.rb index d8400c080a..16597f3a4b 100644 --- a/spec/ruby/core/thread/report_on_exception_spec.rb +++ b/spec/ruby/core/thread/report_on_exception_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' ruby_version_is "2.4" do describe "Thread.report_on_exception" do diff --git a/spec/ruby/core/thread/run_spec.rb b/spec/ruby/core/thread/run_spec.rb index 26ed9ed961..2472269df8 100644 --- a/spec/ruby/core/thread/run_spec.rb +++ b/spec/ruby/core/thread/run_spec.rb @@ -1,7 +1,7 @@ -require File.expand_path('../../../spec_helper', __FILE__) -require File.expand_path('../fixtures/classes', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' -require File.expand_path('../shared/wakeup', __FILE__) +require_relative 'shared/wakeup' describe "Thread#run" do it_behaves_like :thread_wakeup, :run diff --git a/spec/ruby/core/thread/set_trace_func_spec.rb b/spec/ruby/core/thread/set_trace_func_spec.rb index 6dd5448d79..e5d8298ae0 100644 --- a/spec/ruby/core/thread/set_trace_func_spec.rb +++ b/spec/ruby/core/thread/set_trace_func_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#set_trace_func" do it "needs to be reviewed for spec completeness" diff --git a/spec/ruby/core/thread/start_spec.rb b/spec/ruby/core/thread/start_spec.rb index 932e782382..3dd040f98b 100644 --- a/spec/ruby/core/thread/start_spec.rb +++ b/spec/ruby/core/thread/start_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/start', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/start' describe "Thread.start" do describe "Thread.start" do diff --git a/spec/ruby/core/thread/status_spec.rb b/spec/ruby/core/thread/status_spec.rb index 6cfdf0be40..4fde663c91 100644 --- a/spec/ruby/core/thread/status_spec.rb +++ b/spec/ruby/core/thread/status_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 "Thread#status" do it "can check it's own status" do diff --git a/spec/ruby/core/thread/stop_spec.rb b/spec/ruby/core/thread/stop_spec.rb index 0bc99487fd..33cf8f7b5c 100644 --- a/spec/ruby/core/thread/stop_spec.rb +++ b/spec/ruby/core/thread/stop_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 "Thread.stop" do it "causes the current thread to sleep indefinitely" do diff --git a/spec/ruby/core/thread/terminate_spec.rb b/spec/ruby/core/thread/terminate_spec.rb index bb89d87762..cf6cab472b 100644 --- a/spec/ruby/core/thread/terminate_spec.rb +++ b/spec/ruby/core/thread/terminate_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/exit', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/exit' describe "Thread#terminate" do it_behaves_like :thread_exit, :terminate diff --git a/spec/ruby/core/thread/thread_variable_get_spec.rb b/spec/ruby/core/thread/thread_variable_get_spec.rb index 0e02c30fad..38f90d5830 100644 --- a/spec/ruby/core/thread/thread_variable_get_spec.rb +++ b/spec/ruby/core/thread/thread_variable_get_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#thread_variable_get" do before :each do diff --git a/spec/ruby/core/thread/thread_variable_set_spec.rb b/spec/ruby/core/thread/thread_variable_set_spec.rb index 0f55341132..1338c306c7 100644 --- a/spec/ruby/core/thread/thread_variable_set_spec.rb +++ b/spec/ruby/core/thread/thread_variable_set_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#thread_variable_set" do before :each do diff --git a/spec/ruby/core/thread/thread_variable_spec.rb b/spec/ruby/core/thread/thread_variable_spec.rb index b409b3abfc..6bd1950c04 100644 --- a/spec/ruby/core/thread/thread_variable_spec.rb +++ b/spec/ruby/core/thread/thread_variable_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#thread_variable?" do before :each do diff --git a/spec/ruby/core/thread/thread_variables_spec.rb b/spec/ruby/core/thread/thread_variables_spec.rb index 39299cf20e..1bd68b17f1 100644 --- a/spec/ruby/core/thread/thread_variables_spec.rb +++ b/spec/ruby/core/thread/thread_variables_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../../../spec_helper', __FILE__) +require_relative '../../spec_helper' describe "Thread#thread_variables" do before :each do diff --git a/spec/ruby/core/thread/value_spec.rb b/spec/ruby/core/thread/value_spec.rb index 3d900959df..30b12db125 100644 --- a/spec/ruby/core/thread/value_spec.rb +++ b/spec/ruby/core/thread/value_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 "Thread#value" do it "returns the result of the block" do diff --git a/spec/ruby/core/thread/wakeup_spec.rb b/spec/ruby/core/thread/wakeup_spec.rb index 5197a03a35..da5dfea377 100644 --- a/spec/ruby/core/thread/wakeup_spec.rb +++ b/spec/ruby/core/thread/wakeup_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/wakeup', __FILE__) +require_relative '../../spec_helper' +require_relative 'fixtures/classes' +require_relative 'shared/wakeup' describe "Thread#wakeup" do it_behaves_like :thread_wakeup, :wakeup -- cgit v1.2.3