summaryrefslogtreecommitdiffstats
path: root/test/integration/routing
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-18 17:57:16 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-18 17:57:16 +0000
commit1257f1960ff6d59b2f3f7890777d3481f1800430 (patch)
tree6be67b6fc92cb8a408ed002fc6fe219ea566bb9a /test/integration/routing
parent10c96dba8b79822e1d54ef58bb8139851cf30c80 (diff)
downloadredmine-1257f1960ff6d59b2f3f7890777d3481f1800430.tar.gz
redmine-1257f1960ff6d59b2f3f7890777d3481f1800430.zip
Adds pagination to users list when adding project or group members (#9549).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11200 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration/routing')
-rw-r--r--test/integration/routing/groups_test.rb4
-rw-r--r--test/integration/routing/members_test.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/integration/routing/groups_test.rb b/test/integration/routing/groups_test.rb
index fe0e1ac80..96d187144 100644
--- a/test/integration/routing/groups_test.rb
+++ b/test/integration/routing/groups_test.rb
@@ -48,6 +48,10 @@ class RoutingGroupsTest < ActionController::IntegrationTest
{ :controller => 'groups', :action => 'autocomplete_for_user', :id => '1' }
)
assert_routing(
+ { :method => 'get', :path => "/groups/1/autocomplete_for_user.js" },
+ { :controller => 'groups', :action => 'autocomplete_for_user', :id => '1', :format => 'js' }
+ )
+ assert_routing(
{ :method => 'get', :path => "/groups/1" },
{ :controller => 'groups', :action => 'show', :id => '1' }
)
diff --git a/test/integration/routing/members_test.rb b/test/integration/routing/members_test.rb
index 26ba3e1db..c796eab46 100644
--- a/test/integration/routing/members_test.rb
+++ b/test/integration/routing/members_test.rb
@@ -55,5 +55,9 @@ class RoutingMembersTest < ActionController::IntegrationTest
{ :method => 'get', :path => "/projects/5234/memberships/autocomplete" },
{ :controller => 'members', :action => 'autocomplete', :project_id => '5234' }
)
+ assert_routing(
+ { :method => 'get', :path => "/projects/5234/memberships/autocomplete.js" },
+ { :controller => 'members', :action => 'autocomplete', :project_id => '5234', :format => 'js' }
+ )
end
end