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 d4f6f8abcc41ddd50944ba6c4c4c671649a0c90f..b36082caca91b64a5084f18bb957bac5f15ed0f6 100644 (file)
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class ShortLinksTest < ActionController::IntegrationTest
+class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
   # test the short link with various parameters and ensure they're
   # kept in the redirect.