Fix regression tests

Author: wildjames

Makefile

@@ -40,7 +40,7 @@ lint: lint-black lint-pyright lint-flake8
 
 run-tests: guard-product guard-env
 	echo "Running Regression Tests"
-	poetry run python ./runner.py --product=$(product) --env=$(env)
+	poetry run python ./runner.py --product=$(product) --env=$(env) --tags=${tags}
 
 check-licenses:
 	scripts/check_python_licenses.sh

features/cpts_ui/select_your_role.feature

@@ -4,11 +4,11 @@ Feature: Role selection page renders roles properly when logged in
 
     Background:
         Given I am logged in
-        And I am on the SLR page
+        And I am on the select_your_role page
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4653
-    Scenario: User can navigate to the SLR page
-        Then I am on the SLR page
+    Scenario: User can navigate to the select_your_role page
+        Then I am on the select_your_role page
 
     @allure.tms:https://nhsd-jira.digital.nhs.uk/browse/AEA-4653
     Scenario: User can see the summary container, but not the table contents by default

features/steps/cpts_ui/select_your_role_steps.py

@@ -5,22 +5,22 @@
 from pages.select_your_role import SelectYourRole
 
 
-@when("I go to the SLR page")
-def i_go_to_the_slr_page(context):
+@when("I go to the select_your_role page")
+def i_go_to_the_select_your_role_page(context):
     context.page.goto(context.cpts_ui_base_url + "site/selectyourrole.html")
 
 
-@given("I am on the SLR page")
-def i_am_on_slr_page(context):
-    i_go_to_the_slr_page(context)
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.summary).to_be_visible()
+@given("I am on the select_your_role page")
+def i_am_on_select_your_role_page(context):
+    i_go_to_the_select_your_role_page(context)
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.summary).to_be_visible()
 
 
-@then("I am on the SLR page")
-def verify_on_slr_page(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.summary).to_be_visible()
+@then("I am on the select_your_role page")
+def verify_on_select_your_role_page(context):
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.summary).to_be_visible()
 
 
 @given("I am logged in")
@@ -29,41 +29,44 @@ def login(context):
     context.page.get_by_role("button", name="Log in with mock CIS2").click()
     context.page.get_by_label("Username").fill("555073103100")
     context.page.get_by_role("button", name="Sign In").click()
+    context.page.wait_for_url("**/auth_demo.html")
 
 
 @then("I can see the summary container")
 def i_can_see_the_summary_container(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.summary).to_be_visible()
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.summary).to_be_visible()
 
 
 @then("I cannot see the summary table body")
 def i_cannot_see_the_summary_table_body(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.roles_without_access_table_body).to_be_visible(visible=False)
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.roles_without_access_table_body).to_be_visible(
+        visible=False
+    )
 
 
 @then("I can see the summary table body")
 def i_can_see_the_summary_table_body(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.roles_without_access_table_body).to_be_visible()
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.roles_without_access_table_body).to_be_visible()
 
 
 @then("I can see the table body has a header row")
 def i_can_see_the_table_body_header(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.organisation_column_header).to_be_visible()
-    expect(slr_page.role_column_header).to_be_visible()
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.organisation_column_header).to_be_visible()
+    expect(select_your_role_page.role_column_header).to_be_visible()
 
 
 @then("I can see the table body has data")
 def i_can_see_the_table_body_data(context):
-    slr_page = SelectYourRole(context.page)
-    expect(slr_page.first_row_org_name).to_be_visible()
-    expect(slr_page.first_row_role_name).to_be_visible()
+    select_your_role_page = SelectYourRole(context.page)
+    expect(select_your_role_page.first_row_org_name).to_be_visible()
+    expect(select_your_role_page.first_row_role_name).to_be_visible()
 
 
 @when("I click on the summary expander")
 def click_on_summary_expander(context):
-    slr_page = SelectYourRole(context.page)
-    slr_page.summary.click()
+    select_your_role_page = SelectYourRole(context.page)
+    select_your_role_page.summary.click()

pages/select_your_role.py

@@ -13,10 +13,10 @@ def __init__(self, page: Page):
         self.role_column_header = page.get_by_role("columnheader", name="Role")
         self.roles_without_access_table_body = page.get_by_role("group").locator("div")
         self.first_row_org_name = page.get_by_role(
-            "cell", name="NO ORG NAME (ODS: X09)"
+            "cell", name="No Org Name (ODS: X09)"
         ).first
         self.first_row_role_name = page.get_by_role(
-            "cell", name='"Admin & Clerical":"Admin":"'
+            "cell", name="Registration Authority Agent"
         ).first
 
         self.header = "[id='eps_header']"