Merge branch 'master' into overpass

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

diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index aec204e71f23f21e22eb8a971e000c3efa8e53ef..b36082caca91b64a5084f18bb957bac5f15ed0f6 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##