Mercurial > kallithea

comparison rhodecode/tests/api/api_base.py @ 3415:b8f929bff7e3 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed tests and missing replacements from 5f1850e4712a
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 27 Feb 2013 02:27:09 +0100
parents d6029dacbcc4
children fa6ba6727475
comparison
equal deleted inserted replaced
3414:25c670081761 3415:b8f929bff7e3
1035 id_, params = _build_data(self.apikey, 'create_users_group', 1035 id_, params = _build_data(self.apikey, 'create_users_group',
1036 group_name=group_name) 1036 group_name=group_name)
1037 response = api_call(self, params) 1037 response = api_call(self, params)
1038 1038
1039 ret = { 1039 ret = {
1040 'msg': 'created new users group `%s`' % group_name, 1040 'msg': 'created new user group `%s`' % group_name,
1041 'users_group': jsonify(UsersGroupModel()\ 1041 'users_group': jsonify(UsersGroupModel()\
1042 .get_by_name(group_name)\ 1042 .get_by_name(group_name)\
1043 .get_api_data()) 1043 .get_api_data())
1044 } 1044 }
1045 expected = ret 1045 expected = ret
1050 def test_api_get_users_group_that_exist(self): 1050 def test_api_get_users_group_that_exist(self):
1051 id_, params = _build_data(self.apikey, 'create_users_group', 1051 id_, params = _build_data(self.apikey, 'create_users_group',
1052 group_name=TEST_USERS_GROUP) 1052 group_name=TEST_USERS_GROUP)
1053 response = api_call(self, params) 1053 response = api_call(self, params)
1054 1054
1055 expected = "users group `%s` already exist" % TEST_USERS_GROUP 1055 expected = "user group `%s` already exist" % TEST_USERS_GROUP
1056 self._compare_error(id_, expected, given=response.body) 1056 self._compare_error(id_, expected, given=response.body)
1057 1057
1058 @mock.patch.object(UsersGroupModel, 'create', crash) 1058 @mock.patch.object(UsersGroupModel, 'create', crash)
1059 def test_api_get_users_group_exception_occurred(self): 1059 def test_api_get_users_group_exception_occurred(self):
1060 group_name = 'exception_happens' 1060 group_name = 'exception_happens'
1073 usersgroupid=gr_name, 1073 usersgroupid=gr_name,
1074 userid=TEST_USER_ADMIN_LOGIN) 1074 userid=TEST_USER_ADMIN_LOGIN)
1075 response = api_call(self, params) 1075 response = api_call(self, params)
1076 1076
1077 expected = { 1077 expected = {
1078 'msg': 'added member `%s` to users group `%s`' % ( 1078 'msg': 'added member `%s` to user group `%s`' % (
1079 TEST_USER_ADMIN_LOGIN, gr_name 1079 TEST_USER_ADMIN_LOGIN, gr_name
1080 ), 1080 ),
1081 'success': True} 1081 'success': True}
1082 self._compare_ok(id_, expected, given=response.body) 1082 self._compare_ok(id_, expected, given=response.body)
1083 1083
1088 id_, params = _build_data(self.apikey, 'add_user_to_users_group', 1088 id_, params = _build_data(self.apikey, 'add_user_to_users_group',
1089 usersgroupid='false-group', 1089 usersgroupid='false-group',
1090 userid=TEST_USER_ADMIN_LOGIN) 1090 userid=TEST_USER_ADMIN_LOGIN)
1091 response = api_call(self, params) 1091 response = api_call(self, params)
1092 1092
1093 expected = 'users group `%s` does not exist' % 'false-group' 1093 expected = 'user group `%s` does not exist' % 'false-group'
1094 self._compare_error(id_, expected, given=response.body) 1094 self._compare_error(id_, expected, given=response.body)
1095 1095
1096 @mock.patch.object(UsersGroupModel, 'add_user_to_group', crash) 1096 @mock.patch.object(UsersGroupModel, 'add_user_to_group', crash)
1097 def test_api_add_user_to_users_group_exception_occurred(self): 1097 def test_api_add_user_to_users_group_exception_occurred(self):
1098 gr_name = 'test_group' 1098 gr_name = 'test_group'
1101 id_, params = _build_data(self.apikey, 'add_user_to_users_group', 1101 id_, params = _build_data(self.apikey, 'add_user_to_users_group',
1102 usersgroupid=gr_name, 1102 usersgroupid=gr_name,
1103 userid=TEST_USER_ADMIN_LOGIN) 1103 userid=TEST_USER_ADMIN_LOGIN)
1104 response = api_call(self, params) 1104 response = api_call(self, params)
1105 1105
1106 expected = 'failed to add member to users group `%s`' % gr_name 1106 expected = 'failed to add member to user group `%s`' % gr_name
1107 self._compare_error(id_, expected, given=response.body) 1107 self._compare_error(id_, expected, given=response.body)
1108 1108
1109 UsersGroupModel().delete(users_group=gr_name) 1109 UsersGroupModel().delete(users_group=gr_name)
1110 Session().commit() 1110 Session().commit()
1111 1111
1118 usersgroupid=gr_name, 1118 usersgroupid=gr_name,
1119 userid=TEST_USER_ADMIN_LOGIN) 1119 userid=TEST_USER_ADMIN_LOGIN)
1120 response = api_call(self, params) 1120 response = api_call(self, params)
1121 1121
1122 expected = { 1122 expected = {
1123 'msg': 'removed member `%s` from users group `%s`' % ( 1123 'msg': 'removed member `%s` from user group `%s`' % (
1124 TEST_USER_ADMIN_LOGIN, gr_name 1124 TEST_USER_ADMIN_LOGIN, gr_name
1125 ), 1125 ),
1126 'success': True} 1126 'success': True}
1127 self._compare_ok(id_, expected, given=response.body) 1127 self._compare_ok(id_, expected, given=response.body)
1128 1128
1138 id_, params = _build_data(self.apikey, 'remove_user_from_users_group', 1138 id_, params = _build_data(self.apikey, 'remove_user_from_users_group',
1139 usersgroupid=gr_name, 1139 usersgroupid=gr_name,
1140 userid=TEST_USER_ADMIN_LOGIN) 1140 userid=TEST_USER_ADMIN_LOGIN)
1141 response = api_call(self, params) 1141 response = api_call(self, params)
1142 1142
1143 expected = 'failed to remove member from users group `%s`' % gr_name 1143 expected = 'failed to remove member from user group `%s`' % gr_name
1144 self._compare_error(id_, expected, given=response.body) 1144 self._compare_error(id_, expected, given=response.body)
1145 1145
1146 UsersGroupModel().delete(users_group=gr_name) 1146 UsersGroupModel().delete(users_group=gr_name)
1147 Session().commit() 1147 Session().commit()
1148 1148
1227 usersgroupid=TEST_USERS_GROUP, 1227 usersgroupid=TEST_USERS_GROUP,
1228 perm=perm) 1228 perm=perm)
1229 response = api_call(self, params) 1229 response = api_call(self, params)
1230 1230
1231 ret = { 1231 ret = {
1232 'msg': 'Granted perm: `%s` for users group: `%s` in repo: `%s`' % ( 1232 'msg': 'Granted perm: `%s` for user group: `%s` in repo: `%s`' % (
1233 perm, TEST_USERS_GROUP, self.REPO 1233 perm, TEST_USERS_GROUP, self.REPO
1234 ), 1234 ),
1235 'success': True 1235 'success': True
1236 } 1236 }
1237 expected = ret 1237 expected = ret
1255 repoid=self.REPO, 1255 repoid=self.REPO,
1256 usersgroupid=TEST_USERS_GROUP, 1256 usersgroupid=TEST_USERS_GROUP,
1257 perm=perm) 1257 perm=perm)
1258 response = api_call(self, params) 1258 response = api_call(self, params)
1259 1259
1260 expected = 'failed to edit permission for users group: `%s` in repo: `%s`' % ( 1260 expected = 'failed to edit permission for user group: `%s` in repo: `%s`' % (
1261 TEST_USERS_GROUP, self.REPO 1261 TEST_USERS_GROUP, self.REPO
1262 ) 1262 )
1263 self._compare_error(id_, expected, given=response.body) 1263 self._compare_error(id_, expected, given=response.body)
1264 1264
1265 def test_api_revoke_users_group_permission(self): 1265 def test_api_revoke_users_group_permission(self):
1271 repoid=self.REPO, 1271 repoid=self.REPO,
1272 usersgroupid=TEST_USERS_GROUP,) 1272 usersgroupid=TEST_USERS_GROUP,)
1273 response = api_call(self, params) 1273 response = api_call(self, params)
1274 1274
1275 expected = { 1275 expected = {
1276 'msg': 'Revoked perm for users group: `%s` in repo: `%s`' % ( 1276 'msg': 'Revoked perm for user group: `%s` in repo: `%s`' % (
1277 TEST_USERS_GROUP, self.REPO 1277 TEST_USERS_GROUP, self.REPO
1278 ), 1278 ),
1279 'success': True 1279 'success': True
1280 } 1280 }
1281 self._compare_ok(id_, expected, given=response.body) 1281 self._compare_ok(id_, expected, given=response.body)
1286 id_, params = _build_data(self.apikey, 'revoke_users_group_permission', 1286 id_, params = _build_data(self.apikey, 'revoke_users_group_permission',
1287 repoid=self.REPO, 1287 repoid=self.REPO,
1288 usersgroupid=TEST_USERS_GROUP,) 1288 usersgroupid=TEST_USERS_GROUP,)
1289 response = api_call(self, params) 1289 response = api_call(self, params)
1290 1290
1291 expected = 'failed to edit permission for users group: `%s` in repo: `%s`' % ( 1291 expected = 'failed to edit permission for user group: `%s` in repo: `%s`' % (
1292 TEST_USERS_GROUP, self.REPO 1292 TEST_USERS_GROUP, self.REPO
1293 ) 1293 )
1294 self._compare_error(id_, expected, given=response.body) 1294 self._compare_error(id_, expected, given=response.body)