Skip to content

Commit ecd4cb2

Browse files
committed
Modified the pages after merge with main
1 parent 3846537 commit ecd4cb2

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

pages/reports/reports_page.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,9 @@ def click_fail_safe_reports_screening_subjects_with_inactive_open_episodes_link(
197197
Clicks the first NHS number link from the primary report table.
198198
"""
199199
self.fail_safe_reports_screening_subjects_with_inactive_open_episodes_table.click_first_link_in_column("NHS Number")
200+
201+
def click_fail_safe_reports_identify_and_link_new_gp_practices_link(self):
202+
"""
203+
Clicks the first Practice Code link from the primary report table.
204+
"""
205+
self.failsafe_reports_sub_links_table.click_first_link_in_column("Practice Code")

tests/test_reports_page.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_failsafe_reports_screening_subjects_with_inactive_open_episode(
137137
BasePage(page).bowel_cancer_screening_ntsh_page_title_contains_text(
138138
"Subject Screening Summary"
139139
)
140-
@pytest.mark.wip
140+
141141
def test_failsafe_reports_subjects_ceased_due_to_date_of_birth_changes(
142142
page: Page,
143143
) -> None:
@@ -177,7 +177,6 @@ def test_failsafe_reports_subjects_ceased_due_to_date_of_birth_changes(
177177
"Subject Demographic"
178178
)
179179

180-
181180
def test_failsafe_reports_allocate_sc_for_patient_movements_within_hub_boundaries(
182181
page: Page, general_properties: dict
183182
) -> None:
@@ -310,9 +309,8 @@ def test_failsafe_reports_identify_and_link_new_gp(page: Page) -> None:
310309
report_timestamp
311310
)
312311

313-
# Open a screening subject record from the first row/second cell of the table
314-
# nhs_number_cell_link.click()
315-
ReportsPage(page).click_failsafe_reports_sub_links()
312+
# Open a practice code from the first row/second cell of the table
313+
ReportsPage(page).click_fail_safe_reports_identify_and_link_new_gp_practices_link()
316314

317315
# Verify page title is "Link GP practice to Screening Centre"
318316
BasePage(page).bowel_cancer_screening_page_title_contains_text(

utils/table_util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def get_column_index(self, column_name: str) -> int:
3838

3939
headers = header_row.locator("th")
4040
header_texts = headers.evaluate_all("ths => ths.map(th => th.innerText.trim())")
41+
4142
for index, header in enumerate(header_texts):
4243
if column_name.lower() in header.lower():
4344
return index + 1 # Convert to 1-based index
@@ -52,7 +53,7 @@ def click_first_link_in_column(self, column_name: str):
5253
if column_index == -1:
5354
raise ValueError(f"Column '{column_name}' not found in table")
5455

55-
# Create a dynamic locator for the column with NHS Number
56+
# Create a dynamic locator for the esired column
5657
link_locator = f"{self.table_id} tbody tr td:nth-child({column_index}) a"
5758
links = self.page.locator(link_locator)
5859

0 commit comments

Comments
 (0)