From 0c28fe44b56f20146c564bcbeff967a2a9b54109 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 28 May 2020 15:05:37 +0200 Subject: [PATCH 2/2] tests: check for actual widget choices (#41939) --- tests/test_manager.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/test_manager.py b/tests/test_manager.py index 40c2406e..12cb6759 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -167,24 +167,22 @@ def test_manager_stress_create_user(superuser_or_admin, app, mailoutbox): assert len(mailoutbox) == 100 -def test_role_members_from_ou(app, superuser, settings): +def test_role_members_from_ou(app, superuser, simple_user, settings): + assert superuser.ou is None and simple_user.ou == get_default_ou() 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) - assert not response.context['form'].fields['user'].queryset.query.where - settings.A2_MANAGER_ROLE_MEMBERS_FROM_OU = True - response = app.get(url) - assert response.context['form'].fields['user'].queryset.query.where - -def test_role_members_show_all_ou(app, superuser, settings): - 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) assert not response.context['form'].fields['user'].queryset.query.where + select2_json = request_select2(app, response) + assert len(select2_json['results']) == 2 + settings.A2_MANAGER_ROLE_MEMBERS_FROM_OU = True response = app.get(url) assert response.context['form'].fields['user'].queryset.query.where + select2_json = request_select2(app, response) + assert len(select2_json['results']) == 1 + assert select2_json['results'][0]['id'] == simple_user.pk def test_manager_create_user(superuser_or_admin, app, settings): -- 2.20.1