diff --git a/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseDefaultScenarioMixin.py b/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseDefaultScenarioMixin.py index aebd606c2a23da0c7b84a0f8e3865d914266ac51..36c116487128bffaf217997672ba963830e1aa63 100644 --- a/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseDefaultScenarioMixin.py +++ b/master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseDefaultScenarioMixin.py @@ -19,6 +19,8 @@ # ############################################################################## +import six +import six.moves.urllib.parse from erp5.component.test.testSlapOSCloudSecurityGroup import TestSlapOSSecurityMixin from erp5.component.test.SlapOSTestCaseMixin import changeSkin import re @@ -65,7 +67,7 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): email = '%s@example.com' % reference - request = self.web_site.hateoas.connection.WebSection_newCredentialRequest( + redirect_url = self.web_site.hateoas.connection.WebSection_newCredentialRequest( reference=reference, default_email_text=email, first_name="Joe", @@ -77,9 +79,12 @@ class DefaultScenarioMixin(TestSlapOSSecurityMixin): default_address_street_address="Av Pelinca", default_address_zip_code="28480", ) - - self.assertIn('Thank you for your registration. You will receive an email to activate your account.', request) - + parsed_url = six.moves.urllib.parse.urlparse(redirect_url) + self.assertEqual(parsed_url.path.split('/')[-1], 'login_form') + self.assertEqual( + sorted(six.iteritems(dict(six.moves.urllib.parse.parse_qsl(parsed_url.query)))), [ + ('portal_status_message', 'Thank you for your registration. You will receive an email to activate your account.'), + ]) self.tic() to_click_message = findMessage(email, 'You have requested one user') diff --git a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py index a962d6058c9ba1ad38f15f95ec1b5b18de66b5d5..0b90c0ec91e670170e49fe94dd69be26644e7727 100644 --- a/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py +++ b/master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py @@ -18,6 +18,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ############################################################################## + +import six +import six.moves.urllib.parse + from erp5.component.test.SlapOSTestCaseMixin import \ SlapOSTestCaseMixinWithAbort, simulate from zExceptions import Unauthorized @@ -310,13 +314,19 @@ class Test0SubscriptionRequestModule_requestSubscriptionProxy(TestSubscriptionSk self.tic() module = self.portal.web_site_module.hostingjs.subscription_request_module - response = module.SubscriptionRequestModule_requestSubscriptionProxy( + redirect_url = module.SubscriptionRequestModule_requestSubscriptionProxy( email=email, subscription_reference=subscription_reference, confirmation_required=True, user_input_dict=user_input_dict) - self.assertTrue( - response.endswith( - "order_confirmation?field_your_reservation_name=Member Template&field_your_reservation_email=%s&field_your_reservation_number_of_machines=1&field_your_reservation_network=test_subscription_reference" % email), response) + parsed_url = six.moves.urllib.parse.urlparse(redirect_url) + self.assertEqual(parsed_url.path.split('/')[-1], 'order_confirmation') + self.assertEqual( + sorted(six.iteritems(dict(six.moves.urllib.parse.parse_qsl(parsed_url.query)))), [ + ('field_your_reservation_email', email), + ('field_your_reservation_name', 'Member Template'), + ('field_your_reservation_network', 'test_subscription_reference'), + ('field_your_reservation_number_of_machines', '1'), + ]) # Missing tests XXXX class TestSubscriptionRequest_applyCondition(TestSubscriptionSkinsMixin):