Merge pull request #287 from ministryofjustice/staging-2

Merge staging into master

tests/end_to_end_tests/journey_1/data.py

@@ -1,12 +1,13 @@
 from datetime import date
 from dateutil.relativedelta import relativedelta
+import os
 
 DEFAULT_TIMEOUT = 3 * 1000  # Wait a maximum of 3 seconds
 TIMEOUT_FOR_SLOW_OPERATIONS = 30 * 1000  # For slow operations, wait a maximum of 30 seconds
 
 
 EMAIL_ADDRESS = '[email protected]'
-DIFFERENT_EMAIL_ADDRESS = '[email protected]'
+DIFFERENT_EMAIL_ADDRESS = os.environ.get('DEFAULT_ADMIN_USER', '[email protected]')
 
 TITLE = 'Mr'
 FIRST_NAME = 'Joseph'

tests/end_to_end_tests/journey_1/submit_and_pay/section.py

@@ -253,15 +253,14 @@ async def run_checks_on_section(page: Page, asserts: AssertHelpers, helpers: Pag
     await asserts.change_links_to_url(link_text="Change your civil partner's name", expected_url='/partnership-details/partner-details')
     await asserts.change_links_to_url(link_text="Change your civil partner's postal address", expected_url='/partnership-details/partner-details')
 
-    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of changing your name', expected_url='/upload/name-change', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
-    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of your marriage or civil partnership', expected_url='/upload/marriage-documents', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
-    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of your overseas certificate', expected_url='/upload/overseas-certificate', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
-    await asserts.change_links_to_url(link_text='Change the statutory declarations documents you have uploaded', expected_url='/upload/statutory-declarations', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
-
     await asserts.change_links_to_url(link_text='Change payment method', expected_url='/submit-and-pay')
     await asserts.change_links_to_url(link_text='Change the way you are applying for help with paying the fees', expected_url='/submit-and-pay/help-type')
     await asserts.change_links_to_url(link_text='Change your Help with Fees reference number', expected_url='/submit-and-pay/help-type')
+    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of changing your name', expected_url='/upload/name-change', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
 
+    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of your marriage or civil partnership', expected_url='/upload/marriage-documents', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
+    await asserts.change_links_to_url(link_text='Change the documents you have uploaded as evidence of your overseas certificate', expected_url='/upload/overseas-certificate', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
+    await asserts.change_links_to_url(link_text='Change the statutory declarations documents you have uploaded', expected_url='/upload/statutory-declarations', back_link_should_return_to_check_page=False, save_button_should_return_to_check_page=False)
 
     # Don't choose any option, click Save and continue
     await helpers.click_button('Submit application')
@@ -282,4 +281,4 @@ async def run_checks_on_section(page: Page, asserts: AssertHelpers, helpers: Pag
     await asserts.url('/submit-and-pay/confirmation')
     await asserts.accessibility()
     await asserts.h1('Application submitted')
-    await asserts.number_of_errors(0)
+    await asserts.number_of_errors(0)

tests/end_to_end_tests/journey_cy/data.py

@@ -1,9 +1,10 @@
 from datetime import date
 from dateutil.relativedelta import relativedelta
+import os
 
 DEFAULT_TIMEOUT = 3 * 1000  # Wait a maximum of 3 seconds
 
-EMAIL_ADDRESS = '[email protected]'
+EMAIL_ADDRESS = os.environ.get('DEFAULT_ADMIN_USER', '[email protected]')
 PHONE_NUMBER = '07700900000'
 
 TITLE = 'Mr'