Fixedd failing tests and checking report file is downloaded tests are added

Author: root

.gitignore

@@ -25,3 +25,4 @@ allure-report/
 tox.log
 node_modules/
 package-lock.json
+downloads/RAVs-Vaccination-Report.csv

features/reports.feature

@@ -91,7 +91,7 @@ Scenario Outline: Choose data page is displayed
   | Pertussis                         | Albert House  |
   | Respiratory syncytial virus (RSV) | Albert House  |
 
-Scenario Outline: Check and confirm page is displayed
+Scenario Outline: Check and confirm page should be displayed
   Given I am logged into the RAVS app
   When I click the reports navigation link
   And I click the create report button
@@ -108,3 +108,42 @@ Scenario Outline: Check and confirm page is displayed
   | Pertussis                         | Albert House  |
   | Respiratory syncytial virus (RSV) | Albert House  |
   | COVID-19                          | Albert House  |
+
+Scenario Outline: Report is ready page should be displayed
+  Given I am logged into the RAVS app
+  When I click the reports navigation link
+  And I click the create report button
+  And I click the today date range button and click continue
+  And I select the vaccine type <vaccineType> and click continue
+  And I select the site <site> and click continue
+  And I click continue on the data page
+  And I click Confirm and create report button in the check and confirm page
+  Then Creating your page element should be displayed and Download Report button should be visible
+
+  Examples:
+  |vaccineType                        | site          |
+  | COVID-19                          | Albert House  |
+  | Flu                               | Albert House  |
+  | Pertussis                         | Albert House  |
+  | Respiratory syncytial virus (RSV) | Albert House  |
+  | COVID-19                          | Albert House  |
+
+Scenario Outline: User can download the report
+  Given I am logged into the RAVS app
+  When I click the reports navigation link
+  And I click the create report button
+  And I click the <day> radio button and click Continue
+  And I select the vaccine type <vaccineType> and click continue
+  And I select the site <site> and click continue
+  And I click continue on the data page
+  And I click Confirm and create report button in the check and confirm page
+  And I click download report button
+  Then the report is downloaded successfully
+
+  Examples:
+  |vaccineType                        | site          | day                             |
+  | COVID-19                          | Albert House  | Last 31 days (includes today)   |
+  | Flu                               | Albert House  | Last 31 days (includes today)   |
+  | Pertussis                         | Albert House  | Last 7 days (includes today)    |
+  | Respiratory syncytial virus (RSV) | Albert House  | Last 14 days (includes today)   |
+  | COVID-19                          | Albert House  | Last 31 days (includes today)   |

helpers/playwrightHelper.py

@@ -4,6 +4,7 @@
 from init_helpers import *
 import pytest
 import logging
+import platform
 
 class BasePlaywrightHelper:
     def __init__(self, working_directory, config):
@@ -84,19 +85,6 @@ def launch_mobile_browser(self, device_name, headless_mode):
         except Exception as e:
             print(f"Error launching mobile browser for {device_name}: {e}")
 
-    # def capture_screenshot(self, full_path):
-    #     try:
-    #         logging.debug("Scrolling to the top of the page.")
-    #         self.page.evaluate("window.scrollTo(0, 0);")
-    #         self.page.screenshot(path=full_path)
-    #     except Exception as error:
-    #         if "Timeout" in str(error):
-    #             print('Screenshot taking timed out, ignoring...')
-    #             return None
-    #         else:
-    #             raise error
-    #     return full_path
-
     def capture_screenshot(self, full_path):
         try:
             # Get the current mouse position
@@ -239,6 +227,38 @@ def handle_unresponsive_page(self):
             self.page.reload(wait_until="networkidle")
             self.wait_for_page_to_load()
 
+    def click_and_get_download_path(self, locator_or_element, action="click", timeout=30, download_dir="downloads"):
+        """
+        Clicks an element and waits for a file to be downloaded, then returns the download path.
+        The file is saved in a custom directory to prevent deletion after the test.
+        This works cross-platform (Windows and Linux).
+        """
+        try:
+            # Ensure the custom download directory exists
+            if not os.path.isabs(download_dir):  # Make sure the download_dir is an absolute path
+                download_dir = os.path.join(os.getcwd(), download_dir)  # Use current working directory as base
+
+            os.makedirs(download_dir, exist_ok=True)
+
+            # Set the download behavior in Playwright to download files to the specified directory
+            self.page.on("download", lambda download: download.save_as(os.path.join(download_dir, download.suggested_filename)))
+
+            # Use Playwright's download expectation
+            with self.page.expect_download(timeout=timeout * 1000) as download_info:
+                self.find_element_and_perform_action(locator_or_element, action)
+
+            # Get the download object
+            download = download_info.value
+            downloaded_file_path = download.path()
+
+            print(f"Download completed: {downloaded_file_path}")
+            return downloaded_file_path
+
+        except Exception as e:
+            print(f"Error during download: {e}")
+            raise
+
+
     def find_element_and_perform_action(self, locator_or_element, action, inputValue=None, screenshot_name=None):
         # Generate screenshot filename if not provided
         if not screenshot_name:

pages/find_a_patient_page.py

@@ -22,10 +22,10 @@
 GENDER_OPTIONAL_SELECT = ("label", "Gender field optional")
 POSTCODE_OPTIONAL_INPUT = ("label", "Postcode field optional")
 GENDER_SELECT = ("label", "Gender")
-POSTCODE_INPUT = ("label", "Full postcode")
-DOB_DAY_INPUT = ("placeholder", "DD")
-DOB_MONTH_INPUT = ("placeholder", "MM")
-DOB_YEAR_INPUT = ("placeholder", "YYYY")
+POSTCODE_INPUT = ("label", "Postcode")
+DOB_DAY_INPUT = ("label", "Day")
+DOB_MONTH_INPUT = ("label", "Month")
+DOB_YEAR_INPUT = ("label", "Year")
 
 NHS_NUMBER_INPUT_ERROR_LABEL= ("text", "Error: Enter an NHS number")
 NHS_NUMBER_INPUT_ERROR_BUTTON = ("button", "Enter an NHS number")
@@ -36,7 +36,6 @@
 GENDER_SELECT_ERROR_LABEL = ("#GenderIdError")
 POSTCODE_INVALID_INPUT_ERROR_LABEL = ("text", "Error: Enter the full postcode in the correct format")
 DOB_INPUT_ERROR_LABEL = ("text", "Error: Enter the date of birth")
-
 CREATE_NEW_PATIENT_BUTTON = ("role", "button", "Create new patient")
 SEARCH_TIPS_LINK = ("link", "search tips")
 PATIENT_NAME_LINK = ("//span[@class='nhsuk-action-link__text']")

pages/reports_creating_report_page.py

@@ -0,0 +1,15 @@
+from init_helpers import *
+
+CREATING_REPORT_ELEMENT = ("text", "Loading...Loading...")
+DOWNLOAD_REPORT_BUTTON = ("role", "button", "Download report")
+
+def check_reports_download_report_button_exists():
+    wait_for_element_to_disappear(CREATING_REPORT_ELEMENT)
+    wait_for_element_to_appear(DOWNLOAD_REPORT_BUTTON)
+    return check_element_exists(DOWNLOAD_REPORT_BUTTON)
+
+def click_reports_download_report_button():
+    wait_for_element_to_disappear(CREATING_REPORT_ELEMENT)
+    wait_for_element_to_appear(DOWNLOAD_REPORT_BUTTON)
+    return click_and_get_download_path(DOWNLOAD_REPORT_BUTTON, "click", 300, "downloads")
+

tests/test_reports_steps.py

@@ -1,4 +1,5 @@
 from asyncio import sleep
+from logging.handlers import RotatingFileHandler
 import secrets
 import string
 from pytest_bdd import given, when, then, scenarios, scenario
@@ -7,6 +8,7 @@
 from pages.home_page import *
 from pages.nhs_signin_page import *
 from pages.reports_check_and_confirm_page import *
+from pages.reports_creating_report_page import *
 from pages.reports_data_selection_page import *
 from pages.reports_date_range_selection_page import *
 import logging
@@ -19,8 +21,22 @@
 
 scenarios(f'{features_directory}/reports.feature')
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
+logger.setLevel(logging.DEBUG)  # Or any other level like INFO, WARNING, etc.
+
+# Create a rotating file handler to log to tox.log
+log_handler = RotatingFileHandler('tox.log', maxBytes=1024*1024, backupCount=3)  # Log rotation (optional)
+log_handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+
+# Add the handler to the logger
+logger.addHandler(log_handler)
+
+@pytest.fixture(scope="session", autouse=True)
+def setup_logging():
+    # You can add logging setup here if needed
+    logger.info("Logging setup complete")
+    yield
+    logger.info("Test session complete")
 
 @pytest.fixture(scope='function')
 def shared_data():
@@ -155,11 +171,11 @@ def I_click_today_date_range_and_click_continue(shared_data):
 @when(parse('I select the vaccine type {vaccineType} and click continue'))
 def I_select_vaccinetype_and_click_continue(shared_data, vaccineType):
     click_vaccine_check_box_on_reports_page(vaccineType)
-    attach_screenshot("click_" + vaccineType.lower() + "_check_box_on_reports_page")
-    logging.info("click_" + vaccineType.lower() + "_check_box_on_reports_page")
+    attach_screenshot("clicked_" + vaccineType.lower() + "_check_box_on_reports_page")
+    logging.info("clicked_" + vaccineType.lower() + "_check_box_on_reports_page")
     click_continue_to_reports_select_site_button()
-    attach_screenshot("click_continue_to_reports_select_site_button")
-    logging.info("click_continue_to_reports_select_site_button")
+    attach_screenshot("clicked_continue_to_reports_select_site_button")
+    logging.info("clicked_continue_to_reports_select_site_button")
 
 @then("the choose sites page should be displayed")
 def the_choose_sites_page_should_be_displayed():
@@ -170,11 +186,11 @@ def the_choose_sites_page_should_be_displayed():
 @when(parse('I select the site {site} and click continue'))
 def I_select_vaccinetype_and_click_continue(shared_data, site):
     check_site_check_box(site)
-    attach_screenshot("click_" + site.lower() + "_check_box_on_reports_page")
-    logging.info("click_" + site.lower() + "_check_box_on_reports_page")
+    attach_screenshot("clicked_" + site.lower() + "_check_box_on_reports_page")
+    logging.info("clicked_" + site.lower() + "_check_box_on_reports_page")
     click_continue_to_reports_select_data_button()
-    attach_screenshot("click_continue_to_reports_select_data_button")
-    logging.info("click_continue_to_reports_select_data_button")
+    attach_screenshot("clicked_continue_to_reports_select_data_button")
+    logging.info("clicked_continue_to_reports_select_data_button")
 
 @then("the choose data page should be displayed and all data options should be checked by default")
 def the_choose_data_page_should_be_displayed():
@@ -190,11 +206,36 @@ def the_choose_data_page_should_be_displayed():
 @when(parse('I click continue on the data page'))
 def I_select_data_and_click_continue(shared_data):
     click_continue_to_reports_select_data_button()
-    attach_screenshot("click_continue_to_reports_select_data_button")
-    logging.info("click_continue_to_reports_select_data_button")
+    attach_screenshot("clicked_continue_to_reports_select_data_button")
+    logging.info("clicked_continue_to_reports_select_data_button")
 
 @then("the check and confirm page should be displayed")
 def the_check_and_confirm_page_should_be_displayed():
     assert check_reports_change_data_button_exists() == True
     attach_screenshot("check_reports_change_data_pages_reports_exists")
     logging.info("check_reports_change_data_pages_reports_exists")
+
+@when('I click Confirm and create report button in the check and confirm page')
+def I_click_confirm_to_generate_report(shared_data):
+    click_continue_to_confirm_and_create_report_button()
+    attach_screenshot("clicked_continue_to_confirm_and_create_report_button")
+    logging.info("clicked_continue_to_confirm_and_create_report_button")
+
+@then("Creating your page element should be displayed and Download Report button should be visible")
+def the_check_and_confirm_page_should_be_displayed():
+    assert check_reports_download_report_button_exists() == True
+    attach_screenshot("check_reports_change_data_pages_reports_exists")
+    logging.info("check_reports_change_data_pages_reports_exists")
+
+@when('I click download report button')
+def I_click_confirm_to_generate_report(shared_data):
+    shared_data['report_download_path'] = click_reports_download_report_button()
+    attach_screenshot("clicked_reports_download_report_button")
+    logging.info("clicked_reports_download_report_button")
+
+
+@then("the report is downloaded successfully")
+def the_report_is_downloaded_successfully(shared_data):
+    assert os.path.exists(shared_data['report_download_path']), f"Downloaded file not found: {shared_data['report_download_path']}"
+    attach_screenshot("check_report_downloaded")
+    logger.info("check_report_downloaded_to_" + str(shared_data['report_download_path']))