User groups branch merged.

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

test/integration/admin_test.rb

@@ -18,7 +18,7 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class AdminTest < ActionController::IntegrationTest
-  fixtures :users
+  fixtures :all
 
   def test_add_user
     log_user("admin", "admin")
@@ -26,16 +26,17 @@ class AdminTest < ActionController::IntegrationTest
     assert_response :success
     assert_template "users/add"
     post "/users/add", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "psmith@somenet.foo", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
-    assert_redirected_to "/users"
     
     user = User.find_by_login("psmith")
     assert_kind_of User, user
+    assert_redirected_to "/users/#{ user.id }/edit"
+    
     logged_user = User.try_to_login("psmith", "psmith09")
     assert_kind_of User, logged_user
     assert_equal "Paul", logged_user.firstname
     
     post "users/edit", :id => user.id, :user => { :status => User::STATUS_LOCKED }
-    assert_redirected_to "/users"
+    assert_redirected_to "/users/#{ user.id }/edit"
     locked_user = User.try_to_login("psmith", "psmith09")
     assert_equal nil, locked_user
   end