Mercurial > kallithea
changeset 3415:b8f929bff7e3 beta
fixed tests and missing replacements from 5f1850e4712a
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 27 Feb 2013 02:27:09 +0100 |
| parents | 25c670081761 |
| children | 5706f6ab60cf |
| files | rhodecode/lib/auth.py rhodecode/lib/helpers.py rhodecode/model/repo.py rhodecode/model/user.py rhodecode/model/validators.py rhodecode/templates/admin/repos_groups/repos_groups_show.html rhodecode/templates/admin/users_groups/users_group_edit.html rhodecode/tests/api/api_base.py rhodecode/tests/functional/test_admin_users_groups.py rhodecode/tests/models/test_permissions.py rhodecode/tests/models/test_users.py |
| diffstat | 11 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/auth.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/lib/auth.py Wed Feb 27 02:27:09 2013 +0100 @@ -411,7 +411,7 @@ @property def groups_admin(self): """ - Returns list of repositories groups you're an admin of + Returns list of repository groups you're an admin of """ return [x[0] for x in self.permissions['repositories_groups'].iteritems() if x[1] == 'group.admin']
--- a/rhodecode/lib/helpers.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/lib/helpers.py Wed Feb 27 02:27:09 2013 +0100 @@ -684,9 +684,9 @@ get_user_name, 'user_add.png'), 'admin_updated_user': (_('[updated] user'), get_user_name, 'user_edit.png'), - 'admin_created_users_group': (_('[created] users group'), + 'admin_created_users_group': (_('[created] user group'), get_users_group, 'group_add.png'), - 'admin_updated_users_group': (_('[updated] users group'), + 'admin_updated_users_group': (_('[updated] user group'), get_users_group, 'group_edit.png'), 'user_commented_revision': (_('[commented] on revision in repository'), get_cs_links, 'comment_add.png'),
--- a/rhodecode/model/repo.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/model/repo.py Wed Feb 27 02:27:09 2013 +0100 @@ -549,12 +549,12 @@ def grant_users_group_permission(self, repo, group_name, perm): """ - Grant permission for users group on given repository, or update + Grant permission for user group on given repository, or update existing one if found :param repo: Instance of Repository, repository_id, or repository name :param group_name: Instance of UserGroup, users_group_id, - or users group name + or user group name :param perm: Instance of Permission, or permission_name """ repo = self._get_repo(repo) @@ -579,11 +579,11 @@ def revoke_users_group_permission(self, repo, group_name): """ - Revoke permission for users group on given repository + Revoke permission for user group on given repository :param repo: Instance of Repository, repository_id, or repository name :param group_name: Instance of UserGroup, users_group_id, - or users group name + or user group name """ repo = self._get_repo(repo) group_name = self.__get_users_group(group_name)
--- a/rhodecode/model/user.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/model/user.py Wed Feb 27 02:27:09 2013 +0100 @@ -512,7 +512,7 @@ 'hg.create.none', 'hg.create.repository']) # USER GROUPS comes first - # users group global permissions + # user group global permissions user_perms_from_users_groups = self.sa.query(UsersGroupToPerm)\ .options(joinedload(UsersGroupToPerm.permission))\ .join((UsersGroupMember, UsersGroupToPerm.users_group_id == @@ -559,7 +559,7 @@ # permission should be selected based on selected method #====================================================================== - # users group for repositories permissions + # user group for repositories permissions user_repo_perms_from_users_groups = \ self.sa.query(UsersGroupRepoToPerm, Permission, Repository,)\ .join((Repository, UsersGroupRepoToPerm.repository_id == @@ -617,7 +617,7 @@ # fill in his permission from it. _choose_perm decides of which # permission should be selected based on selected method #====================================================================== - # users group for repo groups permissions + # user group for repo groups permissions user_repo_group_perms_from_users_groups = \ self.sa.query(UsersGroupRepoGroupToPerm, Permission, RepoGroup)\ .join((RepoGroup, UsersGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\
--- a/rhodecode/model/validators.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/model/validators.py Wed Feb 27 02:27:09 2013 +0100 @@ -132,10 +132,10 @@ def ValidUsersGroup(edit=False, old_data={}): class _validator(formencode.validators.FancyValidator): messages = { - 'invalid_group': _(u'Invalid users group name'), + 'invalid_group': _(u'Invalid user group name'), 'group_exist': _(u'Users group "%(usersgroup)s" already exists'), 'invalid_usersgroup_name': - _(u'users group name may only contain alphanumeric ' + _(u'user group name may only contain alphanumeric ' 'characters underscores, periods or dashes and must begin ' 'with alphanumeric character') } @@ -547,7 +547,7 @@ class _validator(formencode.validators.FancyValidator): messages = { 'perm_new_member_name': - _(u'This username or users group name is not valid') + _(u'This username or user group name is not valid') } def to_python(self, value, state):
--- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html Wed Feb 27 02:27:09 2013 +0100 @@ -9,7 +9,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('repositories groups')} + ${_('repository groups')} </%def> <%def name="page_nav()"> ${self.menu('admin')}
--- a/rhodecode/templates/admin/users_groups/users_group_edit.html Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html Wed Feb 27 02:27:09 2013 +0100 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit users group')} ${c.users_group.users_group_name} - ${c.rhodecode_name} + ${_('Edit user group')} ${c.users_group.users_group_name} - ${c.rhodecode_name} </%def> <%def name="breadcrumbs_links()">
--- a/rhodecode/tests/api/api_base.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/tests/api/api_base.py Wed Feb 27 02:27:09 2013 +0100 @@ -1037,7 +1037,7 @@ response = api_call(self, params) ret = { - 'msg': 'created new users group `%s`' % group_name, + 'msg': 'created new user group `%s`' % group_name, 'users_group': jsonify(UsersGroupModel()\ .get_by_name(group_name)\ .get_api_data()) @@ -1052,7 +1052,7 @@ group_name=TEST_USERS_GROUP) response = api_call(self, params) - expected = "users group `%s` already exist" % TEST_USERS_GROUP + expected = "user group `%s` already exist" % TEST_USERS_GROUP self._compare_error(id_, expected, given=response.body) @mock.patch.object(UsersGroupModel, 'create', crash) @@ -1075,7 +1075,7 @@ response = api_call(self, params) expected = { - 'msg': 'added member `%s` to users group `%s`' % ( + 'msg': 'added member `%s` to user group `%s`' % ( TEST_USER_ADMIN_LOGIN, gr_name ), 'success': True} @@ -1090,7 +1090,7 @@ userid=TEST_USER_ADMIN_LOGIN) response = api_call(self, params) - expected = 'users group `%s` does not exist' % 'false-group' + expected = 'user group `%s` does not exist' % 'false-group' self._compare_error(id_, expected, given=response.body) @mock.patch.object(UsersGroupModel, 'add_user_to_group', crash) @@ -1103,7 +1103,7 @@ userid=TEST_USER_ADMIN_LOGIN) response = api_call(self, params) - expected = 'failed to add member to users group `%s`' % gr_name + expected = 'failed to add member to user group `%s`' % gr_name self._compare_error(id_, expected, given=response.body) UsersGroupModel().delete(users_group=gr_name) @@ -1120,7 +1120,7 @@ response = api_call(self, params) expected = { - 'msg': 'removed member `%s` from users group `%s`' % ( + 'msg': 'removed member `%s` from user group `%s`' % ( TEST_USER_ADMIN_LOGIN, gr_name ), 'success': True} @@ -1140,7 +1140,7 @@ userid=TEST_USER_ADMIN_LOGIN) response = api_call(self, params) - expected = 'failed to remove member from users group `%s`' % gr_name + expected = 'failed to remove member from user group `%s`' % gr_name self._compare_error(id_, expected, given=response.body) UsersGroupModel().delete(users_group=gr_name) @@ -1229,7 +1229,7 @@ response = api_call(self, params) ret = { - 'msg': 'Granted perm: `%s` for users group: `%s` in repo: `%s`' % ( + 'msg': 'Granted perm: `%s` for user group: `%s` in repo: `%s`' % ( perm, TEST_USERS_GROUP, self.REPO ), 'success': True @@ -1257,7 +1257,7 @@ perm=perm) response = api_call(self, params) - expected = 'failed to edit permission for users group: `%s` in repo: `%s`' % ( + expected = 'failed to edit permission for user group: `%s` in repo: `%s`' % ( TEST_USERS_GROUP, self.REPO ) self._compare_error(id_, expected, given=response.body) @@ -1273,7 +1273,7 @@ response = api_call(self, params) expected = { - 'msg': 'Revoked perm for users group: `%s` in repo: `%s`' % ( + 'msg': 'Revoked perm for user group: `%s` in repo: `%s`' % ( TEST_USERS_GROUP, self.REPO ), 'success': True @@ -1288,7 +1288,7 @@ usersgroupid=TEST_USERS_GROUP,) response = api_call(self, params) - expected = 'failed to edit permission for users group: `%s` in repo: `%s`' % ( + expected = 'failed to edit permission for user group: `%s` in repo: `%s`' % ( TEST_USERS_GROUP, self.REPO ) self._compare_error(id_, expected, given=response.body)
--- a/rhodecode/tests/functional/test_admin_users_groups.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/tests/functional/test_admin_users_groups.py Wed Feb 27 02:27:09 2013 +0100 @@ -22,7 +22,7 @@ response.follow() self.checkSessionFlash(response, - 'created users group %s' % TEST_USERS_GROUP) + 'created user group %s' % TEST_USERS_GROUP) def test_new(self): response = self.app.get(url('new_users_group')) @@ -46,7 +46,7 @@ response.follow() self.checkSessionFlash(response, - 'created users group %s' % users_group_name) + 'created user group %s' % users_group_name) gr = self.Session.query(UsersGroup)\ .filter(UsersGroup.users_group_name == @@ -70,7 +70,7 @@ ug = UsersGroup.get_by_group_name(users_group_name) self.checkSessionFlash(response, - 'created users group %s' % users_group_name) + 'created user group %s' % users_group_name) ## ENABLE REPO CREATE ON A GROUP response = self.app.put(url('users_group_perm', id=ug.users_group_id), {'create_repo_perm': True}) @@ -139,7 +139,7 @@ ug = UsersGroup.get_by_group_name(users_group_name) self.checkSessionFlash(response, - 'created users group %s' % users_group_name) + 'created user group %s' % users_group_name) ## ENABLE REPO CREATE ON A GROUP response = self.app.put(url('users_group_perm', id=ug.users_group_id), {'fork_repo_perm': True})
--- a/rhodecode/tests/models/test_permissions.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/tests/models/test_permissions.py Wed Feb 27 02:27:09 2013 +0100 @@ -439,7 +439,7 @@ u1_auth = AuthUser(user_id=self.u1.user_id) self.assertEqual(u1_auth.permissions['repositories']['myownrepo'], 'repository.admin') - #set his permission as users group, he should still be admin + #set his permission as user group, he should still be admin self.ug1 = UsersGroupModel().create('G1') # add user to group UsersGroupModel().add_user_to_group(self.ug1, self.u1)
--- a/rhodecode/tests/models/test_users.py Wed Feb 27 02:18:45 2013 +0100 +++ b/rhodecode/tests/models/test_users.py Wed Feb 27 02:27:09 2013 +0100 @@ -22,7 +22,7 @@ Session().commit() self.assertEqual(User.get_by_username(u'test_user'), usr) - # make users group + # make user group users_group = UsersGroupModel().create('some_example_group') Session().commit()