File tree Expand file tree Collapse file tree 3 files changed +12
-7
lines changed
Expand file tree Collapse file tree 3 files changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -157,11 +157,16 @@ def logged_in_urls(url):
157157 f"{ context .cpts_ui_base_url } site/select-your-role/" ,
158158 f"{ context .cpts_ui_base_url } site/search-by-prescription-id" ,
159159 f"{ context .cpts_ui_base_url } site/search-by-prescription-id/" ,
160+ f"{ context .cpts_ui_base_url } site/select-active-session" , # Concurrent session page
161+ f"{ context .cpts_ui_base_url } site/select-active-session/" ,
160162 ]
161163 return url in valid_urls
162164
163165 context .active_page .wait_for_url (logged_in_urls , wait_until = "load" , timeout = 2000 )
164- context .execute_steps ("then I am logged in" )
166+
167+ # For concurrent sessions, landing on select-active-session is success, don't run "I am logged in"
168+ if "select-active-session" not in context .active_page .url :
169+ context .execute_steps ("then I am logged in" )
165170
166171
167172###############################################################################
Original file line number Diff line number Diff line change @@ -24,9 +24,9 @@ def __init__(self, page: Page):
2424
2525 # Role cards - roles with access
2626 self .roles_with_access_cards = page .get_by_test_id ("eps-card" )
27- self .first_role_card = page .locator ( ". eps-card__org-focus-area " ).first
28- self .role_card_headings = page .locator (".nhsuk-card__heading " )
29- self .role_card_descriptions = page .locator (".eps-card__roleName " )
27+ self .first_role_card = page .get_by_test_id ( " eps-card " ).first
28+ self .role_card_headings = page .locator (".nhsuk-heading-s.eps-card__org-name " )
29+ self .role_card_descriptions = page .locator (".nhsuk-u-margin-top-2 " )
3030
3131 # Header locators
3232 self .select_role_header = page .locator (
Original file line number Diff line number Diff line change @@ -26,9 +26,9 @@ def __init__(self, page: Page):
2626
2727 # Role cards - roles with access
2828 self .roles_with_access_cards = page .get_by_test_id ("eps-card" )
29- self .first_role_card = page .locator ( ". eps-card__org-focus-area " ).first
30- self .role_card_headings = page .locator (".nhsuk-card__heading " )
31- self .role_card_descriptions = page .locator (".eps-card__roleName " )
29+ self .first_role_card = page .get_by_test_id ( " eps-card " ).first
30+ self .role_card_headings = page .locator (".eps-card__org-name " )
31+ self .role_card_descriptions = page .locator (".nhsuk-u-margin-top-2 " )
3232
3333 self .select_role_header = page .locator (
3434 "span[data-testid='eps_header_selectYourRole'] > span.nhsuk-title"
You can’t perform that action at this time.
0 commit comments