Let administrators see locked user profiles.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3493 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 8 insertions, 2 deletions

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 74cfb656d..6823eb307 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -103,12 +103,11 @@ class UsersControllerTest < ActionController::TestCase
     get :show, :id => 2
     assert_response :success
   end
-  
 
   def test_show_inactive
+    @request.session[:user_id] = nil
     get :show, :id => 5
     assert_response 404
-    assert_nil assigns(:user)
   end
   
   def test_show_should_not_reveal_users_with_no_visible_activity_or_project
@@ -116,6 +115,13 @@ class UsersControllerTest < ActionController::TestCase
     get :show, :id => 9
     assert_response 404
   end
+  
+  def test_show_inactive_by_admin
+    @request.session[:user_id] = 1
+    get :show, :id => 5
+    assert_response 200
+    assert_not_nil assigns(:user)
+  end
 
   def test_add_routing
     assert_routing(