Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / test / integration / oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index fbb947af45199b977954df05628fdb63f11306a1..dd03fde46ec899210d9ef2f07b025055a1d3d7c5 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OAuthTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications, :gpx_files