Added vpn_required mark to ptest.ini (#26)

Added vpn_required mark to any tests that it applies to Moved cognito
login page into the login directory

<!-- markdownlint-disable-next-line first-line-heading -->
## Description
A new pytest mark has been created for tests that require a vpn
connection

<!-- Describe your changes in detail. -->

## Context
Some Playwright tests connect to the Oracle DB and a vpn connection is
required to do this. A new pytest mark has been created
(@pytest.mark.vpn_required) and has been added to any applicable tests.

<!-- Why is this change required? What problem does it solve? -->

## Type of changes

<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply. -->

- [ ] Refactoring (non-breaking change)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would change existing
functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)

## Checklist

<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->

- [x] I am familiar with the [contributing
guidelines](https://github.com/nhs-england-tools/playwright-python-blueprint/blob/main/CONTRIBUTING.md)
- [x] I have followed the code style of the project
- [x] I have added tests to cover my changes (where appropriate)
- [ ] I have updated the documentation accordingly
- [ ] This PR is a result of pair or mob programming

---

## Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others
privacy, we kindly ask you to NOT including [PII (Personal Identifiable
Information) / PID (Personal Identifiable
Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public)
or any other sensitive data in this PR (Pull Request) and the codebase
changes. We will remove any PR that do contain any sensitive
information. We really appreciate your cooperation in this matter.

- [x] I confirm that neither PII/PID nor sensitive data are included in
this PR and the codebase changes.

Author: Andyg79

pages/base_page.py

@@ -51,7 +51,8 @@ def __init__(self, page: Page):
         self.main_menu__header = self.page.locator("#ntshPageTitle")
 
     def click_main_menu_link(self) -> None:
-        self.click(self.main_menu_link)
+        if self.main_menu_link.is_visible():
+            self.click(self.main_menu_link)
 
     def click_log_out_link(self) -> None:
         self.click(self.log_out_link)

pages/cognito_login_page.py pages/login/cognito_login_page.pypages/cognito_login_page.py renamed to pages/login/cognito_login_page.py

@@ -32,3 +32,4 @@ markers =
     compartment1: only for compartment 1
     compartment2: only for compartment 2
     compartment3: only for compartment 3
+    vpn_required: for tests that require a VPN connection

pytest.ini

@@ -48,6 +48,7 @@ def test_create_invitations_plan(page: Page, smokescreen_properties: dict) -> No
     logging.info("Invitation plan created")
 
 
+@pytest.mark.vpn_required
 @pytest.mark.smoke
 @pytest.mark.smokescreen
 @pytest.mark.compartment1

tests/smokescreen/test_compartment_1.py

@@ -18,6 +18,7 @@ def smokescreen_properties() -> dict:
     return PropertiesFile().get_smokescreen_properties()
 
 
+@pytest.mark.vpn_required
 @pytest.mark.smoke
 @pytest.mark.smokescreen
 @pytest.mark.compartment2

tests/smokescreen/test_compartment_2.py

@@ -18,6 +18,7 @@ def smokescreen_properties() -> dict:
     return PropertiesFile().get_smokescreen_properties()
 
 
+@pytest.mark.vpn_required
 @pytest.mark.smokescreen
 @pytest.mark.compartment3
 def test_compartment_3(page: Page, smokescreen_properties: dict) -> None:

tests/smokescreen/test_compartment_3.py

@@ -15,6 +15,7 @@ def smokescreen_properties() -> dict:
     return PropertiesFile().get_smokescreen_properties()
 
 
+@pytest.mark.vpn_required
 @pytest.mark.smokescreen
 @pytest.mark.compartment4
 def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:

tests/smokescreen/test_compartment_4.py

@@ -27,9 +27,9 @@ def before_test(page: Page):
     OracleDB().delete_all_users_from_approved_users_table()
 
 
-# @pytest.mark.smoke
+@pytest.mark.vpn_required
+@pytest.mark.smoke
 def test_only_users_on_approved_can_login_to_bcss(page: Page) -> None:
-    #NOTE: You must be connected to the non prod vpn to connect to oracle DB and run this test
     # Add bcss401 user to approved users list table
     OracleDB().populate_ui_approved_users_table("BCSS401")
     # BCSS401 user successfully logs in to BCSS whilst on the approved list

tests/test_bcss_19181_users_permit_list.py

@@ -4,8 +4,7 @@
 from pathlib import Path
 from dotenv import load_dotenv
 from playwright.sync_api import Page
-
-from pages.cognito_login_page import CognitoLoginPage
+from pages.login.cognito_login_page import CognitoLoginPage
 
 logger = logging.getLogger(__name__)
 USERS_FILE = Path(__file__).parent.parent / "users.json"