Skip to content

Commit a6444c3

Browse files
committed
reworked on folder structure after merging with main
1 parent 871b5c4 commit a6444c3

File tree

74 files changed

+329
-968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+329
-968
lines changed

pages/age_extension_rollout_plans_page.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

pages/batch_download_request_and_retrieval_page.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

pages/batch_list_page.py

Lines changed: 0 additions & 70 deletions
This file was deleted.

pages/bowel_scope/bowel_scope_appointments_page.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class BowelScopeAppointments(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Bowel Scope Appointments - page locators
9+
# Bowel Scope Appointments - page locators
910
self.page_title = self.page.locator("#ntshPageTitle")
1011

1112
def verify_page_title(self) -> None:
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from playwright.sync_api import Page, expect, Locator
22
from pages.base_page import BasePage
33

4+
45
class BowelScope(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Bowel Scope - page locators
9-
self.view_bowel_scope_appointments_page = self.page.get_by_role("link", name="View Bowel Scope Appointments")
9+
# Bowel Scope - page locators
10+
self.view_bowel_scope_appointments_page = self.page.get_by_role(
11+
"link", name="View Bowel Scope Appointments"
12+
)
1013

1114
def go_to_view_bowel_scope_appointments_page(self) -> None:
1215
self.click(self.view_bowel_scope_appointments_page)

pages/bowel_scope_appointments_page.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

pages/bowel_scope_page.py

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class AgeExtensionRolloutPlans(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Age Extension Rollout Plans - page locators
9+
# Age Extension Rollout Plans - page locators
910
self.age_extension_rollout_plans_title = self.page.locator("#page-title")
1011

1112
def verify_age_extension_rollout_plans_title(self) -> None:
12-
expect(self.age_extension_rollout_plans_title).to_contain_text("Age Extension Rollout Plans")
13+
expect(self.age_extension_rollout_plans_title).to_contain_text(
14+
"Age Extension Rollout Plans"
15+
)
Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,39 @@
11
from playwright.sync_api import Page
22
from pages.base_page import BasePage
33

4+
45
class CallAndRecall(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# Call and Recall - page links
9-
self.planning_and_monitoring_page = self.page.get_by_role("link", name="Planning and Monitoring")
10-
self.generate_invitations_page = self.page.get_by_role("link", name="Generate Invitations")
11-
self.invitation_generation_progress_page = self.page.get_by_role("link", name="Invitation Generation Progress")
12-
self.non_invitation_days_page = self.page.get_by_role("link", name="Non Invitation Days")
13-
self.age_extension_rollout_plans_page = self.page.get_by_role("link", name="Age Extension Rollout Plans")
10+
self.planning_and_monitoring_page = self.page.get_by_role(
11+
"link", name="Planning and Monitoring"
12+
)
13+
self.generate_invitations_page = self.page.get_by_role(
14+
"link", name="Generate Invitations"
15+
)
16+
self.invitation_generation_progress_page = self.page.get_by_role(
17+
"link", name="Invitation Generation Progress"
18+
)
19+
self.non_invitation_days_page = self.page.get_by_role(
20+
"link", name="Non Invitation Days"
21+
)
22+
self.age_extension_rollout_plans_page = self.page.get_by_role(
23+
"link", name="Age Extension Rollout Plans"
24+
)
1425

15-
def go_to_planning_and_monitoring_page(self)->None:
26+
def go_to_planning_and_monitoring_page(self) -> None:
1627
self.click(self.planning_and_monitoring_page)
1728

18-
def go_to_generate_invitations_page(self)->None:
29+
def go_to_generate_invitations_page(self) -> None:
1930
self.click(self.generate_invitations_page)
2031

21-
def go_to_invitation_generation_progress_page(self)->None:
32+
def go_to_invitation_generation_progress_page(self) -> None:
2233
self.click(self.invitation_generation_progress_page)
2334

24-
def go_to_non_invitation_days_page(self)->None:
35+
def go_to_non_invitation_days_page(self) -> None:
2536
self.click(self.non_invitation_days_page)
2637

27-
def go_to_age_extension_rollout_plans_page(self)->None:
38+
def go_to_age_extension_rollout_plans_page(self) -> None:
2839
self.click(self.age_extension_rollout_plans_page)

pages/call_and_recall/generate_invitations_page.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,34 @@
33
import pytest
44
import logging
55

6+
67
class GenerateInvitations(BasePage):
78
def __init__(self, page: Page):
89
super().__init__(page)
910
self.page = page
1011
# Generate Invitations - page links
11-
self.generate_invitations_button = self.page.get_by_role("button", name="Generate Invitations")
12+
self.generate_invitations_button = self.page.get_by_role(
13+
"button", name="Generate Invitations"
14+
)
1215
self.display_rs = self.page.locator("#displayRS")
1316
self.refresh_button = self.page.get_by_role("button", name="Refresh")
1417
self.planned_invitations_total = self.page.locator("#col8_total")
1518
self.self_referrals_total = self.page.locator("#col9_total")
1619
self.generate_invitations_title = self.page.locator("#ntshPageTitle")
1720

18-
def click_generate_invitations_button(self)->None:
21+
def click_generate_invitations_button(self) -> None:
1922
self.click(self.generate_invitations_button)
2023

21-
def click_refresh_button(self)->None:
24+
def click_refresh_button(self) -> None:
2225
self.click(self.refresh_button)
2326

2427
def verify_generate_invitations_title(self) -> None:
2528
expect(self.generate_invitations_title).to_contain_text("Generate Invitations")
2629

2730
def verify_invitation_generation_progress_title(self) -> None:
28-
expect(self.generate_invitations_title).to_contain_text("Invitation Generation Progress")
31+
expect(self.generate_invitations_title).to_contain_text(
32+
"Invitation Generation Progress"
33+
)
2934

3035
def wait_for_invitation_generation_complete(self) -> bool:
3136
"""
@@ -48,7 +53,9 @@ def wait_for_invitation_generation_complete(self) -> bool:
4853

4954
# Loop until the table no longer contains "Queued"
5055
logging.info("Waiting for successful generation")
51-
while elapsed < timeout: # there may be a stored procedure to speed this process up
56+
while (
57+
elapsed < timeout
58+
): # there may be a stored procedure to speed this process up
5259
table_text = self.display_rs.text_content()
5360
if "Failed" in table_text:
5461
pytest.fail("Invitation has failed to generate")
@@ -68,7 +75,9 @@ def wait_for_invitation_generation_complete(self) -> bool:
6875
except Exception as e:
6976
pytest.fail(f"Invitations not generated successfully: {str(e)}")
7077

71-
value = self.planned_invitations_total.text_content().strip() # Get text and remove extra spaces
78+
value = (
79+
self.planned_invitations_total.text_content().strip()
80+
) # Get text and remove extra spaces
7281
if int(value) < 5:
7382
pytest.fail("There are less than 5 invitations generated")
7483

0 commit comments

Comments
 (0)