diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-11-16 08:53:39 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-11-16 08:53:39 +0000 |
commit | 1508cd7b8bf9dbc8ef22b6febd1047455c3c72cd (patch) | |
tree | 88daaa947aab2dceb7d6c64223b445f3bc7450bb /test | |
parent | 67835aa74d0412d538bee97d975564a8fec5b2c4 (diff) | |
download | redmine-1508cd7b8bf9dbc8ef22b6febd1047455c3c72cd.tar.gz redmine-1508cd7b8bf9dbc8ef22b6febd1047455c3c72cd.zip |
Moved new group user to its own action GroupsController#new_users.
git-svn-id: http://svn.redmine.org/redmine/trunk@13602 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r-- | test/functional/groups_controller_test.rb | 12 | ||||
-rw-r--r-- | test/integration/routing/groups_test.rb | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb index 778b3f3cd..f2fa5f04b 100644 --- a/test/functional/groups_controller_test.rb +++ b/test/functional/groups_controller_test.rb @@ -113,6 +113,18 @@ class GroupsControllerTest < ActionController::TestCase assert_redirected_to '/groups' end + def test_new_users + get :new_users, :id => 10 + assert_response :success + assert_template 'new_users' + end + + def test_xhr_new_users + xhr :get, :new_users, :id => 10 + assert_response :success + assert_equal 'text/javascript', response.content_type + end + def test_add_users assert_difference 'Group.find(10).users.count', 2 do post :add_users, :id => 10, :user_ids => ['2', '3'] diff --git a/test/integration/routing/groups_test.rb b/test/integration/routing/groups_test.rb index ea6e73703..4171a0e25 100644 --- a/test/integration/routing/groups_test.rb +++ b/test/integration/routing/groups_test.rb @@ -79,6 +79,10 @@ class RoutingGroupsTest < ActionDispatch::IntegrationTest def test_groups assert_routing( + { :method => 'get', :path => "/groups/567/users/new" }, + { :controller => 'groups', :action => 'new_users', :id => '567' } + ) + assert_routing( { :method => 'post', :path => "/groups/567/users" }, { :controller => 'groups', :action => 'add_users', :id => '567' } ) |