diff --git a/stregsystem/tests.py b/stregsystem/tests.py index 49baf52e..106126db 100644 --- a/stregsystem/tests.py +++ b/stregsystem/tests.py @@ -47,8 +47,8 @@ from stregsystem.purchase_heatmap import prepare_heatmap_template_context from stregsystem.templatetags.stregsystem_extras import caffeine_emoji_render from stregsystem.utils import ( - mobile_payment_exact_match_member, - strip_emoji, + mobile_payment_exact_match_member, + strip_emoji, PaymentToolException, insert_gdpr_span, ) @@ -2289,25 +2289,22 @@ def test_welcome_mail_paid_approved(self, mock_mail_method: MagicMock): signup_request.approve() mock_mail_method.assert_called_once() + class MiscUtilTests(TestCase): fixtures = ['initial_data'] def test_gdpr_is_inserted(self): assumed_user = "jokke" assumed_non_user = "nonuser" - + simple_quickbuy = assumed_user simple_gdpr_quickbuy = insert_gdpr_span(simple_quickbuy) - expected_simple_gdpr_quickbuy = ( - '' + assumed_user + '' - ) + expected_simple_gdpr_quickbuy = '' + assumed_user + '' self.assertEqual(simple_gdpr_quickbuy, expected_simple_gdpr_quickbuy) advanced_quickbuy = assumed_user + " " + assumed_non_user advanced_gdpr_quickbuy = insert_gdpr_span(advanced_quickbuy) - expected_advanced_gdpr_quickbuy = ( - '' + assumed_user + ' ' + assumed_non_user - ) + expected_advanced_gdpr_quickbuy = '' + assumed_user + ' ' + assumed_non_user self.assertEqual(advanced_gdpr_quickbuy, expected_advanced_gdpr_quickbuy) diff --git a/stregsystem/utils.py b/stregsystem/utils.py index f50ff983..9c8c1c05 100644 --- a/stregsystem/utils.py +++ b/stregsystem/utils.py @@ -179,6 +179,7 @@ def mobilepay_launch_uri(comment: str, amount: float) -> str: return 'mobilepay://send?{}'.format(urllib.parse.urlencode(query)) + def insert_gdpr_span(text: str) -> str: from stregsystem.models import Member @@ -190,10 +191,8 @@ def insert_gdpr_span(text: str) -> str: parts[i] = '' + part + '' except Member.DoesNotExist: continue - - return " ".join(parts) - + return " ".join(parts) class stregsystemTestRunner(DiscoverRunner):