Qualify SCALE in tests

[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 8bf06374fc41601ed914b0197d2d51712cc26dd4..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 UserRolesControllerTest < ActionController::IntegrationTest
+class UserRolesTest < ActionDispatch::IntegrationTest

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


@@ -16,6 +16,8 @@ class UserRolesControllerTest < ActionController::IntegrationTest
     check_fail(:revoke, :administrator_user, :moderator)
   end
 
     check_fail(:revoke, :administrator_user, :moderator)
   end
 

+private
+

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


@@ -27,8 +29,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
     follow_redirect!
     assert_response :success
 
     follow_redirect!
     assert_response :success
 

-    get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}"
-    assert_response :redirect
+    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
 
     reset!
     assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name
 
     reset!


@@ -45,10 +46,7 @@ class UserRolesControllerTest < ActionController::IntegrationTest
     follow_redirect!
     assert_response :success
 
     follow_redirect!
     assert_response :success
 

-    get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}"
-    assert_response :success
-    post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}", {:confirm => "yes", :nonce => session[:nonce]}
-    assert_response :redirect
+    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
 
     reset!
     assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name
 
     reset!