Remove unneessary return added accidentally

[rails.git] / test / functional / user_roles_controller_test.rb

diff --git a/test/functional/user_roles_controller_test.rb b/test/functional/user_roles_controller_test.rb
index ed5d1a17d0302826b8d8dd3fee5e0f8cfbdd7fcf..4e4bd6da72a3e9b523b507dfd48dfec1df34c339 100644 (file)
--- a/test/functional/user_roles_controller_test.rb
+++ b/test/functional/user_roles_controller_test.rb
@@ -25,7 +25,6 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Login as an unprivileged user
     session[:user] = users(:public_user).id
 
     # Login as an unprivileged user
     session[:user] = users(:public_user).id

-    cookies["_osm_username"] = users(:public_user).display_name

 
     # Granting should still fail
     post :grant, :display_name => users(:normal_user).display_name, :role => "moderator"
 
     # Granting should still fail
     post :grant, :display_name => users(:normal_user).display_name, :role => "moderator"


@@ -34,7 +33,6 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Login as an administrator
     session[:user] = users(:administrator_user).id
 
     # Login as an administrator
     session[:user] = users(:administrator_user).id

-    cookies["_osm_username"] = users(:administrator_user).display_name

 
     UserRole::ALL_ROLES.each do |role|
 
 
     UserRole::ALL_ROLES.each do |role|
 


@@ -44,7 +42,7 @@ class UserRolesControllerTest < ActionController::TestCase
       end
       assert_response :not_found
       assert_template "user/no_such_user"
       end
       assert_response :not_found
       assert_template "user/no_such_user"

-      assert_select "h2", "The user non_existent_user does not exist"
+      assert_select "h1", "The user non_existent_user does not exist"

 
       # Granting a role from a user that already has it should fail
       assert_no_difference "UserRole.count" do
 
       # Granting a role from a user that already has it should fail
       assert_no_difference "UserRole.count" do


@@ -85,7 +83,6 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Login as an unprivileged user
     session[:user] = users(:public_user).id
 
     # Login as an unprivileged user
     session[:user] = users(:public_user).id

-    cookies["_osm_username"] = users(:public_user).display_name

 
     # Revoking should still fail
     post :revoke, :display_name => users(:normal_user).display_name, :role => "moderator"
 
     # Revoking should still fail
     post :revoke, :display_name => users(:normal_user).display_name, :role => "moderator"


@@ -94,7 +91,6 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Login as an administrator
     session[:user] = users(:administrator_user).id
 
     # Login as an administrator
     session[:user] = users(:administrator_user).id

-    cookies["_osm_username"] = users(:administrator_user).display_name

 
     UserRole::ALL_ROLES.each do |role|
 
 
     UserRole::ALL_ROLES.each do |role|
 


@@ -104,7 +100,7 @@ class UserRolesControllerTest < ActionController::TestCase
       end
       assert_response :not_found
       assert_template "user/no_such_user"
       end
       assert_response :not_found
       assert_template "user/no_such_user"

-      assert_select "h2", "The user non_existent_user does not exist"
+      assert_select "h1", "The user non_existent_user does not exist"

 
       # Removing a role from a user that doesn't have it should fail
       assert_no_difference "UserRole.count" do
 
       # Removing a role from a user that doesn't have it should fail
       assert_no_difference "UserRole.count" do