core: run ruff format
This commit is contained in:
parent
7130effb58
commit
166db21812
821 changed files with 82905 additions and 84121 deletions
|
|
@ -22,41 +22,39 @@ import pytest
|
|||
from rhodecode.model.db import User
|
||||
from rhodecode.model.user import UserModel
|
||||
from rhodecode.tests import TEST_USER_ADMIN_LOGIN
|
||||
from rhodecode.api.tests.utils import (
|
||||
build_data, api_call, assert_ok, assert_error, crash, jsonify)
|
||||
from rhodecode.api.tests.utils import build_data, api_call, assert_ok, assert_error, crash, jsonify
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("testuser_api", "app")
|
||||
class TestUpdateUser(object):
|
||||
@pytest.mark.parametrize("name, expected", [
|
||||
('firstname', 'new_username'),
|
||||
('lastname', 'new_username'),
|
||||
('email', 'new_username'),
|
||||
('admin', True),
|
||||
('admin', False),
|
||||
('extern_type', 'ldap'),
|
||||
('extern_type', None),
|
||||
('extern_name', 'test'),
|
||||
('extern_name', None),
|
||||
('active', False),
|
||||
('active', True),
|
||||
('password', 'newpass'),
|
||||
('description', 'CTO 4 Life')
|
||||
])
|
||||
@pytest.mark.parametrize(
|
||||
"name, expected",
|
||||
[
|
||||
("firstname", "new_username"),
|
||||
("lastname", "new_username"),
|
||||
("email", "new_username"),
|
||||
("admin", True),
|
||||
("admin", False),
|
||||
("extern_type", "ldap"),
|
||||
("extern_type", None),
|
||||
("extern_name", "test"),
|
||||
("extern_name", None),
|
||||
("active", False),
|
||||
("active", True),
|
||||
("password", "newpass"),
|
||||
("description", "CTO 4 Life"),
|
||||
],
|
||||
)
|
||||
def test_api_update_user(self, name, expected, user_util):
|
||||
usr = user_util.create_user()
|
||||
|
||||
kw = {name: expected, 'userid': usr.user_id}
|
||||
id_, params = build_data(self.apikey, 'update_user', **kw)
|
||||
kw = {name: expected, "userid": usr.user_id}
|
||||
id_, params = build_data(self.apikey, "update_user", **kw)
|
||||
response = api_call(self.app, params)
|
||||
|
||||
ret = {
|
||||
'msg': 'updated user ID:%s %s' % (usr.user_id, usr.username),
|
||||
'user': jsonify(
|
||||
UserModel()
|
||||
.get_by_username(usr.username)
|
||||
.get_api_data(include_secrets=True)
|
||||
)
|
||||
"msg": "updated user ID:%s %s" % (usr.user_id, usr.username),
|
||||
"user": jsonify(UserModel().get_by_username(usr.username).get_api_data(include_secrets=True)),
|
||||
}
|
||||
|
||||
expected = ret
|
||||
|
|
@ -65,55 +63,41 @@ class TestUpdateUser(object):
|
|||
def test_api_update_user_no_changed_params(self):
|
||||
usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
|
||||
ret = jsonify(usr.get_api_data(include_secrets=True))
|
||||
id_, params = build_data(
|
||||
self.apikey, 'update_user', userid=TEST_USER_ADMIN_LOGIN)
|
||||
id_, params = build_data(self.apikey, "update_user", userid=TEST_USER_ADMIN_LOGIN)
|
||||
|
||||
response = api_call(self.app, params)
|
||||
ret = {
|
||||
'msg': 'updated user ID:%s %s' % (
|
||||
usr.user_id, TEST_USER_ADMIN_LOGIN),
|
||||
'user': ret
|
||||
}
|
||||
ret = {"msg": "updated user ID:%s %s" % (usr.user_id, TEST_USER_ADMIN_LOGIN), "user": ret}
|
||||
expected = ret
|
||||
expected['user']['last_activity'] = response.json['result']['user'][
|
||||
'last_activity']
|
||||
expected["user"]["last_activity"] = response.json["result"]["user"]["last_activity"]
|
||||
assert_ok(id_, expected, given=response.body)
|
||||
|
||||
def test_api_update_user_by_user_id(self):
|
||||
usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
|
||||
ret = jsonify(usr.get_api_data(include_secrets=True))
|
||||
id_, params = build_data(
|
||||
self.apikey, 'update_user', userid=usr.user_id)
|
||||
id_, params = build_data(self.apikey, "update_user", userid=usr.user_id)
|
||||
|
||||
response = api_call(self.app, params)
|
||||
ret = {
|
||||
'msg': 'updated user ID:%s %s' % (
|
||||
usr.user_id, TEST_USER_ADMIN_LOGIN),
|
||||
'user': ret
|
||||
}
|
||||
ret = {"msg": "updated user ID:%s %s" % (usr.user_id, TEST_USER_ADMIN_LOGIN), "user": ret}
|
||||
expected = ret
|
||||
expected['user']['last_activity'] = response.json['result']['user'][
|
||||
'last_activity']
|
||||
expected["user"]["last_activity"] = response.json["result"]["user"]["last_activity"]
|
||||
assert_ok(id_, expected, given=response.body)
|
||||
|
||||
def test_api_update_user_default_user(self):
|
||||
usr = User.get_default_user()
|
||||
id_, params = build_data(
|
||||
self.apikey, 'update_user', userid=usr.user_id)
|
||||
id_, params = build_data(self.apikey, "update_user", userid=usr.user_id)
|
||||
|
||||
response = api_call(self.app, params)
|
||||
expected = 'editing default user is forbidden'
|
||||
expected = "editing default user is forbidden"
|
||||
assert_error(id_, expected, given=response.body)
|
||||
|
||||
@mock.patch.object(UserModel, 'update_user', crash)
|
||||
@mock.patch.object(UserModel, "update_user", crash)
|
||||
def test_api_update_user_when_exception_happens(self):
|
||||
usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
|
||||
ret = jsonify(usr.get_api_data(include_secrets=True))
|
||||
id_, params = build_data(
|
||||
self.apikey, 'update_user', userid=usr.user_id)
|
||||
id_, params = build_data(self.apikey, "update_user", userid=usr.user_id)
|
||||
|
||||
response = api_call(self.app, params)
|
||||
ret = 'failed to update user `%s`' % (usr.user_id,)
|
||||
ret = "failed to update user `%s`" % (usr.user_id,)
|
||||
|
||||
expected = ret
|
||||
assert_error(id_, expected, given=response.body)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue