diff test/functional/roles_controller_test.rb @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

--- a/test/functional/roles_controller_test.rb	Thu Mar 03 15:08:45 2011 +0000
+++ b/test/functional/roles_controller_test.rb	Mon Jun 06 14:41:04 2011 +0100
@@ -22,7 +22,7 @@
 class RolesController; def rescue_action(e) raise e end; end
 
 class RolesControllerTest < ActionController::TestCase
-  fixtures :roles, :users, :members, :member_roles, :workflows
+  fixtures :roles, :users, :members, :member_roles, :workflows, :trackers
   
   def setup
     @controller = RolesController.new
@@ -114,7 +114,7 @@
   def test_destroy_role_in_use
     post :destroy, :id => 1
     assert_redirected_to '/roles'
-    assert flash[:error] == 'This role is in use and can not be deleted.'
+    assert flash[:error] == 'This role is in use and cannot be deleted.'
     assert_not_nil Role.find_by_id(1)
   end