Update to ruby/spec@c1b568b

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

6 files changed, 13 insertions, 13 deletions

diff --git a/spec/ruby/core/main/define_method_spec.rb b/spec/ruby/core/main/define_method_spec.rb
index 741e0624f8..d85c5e8119 100644
--- a/spec/ruby/core/main/define_method_spec.rb
+++ b/spec/ruby/core/main/define_method_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'
 
 script_binding = binding
 
diff --git a/spec/ruby/core/main/include_spec.rb b/spec/ruby/core/main/include_spec.rb
index 1973bc8229..9f5a5f54ea 100644
--- a/spec/ruby/core/main/include_spec.rb
+++ b/spec/ruby/core/main/include_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 "main#include" do
   it "includes the given Module in Object" do
diff --git a/spec/ruby/core/main/private_spec.rb b/spec/ruby/core/main/private_spec.rb
index 7e0a4ed57d..eef826ad81 100644
--- a/spec/ruby/core/main/private_spec.rb
+++ b/spec/ruby/core/main/private_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 "main#private" do
   after :each do
diff --git a/spec/ruby/core/main/public_spec.rb b/spec/ruby/core/main/public_spec.rb
index 6906faee04..259a8f9418 100644
--- a/spec/ruby/core/main/public_spec.rb
+++ b/spec/ruby/core/main/public_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 "main#public" do
   after :each do
diff --git a/spec/ruby/core/main/to_s_spec.rb b/spec/ruby/core/main/to_s_spec.rb
index dd5a02b0ae..642cfa4433 100644
--- a/spec/ruby/core/main/to_s_spec.rb
+++ b/spec/ruby/core/main/to_s_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "main#to_s" do
   it "returns 'main'" do
diff --git a/spec/ruby/core/main/using_spec.rb b/spec/ruby/core/main/using_spec.rb
index 108cc50dad..d043079316 100644
--- a/spec/ruby/core/main/using_spec.rb
+++ b/spec/ruby/core/main/using_spec.rb
@@ -1,7 +1,7 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 ruby_version_is "2.0.0" do
-  require File.expand_path('../fixtures/classes', __FILE__)
+  require_relative 'fixtures/classes'
 
   describe "main.using" do
     it "requires one Module argument" do
@@ -15,7 +15,7 @@ ruby_version_is "2.0.0" do
     end
 
     it "uses refinements from the given module only in the target file" do
-      require File.expand_path('../fixtures/string_refinement', __FILE__)
+      require_relative 'fixtures/string_refinement'
       load File.expand_path('../fixtures/string_refinement_user.rb', __FILE__)
       MainSpecs::DATA[:in_module].should == 'foo'
       MainSpecs::DATA[:toplevel].should == 'foo'
@@ -25,7 +25,7 @@ ruby_version_is "2.0.0" do
     end
 
     it "uses refinements from the given module for method calls in the target file" do
-      require File.expand_path('../fixtures/string_refinement', __FILE__)
+      require_relative 'fixtures/string_refinement'
       load File.expand_path('../fixtures/string_refinement_user.rb', __FILE__)
       lambda do
         'hello'.foo