Merge remote-tracking branch 'openstreetmap/pull/1004'

[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..5732430255d8b1703f1e1bfb35e13ca33475607f 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
@@ -16,38 +16,38 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     check_fail(:revoke, :administrator_user, :moderator)
   end
 
-private
+  private
 
   def check_fail(action, user, role)
-    get '/login'
+    get "/login"
     assert_response :redirect
     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
 
     post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}"
-    assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name
+    assert_redirected_to :controller => "user", :action => "view", :display_name => users(:second_public_user).display_name
 
     reset!
   end
 
   def check_success(action, user, role)
-    get '/login'
+    get "/login"
     assert_response :redirect
     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
 
     post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}"
-    assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name
+    assert_redirected_to :controller => "user", :action => "view", :display_name => users(:second_public_user).display_name
 
     reset!
   end