E2E Test stabilisation

tests/selenium/conftest.py

@@ -210,7 +210,17 @@ def create_session(host: str, username: str, password: str, csrf: str = "") -> o
 
 
 @pytest.fixture(scope="session")
-def driver() -> Chrome:
+def download_path(worker_id: str) -> str:
+    try:
+        worker_id = worker_id
+        assert worker_id is not None
+        yield f"{settings.DOWNLOAD_DIRECTORY}/{worker_id}"
+    except BaseException:
+        yield settings.DOWNLOAD_DIRECTORY
+
+
+@pytest.fixture(scope="session")
+def driver(download_path: str) -> Chrome:
     chrome_options = Options()
     chrome_options.add_argument("--headless")
     chrome_options.add_argument("--no-sandbox")
@@ -222,15 +232,19 @@ def driver() -> Chrome:
     chrome_options.add_argument("--window-size=1920,1080")
     chrome_options.add_argument("--disable-dev-shm-usage")
     try:
-        os.makedirs(settings.DOWNLOAD_DIRECTORY)
+        os.makedirs(download_path)
     except FileExistsError:
         pass
     prefs = {
-        "download.default_directory": settings.DOWNLOAD_DIRECTORY,
+        "download.default_directory": download_path,
     }
     chrome_options.add_experimental_option("prefs", prefs)
     driver = webdriver.Chrome(options=chrome_options)
     yield driver
+    # try:
+    #     shutil.rmtree(download_path)
+    # except FileNotFoundError:
+    #     pass
 
 
 @pytest.fixture(scope="session")
@@ -514,6 +528,15 @@ def business_area() -> BusinessArea:
     yield business_area
 
 
+@pytest.fixture
+def clear_downloaded_files(download_path: str) -> None:
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
+    yield
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
+
+
 @pytest.fixture
 def change_super_user(business_area: BusinessArea) -> None:
     user = User.objects.filter(email="[email protected]").first()

tests/selenium/helpers/helper.py

@@ -16,7 +16,7 @@
 
 
 class Common:
-    DEFAULT_TIMEOUT = 10
+    DEFAULT_TIMEOUT = 20
 
     def __init__(self, driver: Chrome):
         self.driver = driver

tests/selenium/page_object/base_components.py

@@ -183,7 +183,7 @@ def selectGlobalProgramFilter(self, name: str) -> None:
         self.getGlobalProgramFilterSearchInput().clear()
         self.getGlobalProgramFilterSearchInput().send_keys(Keys.CONTROL + "a")  # Select all (use COMMAND on Mac)
         self.getGlobalProgramFilterSearchInput().send_keys(Keys.DELETE)
-        for _ in range(len(self.getGlobalProgramFilterSearchInput().get_attribute("value"))):
+        for _ in range(len(self.getGlobalProgramFilterSearchInput().get_attribute("value"))):  # type: ignore
             self.getGlobalProgramFilterSearchInput().send_keys(Keys.BACKSPACE)
         self.getGlobalProgramFilterSearchButton().click()
         if name != "All Programmes":

tests/selenium/page_object/grievance/grievance_tickets.py

@@ -213,7 +213,7 @@ def getTabSystemGenerated(self) -> WebElement:
     def getTabUserGenerated(self) -> WebElement:
         return self.wait_for(self.tabUserGenerated)
 
-    def getTicketListRow(self) -> WebElement:
+    def getTicketListRow(self) -> [WebElement]:
         self.wait_for(self.ticketListRow)
         return self.get_elements(self.ticketListRow)
 

tests/selenium/page_object/payment_verification/payment_record.py

@@ -60,8 +60,8 @@ def getStatus(self) -> [WebElement]:
     def getStatusContainer(self) -> WebElement:
         return self.wait_for(self.statusContainer)
 
-    def waitForStatusContainer(self, status: str) -> []:
-        return self.wait_for_text(status, self.statusContainer)
+    def waitForStatusContainer(self, status: str, timeout: int = 20) -> []:
+        return self.wait_for_text(status, self.statusContainer, timeout=timeout)
 
     def getLabelHousehold(self) -> WebElement:
         return self.wait_for(self.labelHousehold)

tests/selenium/payment_module/test_payment_plans.py

@@ -136,15 +136,6 @@ def create_targeting(create_test_program: Program) -> None:
     )
 
 
-@pytest.fixture
-def clear_downloaded_files() -> None:
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
-    yield
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
-
-
 @pytest.fixture
 def create_payment_plan(create_targeting: None) -> PaymentPlan:
     tp = TargetPopulation.objects.get(program__name="Test Program")
@@ -447,6 +438,7 @@ def test_payment_plan_happy_path(
         pageNewPaymentPlan: NewPaymentPlan,
         pageProgramCycle: ProgramCyclePage,
         pageProgramCycleDetails: ProgramCycleDetailsPage,
+        download_path: str,
     ) -> None:
         targeting = TargetPopulation.objects.first()
         pageProgramCycle.selectGlobalProgramFilter("Test Program")
@@ -521,23 +513,21 @@ def test_payment_plan_happy_path(
         pagePaymentModule.driver.refresh()
         pagePaymentModuleDetails.getButtonDownloadXlsx().click()
 
-        zip_file = find_file(".zip", number_of_ties=15)
-        with zipfile.ZipFile(os.path.join(settings.DOWNLOAD_DIRECTORY, zip_file), "r") as zip_ref:
-            zip_ref.extractall(settings.DOWNLOAD_DIRECTORY)
+        zip_file = find_file(".zip", number_of_ties=15, search_in_dir=download_path)
+        with zipfile.ZipFile(os.path.join(download_path, zip_file), "r") as zip_ref:
+            zip_ref.extractall(download_path)
 
-        xlsx_file = find_file(".xlsx")
-        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        xlsx_file = find_file(".xlsx", search_in_dir=download_path)
+        wb1 = openpyxl.load_workbook(os.path.join(download_path, xlsx_file))
         ws1 = wb1.active
         for cell in ws1["N:N"]:
             if cell.row >= 2:
                 ws1.cell(row=cell.row, column=16, value=cell.value)
 
-        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        wb1.save(os.path.join(download_path, xlsx_file))
 
         pagePaymentModuleDetails.getButtonUploadReconciliationInfo().click()
-        pagePaymentModuleDetails.upload_file(
-            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
-        )
+        pagePaymentModuleDetails.upload_file(os.path.abspath(os.path.join(download_path, xlsx_file)), timeout=120)
         pagePaymentModuleDetails.getButtonImportSubmit().click()
         pagePaymentModuleDetails.checkStatus("FINISHED")
         assert "14 (100%)" in pagePaymentModuleDetails.getLabelReconciled().text

tests/selenium/payment_verification/test_payment_verification.py

@@ -7,7 +7,6 @@
 import pytest
 from dateutil.relativedelta import relativedelta
 from selenium.webdriver.common.by import By
-from sorl.thumbnail.conf import settings
 
 from hct_mis_api.apps.account.models import User
 from hct_mis_api.apps.core.fixtures import DataCollectingTypeFactory
@@ -250,12 +249,12 @@ def payment_verification_creator(channel: str = PaymentVerificationPlan.VERIFICA
 
 
 @pytest.fixture
-def clear_downloaded_files() -> None:
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+def clear_downloaded_files(download_path: str) -> None:
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
     yield
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
 
 
 @pytest.mark.usefixtures("login")
@@ -663,6 +662,7 @@ def test_payment_verification_xlsx_successful(
         add_payment_verification_xlsx: PV,
         pagePaymentVerification: PaymentVerification,
         pagePaymentVerificationDetails: PaymentVerificationDetails,
+        download_path: str,
         pagePaymentRecord: PaymentRecord,
     ) -> None:
         pagePaymentVerification.selectGlobalProgramFilter("Active Program")
@@ -680,24 +680,24 @@ def test_payment_verification_xlsx_successful(
 
         pagePaymentVerificationDetails.getDownloadXlsx().click()
 
-        xlsx_file = find_file(".xlsx", number_of_ties=10)
-        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        xlsx_file = find_file(".xlsx", number_of_ties=10, search_in_dir=download_path)
+        wb1 = openpyxl.load_workbook(os.path.join(download_path, xlsx_file))
         ws1 = wb1.active
         for cell in ws1["N:N"]:
             if cell.row >= 2:
                 ws1.cell(row=cell.row, column=3, value="YES")
                 ws1.cell(row=cell.row, column=16, value=ws1.cell(row=cell.row, column=15).value)
 
-        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        wb1.save(os.path.join(download_path, "new_" + xlsx_file))
+        find_file("new_" + xlsx_file, number_of_ties=10, search_in_dir=download_path)
         pagePaymentVerificationDetails.getImportXlsx().click()
 
         pagePaymentVerificationDetails.upload_file(
-            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
+            os.path.abspath(os.path.join(download_path, "new_" + xlsx_file)), timeout=120
         )
-
         pagePaymentVerificationDetails.getButtonImportEntitlement().click()
 
-        assert pagePaymentRecord.waitForStatusContainer("RECEIVED")
+        assert pagePaymentRecord.waitForStatusContainer("RECEIVED", timeout=60)
         assert "RECEIVED" == pagePaymentRecord.getStatusContainer().text
 
     def test_payment_verification_xlsx_partially_successful(
@@ -708,6 +708,7 @@ def test_payment_verification_xlsx_partially_successful(
         pagePaymentVerification: PaymentVerification,
         pagePaymentVerificationDetails: PaymentVerificationDetails,
         pagePaymentRecord: PaymentRecord,
+        download_path: str,
     ) -> None:
         pagePaymentVerification.selectGlobalProgramFilter("Active Program")
 
@@ -730,20 +731,18 @@ def test_payment_verification_xlsx_partially_successful(
 
         pagePaymentVerificationDetails.getDownloadXlsx().click()
 
-        xlsx_file = find_file(".xlsx", number_of_ties=10)
-        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        xlsx_file = find_file(".xlsx", number_of_ties=10, search_in_dir=download_path)
+        wb1 = openpyxl.load_workbook(os.path.join(download_path, xlsx_file))
         ws1 = wb1.active
         for cell in ws1["N:N"]:
             if cell.row >= 2:
                 ws1.cell(row=cell.row, column=3, value="YES")
                 ws1.cell(row=cell.row, column=16, value=float(quantity) - 1.0)
 
-        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        wb1.save(os.path.join(download_path, xlsx_file))
         pagePaymentVerificationDetails.getImportXlsx().click()
 
-        pagePaymentVerificationDetails.upload_file(
-            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
-        )
+        pagePaymentVerificationDetails.upload_file(os.path.abspath(os.path.join(download_path, xlsx_file)), timeout=120)
 
         pagePaymentVerificationDetails.getButtonImportEntitlement().click()
 
@@ -757,6 +756,7 @@ def test_payment_verification_xlsx_not_received(
         pagePaymentVerification: PaymentVerification,
         pagePaymentVerificationDetails: PaymentVerificationDetails,
         pagePaymentRecord: PaymentRecord,
+        download_path: str,
     ) -> None:
         pagePaymentVerification.selectGlobalProgramFilter("Active Program")
 
@@ -773,20 +773,18 @@ def test_payment_verification_xlsx_not_received(
 
         pagePaymentVerificationDetails.getDownloadXlsx().click()
 
-        xlsx_file = find_file(".xlsx", number_of_ties=10)
-        wb1 = openpyxl.load_workbook(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        xlsx_file = find_file(".xlsx", number_of_ties=10, search_in_dir=download_path)
+        wb1 = openpyxl.load_workbook(os.path.join(download_path, xlsx_file))
         ws1 = wb1.active
         for cell in ws1["N:N"]:
             if cell.row >= 2:
                 ws1.cell(row=cell.row, column=3, value="NO")
                 ws1.cell(row=cell.row, column=16, value=0)
 
-        wb1.save(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file))
+        wb1.save(os.path.join(download_path, xlsx_file))
         pagePaymentVerificationDetails.getImportXlsx().click()
 
-        pagePaymentVerificationDetails.upload_file(
-            os.path.abspath(os.path.join(settings.DOWNLOAD_DIRECTORY, xlsx_file)), timeout=120
-        )
+        pagePaymentVerificationDetails.upload_file(os.path.abspath(os.path.join(download_path, xlsx_file)), timeout=120)
 
         pagePaymentVerificationDetails.getButtonImportEntitlement().click()
 

tests/selenium/people/test_people_periodic_data_update.py

@@ -2,8 +2,6 @@
 from datetime import datetime
 from time import sleep
 
-from django.conf import settings
-
 import pytest
 from dateutil.relativedelta import relativedelta
 
@@ -55,10 +53,12 @@
 
 
 @pytest.fixture
-def clear_downloaded_files() -> None:
+def clear_downloaded_files(download_path: str) -> None:
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
     yield
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
 
 
 @pytest.fixture

tests/selenium/programme_management/test_programme_management.py

@@ -642,6 +642,8 @@ def test_create_programme_back_scenarios(
         assert "Test Name" in pageProgrammeManagement.getInputProgrammeName().get_attribute("value")
         pageProgrammeManagement.getInputProgrammeName().send_keys(Keys.CONTROL, "a")
         pageProgrammeManagement.getInputProgrammeName().send_keys(Keys.DELETE)
+        for _ in range(len(pageProgrammeManagement.getInputProgrammeName().get_attribute("value"))):
+            pageProgrammeManagement.getInputProgrammeName().send_keys(Keys.BACKSPACE)
         assert "Programme Name is required" in pageProgrammeManagement.getLabelProgrammeName().text.split("\n")
         pageProgrammeManagement.getInputProgrammeName().send_keys(test_data["program_name"])
         # 2nd step (Time Series Fields)

tests/selenium/programme_population/test_periodic_data_templates.py

@@ -1,8 +1,6 @@
 import os
 from time import sleep
 
-from django.conf import settings
-
 import pytest
 from selenium.webdriver.common.by import By
 
@@ -32,10 +30,12 @@
 
 
 @pytest.fixture
-def clear_downloaded_files() -> None:
+def clear_downloaded_files(download_path: str) -> None:
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
     yield
-    for file in os.listdir(settings.DOWNLOAD_DIRECTORY):
-        os.remove(os.path.join(settings.DOWNLOAD_DIRECTORY, file))
+    for file in os.listdir(download_path):
+        os.remove(os.path.join(download_path, file))
 
 
 @pytest.fixture
@@ -114,7 +114,7 @@ def test_periodic_data_template_export_and_download(
         string_attribute: FlexibleAttribute,
         pageIndividuals: Individuals,
         individual: Individual,
-        clear_downloaded_files: None,
+        download_path: str,
     ) -> None:
         populate_pdu_with_null_values(program, individual.flex_fields)
         individual.save()
@@ -149,9 +149,7 @@ def test_periodic_data_template_export_and_download(
         pageIndividuals.getDownloadBtn(periodic_data_update_template.pk).click()
         periodic_data_update_template.refresh_from_db()
         assert (
-            pageIndividuals.check_file_exists(
-                os.path.join(settings.DOWNLOAD_DIRECTORY, periodic_data_update_template.file.file.name)
-            )
+            pageIndividuals.check_file_exists(os.path.join(download_path, periodic_data_update_template.file.file.name))
             is True
         )
 
@@ -260,6 +258,7 @@ def test_periodic_data_template_create_and_download(
         pagePeriodicDataUpdateTemplates: PeriodicDatUpdateTemplates,
         pagePeriodicDataUpdateTemplatesDetails: PeriodicDatUpdateTemplatesDetails,
         individual: Individual,
+        download_path: str,
     ) -> None:
         populate_pdu_with_null_values(program, individual.flex_fields)
         individual.save()
@@ -294,8 +293,6 @@ def test_periodic_data_template_create_and_download(
         pageIndividuals.getDownloadBtn(periodic_data_update_template.pk).click()
         periodic_data_update_template.refresh_from_db()
         assert (
-            pageIndividuals.check_file_exists(
-                os.path.join(settings.DOWNLOAD_DIRECTORY, periodic_data_update_template.file.file.name)
-            )
+            pageIndividuals.check_file_exists(os.path.join(download_path, periodic_data_update_template.file.file.name))
             is True
         )