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

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

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 948bb895cd10a7c3110ea6f81d85ca5fe3f8713a..08031b4de52fcb0cd40ab6982f016bf72283ceb6 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'

 
 

-class UserRolesTest < ActionController::IntegrationTest
+class UserRolesTest < ActionDispatch::IntegrationTest

   fixtures :users, :user_roles
 
   test "grant" do
   fixtures :users, :user_roles
 
   test "grant" do