This commit is contained in:
Jens L
2020-09-11 23:21:11 +02:00
committed by GitHub
parent 3f5d30e6fe
commit 23cccebb96
59 changed files with 403 additions and 254 deletions

View File

@ -2,7 +2,7 @@
from django.conf import settings
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -50,6 +50,6 @@ class TestCaptchaStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -3,7 +3,7 @@ from time import sleep
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import Application, User
from passbook.core.tasks import clean_expired_models
@ -49,7 +49,7 @@ class TestConsentStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
self.assertFalse(UserConsent.objects.filter(user=self.user).exists())
@ -80,7 +80,7 @@ class TestConsentStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
self.assertTrue(
@ -117,7 +117,7 @@ class TestConsentStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
self.assertTrue(

View File

@ -1,7 +1,7 @@
"""dummy tests"""
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.models import Flow, FlowDesignation, FlowStageBinding
@ -44,7 +44,7 @@ class TestDummyStage(TestCase):
response = self.client.post(url, {})
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -4,7 +4,7 @@ from unittest.mock import MagicMock, patch
from django.core import mail
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import Token, User
from passbook.flows.markers import StageMarker
@ -114,7 +114,7 @@ class TestEmailStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -1,7 +1,7 @@
"""identification tests"""
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.models import Flow, FlowDesignation, FlowStageBinding
@ -56,7 +56,7 @@ class TestIdentificationStage(TestCase):
response = self.client.post(url, form_data)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
@ -101,7 +101,7 @@ class TestIdentificationStage(TestCase):
),
)
self.assertEqual(response.status_code, 200)
self.assertIn(flow.slug, force_text(response.content))
self.assertIn(flow.slug, force_str(response.content))
def test_recovery_flow(self):
"""Test that recovery flow is linked correctly"""
@ -122,4 +122,4 @@ class TestIdentificationStage(TestCase):
),
)
self.assertEqual(response.status_code, 200)
self.assertIn(flow.slug, force_text(response.content))
self.assertIn(flow.slug, force_str(response.content))

View File

@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from guardian.shortcuts import get_anonymous_user
from passbook.core.models import User
@ -59,7 +59,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)
@ -86,7 +86,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
@ -125,6 +125,6 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -2,7 +2,7 @@
from typing import Any, Dict
from django.http import HttpRequest, HttpResponse
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from django.views.generic import FormView
from django_otp.plugins.otp_totp.models import TOTPDevice
from lxml.etree import tostring # nosec
@ -35,7 +35,7 @@ class OTPTimeStageView(FormView, StageView):
"""Get QR Code SVG as string based on `device`"""
qr_code = QRCode(image_factory=SvgFillImage)
qr_code.add_data(device.config_url)
return force_text(tostring(qr_code.make_image().get_image()))
return force_str(tostring(qr_code.make_image().get_image()))
def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
user = self.executor.plan.context.get(PLAN_CONTEXT_PENDING_USER)

View File

@ -6,7 +6,7 @@ from unittest.mock import MagicMock, patch
from django.core.exceptions import PermissionDenied
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -61,7 +61,7 @@ class TestPasswordStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)
@ -84,7 +84,7 @@ class TestPasswordStage(TestCase):
),
)
self.assertEqual(response.status_code, 200)
self.assertIn(flow.slug, force_text(response.content))
self.assertIn(flow.slug, force_str(response.content))
def test_valid_password(self):
"""Test with a valid pending user and valid password"""
@ -106,7 +106,7 @@ class TestPasswordStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
@ -154,6 +154,6 @@ class TestPasswordStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)

View File

@ -3,7 +3,7 @@ from unittest.mock import MagicMock, patch
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -110,9 +110,9 @@ class TestPromptStage(TestCase):
)
self.assertEqual(response.status_code, 200)
for prompt in self.stage.fields.all():
self.assertIn(prompt.field_key, force_text(response.content))
self.assertIn(prompt.label, force_text(response.content))
self.assertIn(prompt.placeholder, force_text(response.content))
self.assertIn(prompt.field_key, force_str(response.content))
self.assertIn(prompt.label, force_str(response.content))
self.assertIn(prompt.placeholder, force_str(response.content))
def test_valid_form_with_policy(self) -> PromptForm:
"""Test form validation"""
@ -164,7 +164,7 @@ class TestPromptStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -1,7 +1,7 @@
"""delete tests"""
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -44,7 +44,7 @@ class TestUserDeleteStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)
@ -83,7 +83,7 @@ class TestUserDeleteStage(TestCase):
)
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -1,7 +1,7 @@
"""login tests"""
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -50,7 +50,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
@ -71,7 +71,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)
@ -93,7 +93,7 @@ class TestUserLoginStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)

View File

@ -1,7 +1,7 @@
"""logout tests"""
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -50,7 +50,7 @@ class TestUserLogoutStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)

View File

@ -4,7 +4,7 @@ from random import SystemRandom
from django.shortcuts import reverse
from django.test import Client, TestCase
from django.utils.encoding import force_text
from django.utils.encoding import force_str
from passbook.core.models import User
from passbook.flows.markers import StageMarker
@ -59,7 +59,7 @@ class TestUserWriteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
user_qs = User.objects.filter(
@ -97,7 +97,7 @@ class TestUserWriteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_core:overview")},
)
user_qs = User.objects.filter(
@ -124,7 +124,7 @@ class TestUserWriteStage(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(
force_text(response.content),
force_str(response.content),
{"type": "redirect", "to": reverse("passbook_flows:denied")},
)