1 files changed, 8 insertions, 16 deletions
diff --git a/spec/ruby/language/file_spec.rb b/spec/ruby/language/file_spec.rb
index 409400ca83..dd89ce2385 100644
--- a/spec/ruby/language/file_spec.rb
+++ b/spec/ruby/language/file_spec.rb
@@ -1,29 +1,21 @@
-require File.expand_path('../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/code_loading', __FILE__)
-require File.expand_path('../shared/__FILE__', __FILE__)
+require_relative '../spec_helper'
+require_relative '../fixtures/code_loading'
+require_relative 'shared/__FILE__'
 
 describe "The __FILE__ pseudo-variable" do
   it "raises a SyntaxError if assigned to" do
-    lambda { eval("__FILE__ = 1") }.should raise_error(SyntaxError)
+    -> { eval("__FILE__ = 1") }.should.raise(SyntaxError)
   end
 
-  it "equals (eval) inside an eval" do
-    eval("__FILE__").should == "(eval)"
+  it "equals (eval at __FILE__:__LINE__) inside an eval" do
+    eval("__FILE__").should == "(eval at #{__FILE__}:#{__LINE__})"
   end
 end
 
-describe "The __FILE__ pseudo-variable" do
-  it_behaves_like :language___FILE__, :require, CodeLoadingSpecs::Method.new
-end
-
-describe "The __FILE__ pseudo-variable" do
+describe "The __FILE__ pseudo-variable with require" do
   it_behaves_like :language___FILE__, :require, Kernel
 end
 
-describe "The __FILE__ pseudo-variable" do
-  it_behaves_like :language___FILE__, :load, CodeLoadingSpecs::Method.new
-end
-
-describe "The __FILE__ pseudo-variable" do
+describe "The __FILE__ pseudo-variable with load" do
   it_behaves_like :language___FILE__, :load, Kernel
 end