Skip to content

Commit 8cabda6

Browse files
Fix: [AEA-4778] - pathname renames (#283)
## Summary - Routine Change - ⚠️ Potential issues that might be caused by this change ### Details Changes URL pathnames to Designer and BA approved pathnames: ``` /select-role - /select-your-role /selected-role - /your-selected-role /change-role - /change-your-role /prescription-results - /prescriptions-list /search#PrescriptionId - /search-by-prescription-id /search#NhsNumber - /search-by-nhs-number /search#BasicDetails - /search-by-basic-details ```
1 parent 1fc3f41 commit 8cabda6

File tree

6 files changed

+27
-21
lines changed

6 files changed

+27
-21
lines changed

features/steps/cpts_ui/home_steps.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ def goto_page(context, page):
1313
if page == "home":
1414
target = ""
1515
elif page == "search for a prescription":
16-
target = "search"
16+
target = "search-by-prescription-id"
1717
elif page == "select your role":
18-
target = "select-role"
18+
target = "select-your-role"
1919

2020
url = f"{context.cpts_ui_base_url}site/{target}"
2121
context.page.goto(url)

features/steps/cpts_ui/login_steps.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ def login_with_single_role(context):
129129
def the_login_is_finished(context):
130130
def logged_in_urls(url):
131131
valid_urls = [
132-
f"{context.cpts_ui_base_url}site/select-role",
133-
f"{context.cpts_ui_base_url}site/select-role/",
134-
f"{context.cpts_ui_base_url}site/search",
135-
f"{context.cpts_ui_base_url}site/search/",
132+
f"{context.cpts_ui_base_url}site/select-your-role",
133+
f"{context.cpts_ui_base_url}site/select-your-role/",
134+
f"{context.cpts_ui_base_url}site/search-by-prescription-id",
135+
f"{context.cpts_ui_base_url}site/search-by-prescription-id/",
136136
]
137137
return url in valid_urls
138138

features/steps/cpts_ui/prescription_list_steps.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def access_list_page_via_prescription_id(context):
1919
# Navigate directly to the results page with a prescription ID parameter
2020
context.page.goto(
2121
context.cpts_ui_base_url
22-
+ "site/prescription-results?prescriptionId=C0C757-A83008-C2D93O"
22+
+ "site/prescription-list?prescriptionId=C0C757-A83008-C2D93O"
2323
)
2424

2525
# Verify we're on the prescription list page using data-testid
@@ -31,7 +31,7 @@ def access_list_page_via_prescription_id(context):
3131
def access_list_page_via_nhs_number(context):
3232
# Navigate directly to the results page with an NHS number parameter
3333
context.page.goto(
34-
context.cpts_ui_base_url + "site/prescription-results?nhsNumber=123456"
34+
context.cpts_ui_base_url + "site/prescription-list?nhsNumber=123456"
3535
)
3636

3737
# Verify we're on the prescription list page using data-testid
@@ -43,13 +43,13 @@ def access_list_page_via_nhs_number(context):
4343
'I am redirected to the prescription list page with prescription ID "{prescription_id}"'
4444
)
4545
def verify_prescription_list_page(context, prescription_id):
46-
# Wait until the URL includes prescription-results
47-
context.page.wait_for_url(lambda url: "site/prescription-results" in url)
46+
# Wait until the URL includes prescription-list
47+
context.page.wait_for_url(lambda url: "site/prescription-list" in url)
4848

4949
current_url = context.page.url
5050
assert (
51-
"site/prescription-results" in current_url
52-
), f"Expected URL to contain 'site/prescription-results', got: {current_url}"
51+
"site/prescription-list" in current_url
52+
), f"Expected URL to contain 'site/prescription-list', got: {current_url}"
5353
assert (
5454
"prescriptionId=" in current_url
5555
), f"Expected URL to contain 'prescriptionId=', got: {current_url}"
@@ -93,8 +93,8 @@ def verify_redirect_to_prescription_id_tab(context):
9393
# Use more relaxed URL checking
9494
current_url = context.page.url
9595
assert (
96-
"site/search" in current_url
97-
), f"Expected URL to contain 'site/search', got: {current_url}"
96+
"site/search-by-prescription-id" in current_url
97+
), f"Expected URL to contain 'site/search-by-prescription-id', got: {current_url}"
9898

9999
# Use the POM to verify we're on the Prescription ID search tab
100100
search_page = SearchForAPrescription(context.page)
@@ -106,8 +106,8 @@ def verify_redirect_to_nhs_number_tab(context):
106106
# Use more relaxed URL checking
107107
current_url = context.page.url
108108
assert (
109-
"site/search" in current_url
110-
), f"Expected URL to contain 'site/search', got: {current_url}"
109+
"site/search-by-nhs-number" in current_url
110+
), f"Expected URL to contain 'site/search-by-nhs-number', got: {current_url}"
111111

112112
# Use the POM to verify we're on the NHS number search tab
113113
search_page = SearchForAPrescription(context.page)

features/steps/cpts_ui/prescription_not_found_page_steps.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ def i_am_on_prescription_not_found_page(context, tab_name):
1313
expect(page.body1).to_be_visible()
1414
expect(page.back_link).to_be_visible()
1515

16-
url_target = "/site/search"
17-
if tab_name:
18-
url_target += f"#{tab_name}"
16+
# Map tab_name to the corresponding URL
17+
url_map = {
18+
"PrescriptionIdSearch": "/site/search-by-prescription-id",
19+
"NhsNumberSearch": "/site/search-by-nhs-number",
20+
"BasicDetailsSearch": "/site/search-by-basic-details",
21+
}
22+
23+
# Get the appropriate URL based on tab_name or default to prescription-id search
24+
url_target = url_map.get(tab_name, "/site/search-by-prescription-id")
1925

2026
expect(page.back_link).to_have_attribute("href", url_target)
2127

features/steps/cpts_ui/search_for_a_prescription_steps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def click_search_button(context):
8383

8484
@then('I am redirected to the prescription results page for "{prescription_id}"')
8585
def redirected_to_results(context, prescription_id):
86-
expected_url = f"/site/prescription-results?prescriptionId={prescription_id}"
86+
expected_url = f"/site/prescription-list?prescriptionId={prescription_id}"
8787
context.page.wait_for_url(lambda url: expected_url in url)
8888

8989

pages/prescription_list_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class PrescriptionListPage:
55
def __init__(self, page: Page):
66
page.wait_for_load_state()
77
self.page = page
8-
self.url = "/prescription-results"
8+
self.url = "/prescription-list"
99

1010
# Locators for elements on the page with updated data-testid attributes
1111
self.heading = page.locator("[data-testid='prescription-list-heading']")

0 commit comments

Comments
 (0)