Mercurial > hg > soundsoftware-site
diff test/functional/.svn/text-base/roles_controller_test.rb.svn-base @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 8661b858af72 |
children |
line wrap: on
line diff
--- a/test/functional/.svn/text-base/roles_controller_test.rb.svn-base Thu Mar 03 11:42:28 2011 +0000 +++ b/test/functional/.svn/text-base/roles_controller_test.rb.svn-base Mon Jun 06 14:24:13 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