diff --git a/authentik/providers/scim/tests/test_membership.py b/authentik/providers/scim/tests/test_membership.py index 07190247d1..6d9eb8dab2 100644 --- a/authentik/providers/scim/tests/test_membership.py +++ b/authentik/providers/scim/tests/test_membership.py @@ -2,7 +2,6 @@ from django.test import TestCase from requests_mock import Mocker -from structlog.stdlib import get_logger from authentik.blueprints.tests import apply_blueprint from authentik.core.models import Application, Group, User @@ -13,9 +12,6 @@ from authentik.providers.scim.tasks import scim_sync from authentik.tenants.models import Tenant -LOGGER = get_logger() - - class SCIMMembershipTests(TestCase): """SCIM Membership tests""" @@ -85,20 +81,13 @@ class SCIMMembershipTests(TestCase): self.configure() scim_sync.send(self.provider.pk) - i = 0 - for request in mocker.request_history: - LOGGER.warning(f"request {i}", method=request.method, url=request.url) - i += 1 - - self.assertEqual(mocker.call_count, 6) + self.assertEqual(mocker.call_count, 4) self.assertEqual(mocker.request_history[0].method, "GET") - self.assertEqual(mocker.request_history[1].method, "GET") + self.assertEqual(mocker.request_history[1].method, "POST") self.assertEqual(mocker.request_history[2].method, "GET") self.assertEqual(mocker.request_history[3].method, "POST") - self.assertEqual(mocker.request_history[4].method, "GET") - self.assertEqual(mocker.request_history[5].method, "POST") self.assertJSONEqual( - mocker.request_history[3].body, + mocker.request_history[1].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:User"], "emails": [], @@ -110,7 +99,7 @@ class SCIMMembershipTests(TestCase): }, ) self.assertJSONEqual( - mocker.request_history[5].body, + mocker.request_history[3].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:Group"], "externalId": str(group.pk), @@ -180,15 +169,13 @@ class SCIMMembershipTests(TestCase): self.configure() scim_sync.send(self.provider.pk) - self.assertEqual(mocker.call_count, 6) + self.assertEqual(mocker.call_count, 4) self.assertEqual(mocker.request_history[0].method, "GET") - self.assertEqual(mocker.request_history[1].method, "GET") + self.assertEqual(mocker.request_history[1].method, "POST") self.assertEqual(mocker.request_history[2].method, "GET") self.assertEqual(mocker.request_history[3].method, "POST") - self.assertEqual(mocker.request_history[4].method, "GET") - self.assertEqual(mocker.request_history[5].method, "POST") self.assertJSONEqual( - mocker.request_history[3].body, + mocker.request_history[1].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:User"], "active": True, @@ -200,7 +187,7 @@ class SCIMMembershipTests(TestCase): }, ) self.assertJSONEqual( - mocker.request_history[5].body, + mocker.request_history[3].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:Group"], "externalId": str(group.pk), @@ -298,15 +285,13 @@ class SCIMMembershipTests(TestCase): self.configure() scim_sync.send(self.provider.pk) - self.assertEqual(mocker.call_count, 6) + self.assertEqual(mocker.call_count, 4) self.assertEqual(mocker.request_history[0].method, "GET") - self.assertEqual(mocker.request_history[1].method, "GET") + self.assertEqual(mocker.request_history[1].method, "POST") self.assertEqual(mocker.request_history[2].method, "GET") self.assertEqual(mocker.request_history[3].method, "POST") - self.assertEqual(mocker.request_history[4].method, "GET") - self.assertEqual(mocker.request_history[5].method, "POST") self.assertJSONEqual( - mocker.request_history[3].body, + mocker.request_history[1].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:User"], "emails": [], @@ -318,7 +303,7 @@ class SCIMMembershipTests(TestCase): }, ) self.assertJSONEqual( - mocker.request_history[5].body, + mocker.request_history[3].body, { "schemas": ["urn:ietf:params:scim:schemas:core:2.0:Group"], "externalId": str(group.pk),