Merge remote-tracking branch 'upstream/pull/1795'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index c9ec46dcf41cf1b78c9cab334b8027dde167aa0e..385a2f6825d0d9ea27baae625791d3b6a55e5067 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@ require "coveralls"
 Coveralls.wear!("rails")
 
 ENV["RAILS_ENV"] = "test"
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path("../config/environment", __dir__)
 require "rails/test_help"
 require "webmock/minitest"