diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-11 17:58:08 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-11 17:58:08 +0000 |
commit | d4ebbe5ba8c822bf320122add151fcc5a9c07cd7 (patch) | |
tree | 9fb8d756263fddddf01d350a6c6358d3721a70ee | |
parent | fcf9cf7bb17e5760f9cd4c93e481dcf41bac8b86 (diff) | |
download | redmine-d4ebbe5ba8c822bf320122add151fcc5a9c07cd7.tar.gz redmine-d4ebbe5ba8c822bf320122add151fcc5a9c07cd7.zip |
Adds some helpers tests.
git-svn-id: http://svn.redmine.org/redmine/trunk@13735 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r-- | app/helpers/groups_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/members_helper.rb | 4 | ||||
-rw-r--r-- | test/unit/helpers/groups_helper_test.rb | 42 | ||||
-rw-r--r-- | test/unit/helpers/members_helper_test.rb | 42 |
4 files changed, 88 insertions, 4 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 4275f29a0..7e6ff8e2e 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -26,10 +26,10 @@ module GroupsHelper tabs end - def render_principals_for_new_group_users(group) + def render_principals_for_new_group_users(group, limit=100) scope = User.active.sorted.not_in_group(group).like(params[:q]) principal_count = scope.count - principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page'] + principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a s = content_tag('div', diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 9036c6db0..7a38513e1 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -18,10 +18,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module MembersHelper - def render_principals_for_new_members(project) + def render_principals_for_new_members(project, limit=100) scope = Principal.active.visible.sorted.not_member_of(project).like(params[:q]) principal_count = scope.count - principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page'] + principal_pages = Redmine::Pagination::Paginator.new principal_count, limit, params['page'] principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a s = content_tag('div', diff --git a/test/unit/helpers/groups_helper_test.rb b/test/unit/helpers/groups_helper_test.rb new file mode 100644 index 000000000..90f513f22 --- /dev/null +++ b/test/unit/helpers/groups_helper_test.rb @@ -0,0 +1,42 @@ +# Redmine - project management software +# Copyright (C) 2006-2014 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../test_helper', __FILE__) + +class GroupsHelperTest < ActionView::TestCase + include Redmine::I18n + include ERB::Util + include GroupsHelper + + fixtures :users + + def test_render_principals_for_new_group_users + group = Group.generate! + + result = render_principals_for_new_group_users(group) + assert_select_in result, 'input[name=?][value=2]', 'user_ids[]' + end + + def test_render_principals_for_new_group_users_with_limited_results_should_paginate + group = Group.generate! + + result = render_principals_for_new_group_users(group, 3) + assert_select_in result, 'p.pagination' + assert_select_in result, 'span.current.page', :text => '1' + assert_select_in result, 'a[href=?]', "/groups/#{group.id}/autocomplete_for_user.js?page=2", :text => '2' + end +end diff --git a/test/unit/helpers/members_helper_test.rb b/test/unit/helpers/members_helper_test.rb new file mode 100644 index 000000000..25f31994c --- /dev/null +++ b/test/unit/helpers/members_helper_test.rb @@ -0,0 +1,42 @@ +# Redmine - project management software +# Copyright (C) 2006-2014 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../test_helper', __FILE__) + +class MembersHelperTest < ActionView::TestCase + include Redmine::I18n + include ERB::Util + include MembersHelper + + fixtures :projects, :users, :members, :member_roles + + def test_render_principals_for_new_members + project = Project.generate! + + result = render_principals_for_new_members(project) + assert_select_in result, 'input[name=?][value=2]', 'membership[user_ids][]' + end + + def test_render_principals_for_new_members_with_limited_results_should_paginate + project = Project.generate! + + result = render_principals_for_new_members(project, 3) + assert_select_in result, 'p.pagination' + assert_select_in result, 'span.current.page', :text => '1' + assert_select_in result, 'a[href=?]', "/projects/#{project.identifier}/memberships/autocomplete.js?page=2", :text => '2' + end +end |