Fix most auto-correctable rubocop issues

[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 3d2fab4d01a8ae677671e42491d6b426dafd2a2b..cbd0dbe804fd6cef73b18faee46ec7a8281f69b3 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'

 
 class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles
 
 class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles


@@ -16,7 +16,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     check_fail(:revoke, :administrator_user, :moderator)
   end
 
     check_fail(:revoke, :administrator_user, :moderator)
   end
 

-private
+  private

 
   def check_fail(action, user, role)
     get '/login'
 
   def check_fail(action, user, role)
     get '/login'


@@ -24,7 +24,7 @@ private
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
+    post '/login', 'username' => users(user).email, 'password' => "test", :referer => "/"

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -41,7 +41,7 @@ private
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success

-    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
+    post '/login', 'username' => users(user).email, 'password' => "test", :referer => "/"

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success