tests: code style and PEP8 (#32140)
This commit is contained in:
parent
901d40798b
commit
279788672a
|
|
@ -18,6 +18,10 @@ from utils import login, get_link_from_mail
|
|||
|
||||
pytestmark = pytest.mark.django_db
|
||||
|
||||
OU = get_ou_model()
|
||||
User = get_user_model()
|
||||
Role = get_role_model()
|
||||
|
||||
|
||||
def test_manager_login(superuser_or_admin, app):
|
||||
manager_home_page = login(app, superuser_or_admin, reverse('a2-manager-homepage'))
|
||||
|
|
@ -37,8 +41,6 @@ def test_manager_login(superuser_or_admin, app):
|
|||
|
||||
|
||||
def test_manager_create_ou(superuser_or_admin, app):
|
||||
OU = get_ou_model()
|
||||
|
||||
ou_add = login(app, superuser_or_admin, path=reverse('a2-manager-ou-add'))
|
||||
form = ou_add.form
|
||||
form.set('name', 'New OU')
|
||||
|
|
@ -62,9 +64,6 @@ def test_manager_create_role(superuser_or_admin, app):
|
|||
from authentic2.manager.utils import get_ou_count
|
||||
get_ou_count.cache.cache = {}
|
||||
|
||||
Role = get_role_model()
|
||||
OU = get_ou_model()
|
||||
|
||||
non_admin_roles = Role.objects.exclude(slug__startswith='_')
|
||||
|
||||
ou_add = login(app, superuser_or_admin, reverse('a2-manager-role-add'))
|
||||
|
|
@ -78,13 +77,13 @@ def test_manager_create_role(superuser_or_admin, app):
|
|||
role = non_admin_roles.get()
|
||||
assert response.request.path == reverse('a2-manager-role-members', kwargs={'pk': role.pk})
|
||||
role_list = app.get(reverse('a2-manager-roles'))
|
||||
assert 'New role' in role_list
|
||||
assert 'New role' in role_list
|
||||
|
||||
# Test slug collision
|
||||
non_admin_roles.update(name='Old role')
|
||||
response = form.submit().follow()
|
||||
role_list = app.get(reverse('a2-manager-roles'))
|
||||
assert 'New role' in role_list
|
||||
assert 'New role' in role_list
|
||||
assert 'Old role' in role_list
|
||||
assert non_admin_roles.count() == 2
|
||||
assert non_admin_roles.get(name='New role').slug == 'new-role1'
|
||||
|
|
@ -135,9 +134,6 @@ def test_manager_user_edit_by_uuid(app, superuser, simple_user):
|
|||
|
||||
|
||||
def test_manager_stress_create_user(superuser_or_admin, app, mailoutbox):
|
||||
User = get_user_model()
|
||||
OU = get_ou_model()
|
||||
|
||||
new_ou = OU.objects.create(name='new ou', slug='new-ou')
|
||||
url = reverse('a2-manager-user-add', kwargs={'ou_pk': new_ou.pk})
|
||||
# create first user with john.doe@gmail.com ou OU1 : OK
|
||||
|
|
@ -160,7 +156,6 @@ def test_manager_stress_create_user(superuser_or_admin, app, mailoutbox):
|
|||
|
||||
|
||||
def test_role_members_from_ou(app, superuser, settings):
|
||||
Role = get_role_model()
|
||||
r = Role.objects.create(name='role', slug='role', ou=get_default_ou())
|
||||
url = reverse('a2-manager-role-members', kwargs={'pk': r.pk})
|
||||
response = login(app, superuser, url)
|
||||
|
|
@ -171,7 +166,6 @@ def test_role_members_from_ou(app, superuser, settings):
|
|||
|
||||
|
||||
def test_role_members_show_all_ou(app, superuser, settings):
|
||||
Role = get_role_model()
|
||||
r = Role.objects.create(name='role', slug='role', ou=get_default_ou())
|
||||
url = reverse('a2-manager-role-members', kwargs={'pk': r.pk})
|
||||
response = login(app, superuser, url)
|
||||
|
|
@ -186,8 +180,6 @@ def test_manager_create_user(superuser_or_admin, app, settings):
|
|||
from authentic2.manager.utils import get_ou_count
|
||||
get_ou_count.cache.clear()
|
||||
|
||||
User = get_user_model()
|
||||
OU = get_ou_model()
|
||||
ou1 = OU.objects.create(name='OU1', slug='ou1')
|
||||
ou2 = OU.objects.create(name='OU2', slug='ou2', email_is_unique=True)
|
||||
|
||||
|
|
@ -292,6 +284,7 @@ def test_manager_create_user(superuser_or_admin, app, settings):
|
|||
resp = app.get(url1)
|
||||
assert urlparse(resp['Location']).path == url2
|
||||
|
||||
|
||||
def test_app_setting_login_url(app, settings):
|
||||
settings.A2_MANAGER_LOGIN_URL = '/other_login/'
|
||||
response = app.get('/manage/')
|
||||
|
|
@ -567,8 +560,6 @@ def test_manager_many_ou_auto_admin_role(app, ou1, admin, user_with_auto_admin_r
|
|||
|
||||
|
||||
def test_manager_search_user(app, admin, simple_role, settings):
|
||||
User = get_user_model()
|
||||
OU = get_ou_model()
|
||||
default_ou = OU.objects.get()
|
||||
User.objects.create(username='user1', ou=default_ou)
|
||||
response = login(app, admin, '/manage/users/')
|
||||
|
|
@ -641,7 +632,7 @@ def test_manager_site_import(app, db, superuser):
|
|||
'site_export.json', json.dumps(site_export).encode('ascii'), 'application/octet-stream')
|
||||
res = form.submit()
|
||||
assert res.status_code == 302
|
||||
assert get_role_model().objects.get(slug='basic')
|
||||
assert Role.objects.get(slug='basic')
|
||||
|
||||
|
||||
def test_manager_site_import_error(app, db, superuser):
|
||||
|
|
@ -667,7 +658,6 @@ def test_manager_site_import_error(app, db, superuser):
|
|||
res = form.submit()
|
||||
assert res.status_code == 200
|
||||
assert 'missing Organizational Unit' in res.text
|
||||
Role = get_role_model()
|
||||
with pytest.raises(Role.DoesNotExist):
|
||||
Role.objects.get(slug='basic')
|
||||
|
||||
|
|
@ -695,8 +685,6 @@ def test_manager_homepage_import_export_hidden(admin, app):
|
|||
|
||||
|
||||
def test_manager_ou(app, superuser_or_admin, ou1):
|
||||
OU = get_ou_model()
|
||||
|
||||
manager_home_page = login(app, superuser_or_admin, reverse('a2-manager-homepage'))
|
||||
ou_homepage = manager_home_page.click(href='organizational-units')
|
||||
assert set([e.text for e in ou_homepage.pyquery('td.name')]) == set(['OU1', 'Default organizational unit'])
|
||||
|
|
@ -772,8 +760,8 @@ def test_manager_create_user_next_form_error(superuser_or_admin, app, ou1):
|
|||
form = response.form
|
||||
form.set('first_name', 'John')
|
||||
form.set('last_name', 'Doe')
|
||||
form.set('email', 'jd') # erroneous
|
||||
form.set('password1', 'notvalid') # erroneous
|
||||
form.set('email', 'jd') # erroneous
|
||||
form.set('password1', 'notvalid') # erroneous
|
||||
assert '<input type="hidden" name="next" value="%s">' % next_url in form.submit().body
|
||||
|
||||
|
||||
|
|
@ -813,15 +801,12 @@ def test_manager_edit_user_next_form_error(superuser_or_admin, app, ou1, simple_
|
|||
|
||||
def test_roles_widget(admin, app, db):
|
||||
from django.core import signing
|
||||
from django_rbac.utils import get_role_model, get_ou_model
|
||||
from authentic2.manager.forms import ChooseRoleForm
|
||||
|
||||
login(app, admin, '/manage/')
|
||||
OU = get_ou_model()
|
||||
cassis = OU.objects.create(name=u'Cassis')
|
||||
la_bedoule = OU.objects.create(name=u'La Bédoule')
|
||||
cuges = OU.objects.create(name=u'Cuges')
|
||||
Role = get_role_model()
|
||||
Role.objects.create(ou=cassis, name=u'Administrateur')
|
||||
Role.objects.create(ou=la_bedoule, name=u'Administrateur')
|
||||
Role.objects.create(ou=cuges, name=u'Administrateur')
|
||||
|
|
@ -842,20 +827,19 @@ def test_roles_widget(admin, app, db):
|
|||
|
||||
def test_user_add_settings(settings, admin, app, db):
|
||||
passwd_options = ('generate_password', 'reset_password_at_next_login',
|
||||
'send_mail', 'send_password_reset')
|
||||
for policy in [choice[0] for choice in get_ou_model().USER_ADD_PASSWD_POLICY_CHOICES]:
|
||||
'send_mail', 'send_password_reset')
|
||||
for policy in [choice[0] for choice in OU.USER_ADD_PASSWD_POLICY_CHOICES]:
|
||||
ou = get_default_ou()
|
||||
ou.user_add_password_policy = policy
|
||||
ou.save()
|
||||
user_add = login(app, admin, '/manage/users/add/').follow()
|
||||
for option, i in zip(passwd_options, range(4)):
|
||||
assert user_add.form.get(option).value == {False:None, True:'on'}. \
|
||||
get(get_ou_model().USER_ADD_PASSWD_POLICY_VALUES[policy][i])
|
||||
assert (user_add.form.get(option).value
|
||||
== {False: None, True: 'on'}.get(OU.USER_ADD_PASSWD_POLICY_VALUES[policy][i]))
|
||||
app.get('/logout/').form.submit()
|
||||
|
||||
|
||||
def test_ou_hide_username(admin, app, db):
|
||||
OU = get_ou_model()
|
||||
some_ou = OU.objects.create(name=u'Some Ou', show_username=False)
|
||||
|
||||
login(app, admin, '/manage/')
|
||||
|
|
@ -872,7 +856,6 @@ def test_ou_hide_username(admin, app, db):
|
|||
form.set('password2', 'ABcd1234')
|
||||
form.submit()
|
||||
|
||||
User = get_user_model()
|
||||
assert User.objects.get(email='john.doe@gmail.com')
|
||||
|
||||
|
||||
|
|
@ -882,7 +865,6 @@ def test_manager_edit_user_email_verified(app, simple_user, superuser_or_admin):
|
|||
|
||||
url = u'/manage/users/%s/edit/' % simple_user.pk
|
||||
login(app, superuser_or_admin, '/manage/')
|
||||
User = get_user_model()
|
||||
|
||||
user = User.objects.get(id=simple_user.id)
|
||||
assert user.email_verified
|
||||
|
|
|
|||
Loading…
Reference in New Issue