From 1918ca23349c6e40cbc2fbf4565229d46b11228d Mon Sep 17 00:00:00 2001 From: neelimaguntupalli1-nhs Date: Thu, 5 Dec 2024 11:34:51 +0000 Subject: [PATCH] Ravs 1094 automate reports feature (#46) * Fix issue with attaching screenshots * Fix issue with attaching screenshots - Added sleep before zipping * Fix issue with attaching screenshots - Added sleep before zipping * Fix issue with attaching screenshots - Added sleep before zipping * Fix issue with attaching screenshots - Added sleep before zipping * Fix github pages - move all files * Fix github pages - move all files * Fix github pages - move all files * Fix github pages - move all files * Fix github pages - move all files * Fix github pages - copy all files * Fix github pages - copy all files * Fix github pages - copy all files * Fix github pages - copy all files * Fix github pages - copy all files * Fix github pages * Reset marker * Update publish to github pages * Update publish to github pages * Fix failing find a patient test * Fix test report publish issue * Fix test report publish issue * Fix test report publish issue * Fix test report publish issue * Fix test report publish issue * Fix test report publish issue * Fix test report publish issue * Bump setuptools in /scripts/docker/examples/python/assets/hello_world Bumps [setuptools](https://github.com/pypa/setuptools) from 65.5.1 to 70.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v65.5.1...v70.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Test steps updated with legal mechanism, vaccination site and updated check and confirm screen * Fix indenttation in conftest.py * Update tests_qa.yml * Fix dev workflow file * Update tests_dev.yml * Add assertions for check and confirm screen * Add assertions for check and confirm screen * Output test environment detail to screenshot title * Fix record a vaccine flow test * Update dev workflow file to run tests for every push * Fix date format and failing tests when legal mechanism is PGD, automatic vaccinator and consent clinician selection * Fix date format * Fixed issue with date of birth format * Fixed issue with date of birth format * Fix failing find a patient by NHS number test * Fix failing test because of PGD * Fix failing test because of PGD * Fix trailing white space issue in pipeline checks * Updated batch expiry date to make the date format is standardized * Ravs 305 legal mechanism change (#13) * Added slack wbhook url support * Fix prod error in docker find step * Fix proc error in docker find step * Fix proc error in docker find step --------- Co-authored-by: root * Ravs 305 legal mechanism change (#14) * Added slack wbhook url support * Fix prod error in docker find step * Fix proc error in docker find step * Fix proc error in docker find step * Fix failing find a patient search * Fix test failures with improved checks * Fix test failures with improved checks * Timeout error print and not fail the test * Fix liniting error --------- Co-authored-by: root * Update tests_dev.yml Start cron job at 7.30 after QA tests run * Fix failing tests * Replace PDS search numbers * Bump actions/github-script from 6 to 7 (#9) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * --- (#8) updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jinja2 in /scripts/docker/examples/python/assets/hello_world (#7) Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 2 to 4 (#2) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang.org/x/net in /docs/adr/assets/ADR-003/examples/golang (#1) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.17.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 2 to 4 (#3) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/setup-buildx-action from 1 to 3 (#4) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/download-artifact from 2 to 4 (#5) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix failing tests * Update action.yaml * Update action.yaml * Bump actions/checkout from 2 to 4 (#18) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump werkzeug in /scripts/docker/examples/python/assets/hello_world (#6) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.1 to 3.0.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/3.0.1...3.0.3) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: neelimaguntupalli1-nhs * Bump actions/upload-artifact from 2 to 4 (#19) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/download-artifact from 2 to 4 (#20) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/setup-buildx-action from 1 to 3 (#21) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump peaceiris/actions-gh-pages from 3 to 4 (#22) Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4. - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4) --- updated-dependencies: - dependency-name: peaceiris/actions-gh-pages dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Find a patient (#15) * update find a patient tests * add happy path demographics tests * Ravs 305 legal mechanism change (#14) * Added slack wbhook url support * Fix prod error in docker find step * Fix proc error in docker find step * Fix proc error in docker find step * Fix failing find a patient search * Fix test failures with improved checks * Fix test failures with improved checks * Timeout error print and not fail the test * Fix liniting error --------- Co-authored-by: root * Update tests_dev.yml Start cron job at 7.30 after QA tests run * Fix failing tests * add remaining demo tests * Replace PDS search numbers * add start of local tests * add create patient scenario * Bump actions/github-script from 6 to 7 (#9) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * --- (#8) updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jinja2 in /scripts/docker/examples/python/assets/hello_world (#7) Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 2 to 4 (#2) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump golang.org/x/net in /docs/adr/assets/ADR-003/examples/golang (#1) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.17.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 2 to 4 (#3) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/setup-buildx-action from 1 to 3 (#4) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/download-artifact from 2 to 4 (#5) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix failing tests * Update action.yaml * Update action.yaml * Bump actions/checkout from 2 to 4 (#18) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump werkzeug in /scripts/docker/examples/python/assets/hello_world (#6) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.1 to 3.0.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/3.0.1...3.0.3) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: neelimaguntupalli1-nhs * Bump actions/upload-artifact from 2 to 4 (#19) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/download-artifact from 2 to 4 (#20) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump docker/setup-buildx-action from 1 to 3 (#21) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump peaceiris/actions-gh-pages from 3 to 4 (#22) Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3 to 4. - [Release notes](https://github.com/peaceiris/actions-gh-pages/releases) - [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md) - [Commits](https://github.com/peaceiris/actions-gh-pages/compare/v3...v4) --- updated-dependencies: - dependency-name: peaceiris/actions-gh-pages dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * re-add test for find a patient page * re-add test for find a patient page * update find a patient tests * add happy path demographics tests * add remaining demo tests * add start of local tests * add create patient scenario * re-add test for find a patient page * re-add test for find a patient page * re-add explicit scenario for find a patient * fix rebase errors * fix rebase errors * re-add explicit scenarios * restore old tests * indentation fix * indentation fix * indentation fix * update find a patient page * update requirements.txt * update requirements.txt * update requirements.txt to add faker * update requirements.txt to add faker * update requirements.txt to add faker * update requirements.txt to utf-8 * update requirements.txt to utf-8 with trailing crlf * update requirements.txt add faker --------- Signed-off-by: dependabot[bot] Co-authored-by: Colin Piper Co-authored-by: neelimaguntupalli1-nhs Co-authored-by: root Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: chinmaymudholkar1 <135991922+chinmaymudholkar1@users.noreply.github.com> * Adding tests for age based warnings * Adding tests for age based warnings on vacinate screen too * Fix file formatting job failure * Fix failing record a vaccine tests qa (#24) * Removed your-location page and added support for RSV and pertussis * Removed your-location page and added support for RSV and pertussis fixed recording vaccine tests --------- Co-authored-by: root * Add vaccine and batch (#25) * Removed your-location page and added support for RSV and pertussis * Removed your-location page and added support for RSV and pertussis fixed recording vaccine tests * update the add vaccine and add batch * added scenario for existing product to check batch availability * fix launch page tests for add vaccines and add batches * fix add vaccine tests * fix add batch tests * file format fixes * file format fixes * change secret scan to staged changes * update tests to cover saved record and delete, and update existing record a vaccine tests to use new flow * refactor the vaccine site type batch logic to make it simpler * refactor the vaccine site type batch logic to make it simpler * fix formatting * fix formatting * confirm add batch and add vaccine tests working locally * revert RAV tests to remove cookie check * updated flu vaccine names --------- Co-authored-by: root Co-authored-by: Colin Piper * Update tests_dev.yml Disable test run for tomorrow * Update tests_qa.yml Disable test run for tomorrow * Retest cron job - tests_dev.yml * Reset cron jobs - tests_qa.yml * Fix failing find a patient tests (#26) * Fix failing find a patient tests * Removed scoop from requirements.txt to fix scan secrets issue * added requirements.txt to gitleaks ignore list * Updated path of requirements.txt file * Added fingerprint to gitleaksignore file * Added fingerprint to gitleaksignore file * Added fingerprint to gitleaksignore file * Added fingerprint to gitleaksignore file * Fix failing tests main * Test publish to 2 urls * Disabled automated tests for wednesday * Fixed failing age based warning tests and moved to locators instead of selectors for choose vaccine page * Fixed all failing find a patient tests and changed all elements to be playwright locators instead of selenium selectors --------- Co-authored-by: root * Fix failing logout tests (#28) * Fixed failing logout test and made common methods to click to avoid code duplication * Fix git hooks errors with formatting * Fix failing tests following last commit * Fix issue with attaching screenshots to alure report * Fix issue with attaching screenshots to alure report * Fix issue with attaching screenshots to allure reports and fixed failing login tests * Fix issue with inconsistent test failures when running headless * Hopefully nailed all intermittent failures * Fixed all issues except recording a vaccine and improved wait times * Try publishing data to github * Try publishing data to github * Try publishing data to github * Try publishing data to github * Try publishing data to github * Fixed attach screenshot issue * May have solved the image attachment issue * Make github pages url dynamic * Try attach screenshots again * Corrected upload artifact version * Fixed issue with yml * Fix dynamic branch url naming issue * Reset git leaks actions from last colin's change * Only run logout test for quick feedback * Upload screenshots as artifacts again * Try different version of git actions * Try different version of git actions * Try different version of git actions * Try different version of git actions * Try different version of git actions * Try different version of git actions * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * Correct screenshot path * publish to gibhun-dev * made new branch for publishing to github-pages-dev * made new branch for publishing to github-pages-dev * made new branch for publishing to github-pages-dev * Fix failing tests in dev excpet record a vaccine and added enough wait timers * Added more wait timers * Implement new workflow file * debug workflow file * debug workflow file * debug workflow file --------- Co-authored-by: root * Ravs 961 update record a vaccine tests (#31) * Fixed failing add existing batch test * Fixed fa * Fixed assessment page fields * Fixed consent page fields and site vaccine, batch fields * Fixed vaccinated page field, giving a first stan now to see if all tests pass * Fixed failing age based warning tests * Sorted record a vaccine tests hopefully * Sorted record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully --------- Co-authored-by: root * Ravs 961 update record a vaccine tests (#32) * Fixed failing add existing batch test * Fixed fa * Fixed assessment page fields * Fixed consent page fields and site vaccine, batch fields * Fixed vaccinated page field, giving a first stan now to see if all tests pass * Fixed failing age based warning tests * Sorted record a vaccine tests hopefully * Sorted record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Sorted most of record a vaccine tests hopefully * Changed browser to be edge * Updated scan secrets yml * Updated scan secrets yml and removed timeout as it is not needed * Added logging for shared_data when recording a vaccine * Added logging for shared_data when recording a vaccine * Fixed feature file --------- Co-authored-by: root * Update pytest.ini * Update test_find_a_patient_steps.py * Added intial test for creating reports feature * Update pytest.ini * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Ravs 1094 automate reports feature (#33) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests --------- Co-authored-by: root * Update test_add_vaccine_batches_steps.py * Added 2 new tests to reports * Fixed add batches tests * Ravs 1094 automate reports feature (#34) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests --------- Co-authored-by: root * Bump werkzeug in /scripts/docker/examples/python/assets/hello_world (#30) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.3 to 3.0.6. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/werkzeug/compare/3.0.3...3.0.6) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 3 to 4 (#29) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nhs-england-tools/notify-msteams-action from 0.0.4 to 1.0.0 (#27) Bumps [nhs-england-tools/notify-msteams-action](https://github.com/nhs-england-tools/notify-msteams-action) from 0.0.4 to 1.0.0. - [Release notes](https://github.com/nhs-england-tools/notify-msteams-action/releases) - [Changelog](https://github.com/nhs-england-tools/notify-msteams-action/blob/main/.releaserc) - [Commits](https://github.com/nhs-england-tools/notify-msteams-action/compare/v0.0.4...v1.0.0) --- updated-dependencies: - dependency-name: nhs-england-tools/notify-msteams-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Ravs 1094 automate reports feature (#35) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file --------- Co-authored-by: root * Removed install of tox * Removed install of tox * Ravs 1094 automate reports feature (#36) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Removed install of tox * Removed install of tox --------- Co-authored-by: root * Making more space on disk * Ravs 1094 automate reports feature (#37) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Removed install of tox * Removed install of tox * Making more space on disk --------- Co-authored-by: root * Fixed app id variable to fetch from secrets * Ravs 1094 automate reports feature (#38) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Removed install of tox * Removed install of tox * Making more space on disk * Fixed app id variable to fetch from secrets --------- Co-authored-by: root * Fixed app id variable to fetch from secrets * Corrected case of RAvs test reports * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Fixed workflow file * Fixed path of environment properties * check env.properties is generated * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Fixed trigger curl command * Fixed trigger curl command * Added cron jobs and also added cache * Added cron jobs and also added cache * Corrected target repo name * Corrected target repo name * Corrected run_id case * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Tox verbose mode * Tox verbose mode * Tox verbose mode * env is qa * Added support for marker when running manually * set cron job * removed terraform liniting githook * Fixed failing record vaccine tests because of text format change * Fixed failing record vaccine tests because of text format change * Set timezone to ne europe london * Set timezone to be europe london * test markers are not required * workflow set to what is input * Ravs 1094 automate reports feature (#39) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Removed install of tox * Removed install of tox * Making more space on disk * Fixed app id variable to fetch from secrets * Fixed app id variable to fetch from secrets * Corrected case of RAvs test reports * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Fixed workflow file * Fixed path of environment properties * check env.properties is generated * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Fixed trigger curl command * Fixed trigger curl command * Added cron jobs and also added cache * Added cron jobs and also added cache * Corrected target repo name * Corrected target repo name * Corrected run_id case * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Tox verbose mode * Tox verbose mode * Tox verbose mode * env is qa * Added support for marker when running manually * set cron job * removed terraform liniting githook * Fixed failing record vaccine tests because of text format change * Fixed failing record vaccine tests because of text format change * Set timezone to ne europe london * Set timezone to be europe london * test markers are not required * workflow set to what is input --------- Co-authored-by: root * Added new tests for reports * Added new tests for reports * Fixed failing tests * Ravs 1094 automate reports feature (#42) * Added intial test for creating reports feature * Fixed failing test for RSV * Added more tests * Fixed -pl=,'@~ * Fixed failed RSV and pertussis tests * Fixed failed RSV and pertussis tests * Updated duplicate batch error and fixed non reponsive page issues when switching from vaccines to patient search * Get sequential index instead of random index * Fixed failing RSV and pertussis tests by adding new batches tagged as Automation * Fixed failing duplicate batch test following fix of 17456 * Reduced time.sleep to see how tests fare * Reset back time and reduced them slightly * Increaed wait time for logout tests * Increaed wait time for logout tests * Increaed wait time for logout tests * Added 2 new tests to reports * Fixed add batches tests * git attached screenshots for all steps when recording a vaccine and scrolled to the mouse location to click screenshot * fix failing test * fix failing test * Created new workflow file * Removed install of tox * Removed install of tox * Making more space on disk * Fixed app id variable to fetch from secrets * Fixed app id variable to fetch from secrets * Corrected case of RAvs test reports * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Corrected test report generation step * Fixed workflow file * Fixed path of environment properties * check env.properties is generated * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Removed docker * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Remove cached tox * Fixed trigger curl command * Fixed trigger curl command * Added cron jobs and also added cache * Added cron jobs and also added cache * Corrected target repo name * Corrected target repo name * Corrected run_id case * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Corrected github token * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Removed all workflow files and set to run it on push * Tox verbose mode * Tox verbose mode * Tox verbose mode * env is qa * Added support for marker when running manually * set cron job * removed terraform liniting githook * Fixed failing record vaccine tests because of text format change * Fixed failing record vaccine tests because of text format change * Set timezone to ne europe london * Set timezone to be europe london * test markers are not required * workflow set to what is input * Added new tests for reports * Added new tests for reports * Fixed failing tests --------- Co-authored-by: root * Bump actions/setup-python from 4 to 5 (#41) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/cache from 3 to 4 (#40) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Increased timeout for scan secrets from 2 to 10 * Added fingerprint to git leaks ignore * Increased timeout * Reset timeout to 10 * Added 4 new tests * Fixed failing reports tests * Added new tests * Added new tests * Added new tests * Added new tests * Fixedd failing tests and checking report file is downloaded tests are added * Fixed failing download reports tests * Validating report headers * Validating report headers * Validating report headers and checking if columns are not empty * Validating report headers and checking if columns are not empty * Arexy vaccine has been decommissioned so removed that test from the test suite * Increased timeout miutes * Deleted duplicate steps * Fix failing report test for no vaccination * Fix failing report test for no vaccination * Updated Id for NHS number inout * Added more assertions to reports * Changed Ids following Steve's pds changes * Increased timeout for githooks * Fixed failing tests and added 2 new test cases for live issue * Generate pytest report html * Undid commit that generates report.html * Removed report.html from branch * git ignored report.html * Fix failing local search tests * Increases timeouts * Added screenshot after checking vaccination history label --------- Signed-off-by: dependabot[bot] Co-authored-by: root Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: chinmaymudholkar1 <135991922+chinmaymudholkar1@users.noreply.github.com> Co-authored-by: colinpiper3 Co-authored-by: Colin Piper --- .github/workflows/stage-1-commit.yaml | 8 ++-- .gitignore | 1 + conftest.py | 2 + ...accine_for_patient_with_nhs_number.feature | 2 + pages/find_a_patient_page.py | 2 +- pages/patient_details_page.py | 6 +++ pages/reports_check_and_confirm_page.py | 8 ++-- ...ccine_for_patient_with_nhs_number_steps.py | 5 +-- tests/test_reports_steps.py | 39 ++++++++++++++++++- 9 files changed, 59 insertions(+), 14 deletions(-) diff --git a/.github/workflows/stage-1-commit.yaml b/.github/workflows/stage-1-commit.yaml index bd999b8ec..3e136de87 100644 --- a/.github/workflows/stage-1-commit.yaml +++ b/.github/workflows/stage-1-commit.yaml @@ -36,7 +36,7 @@ jobs: scan-secrets: name: "Scan secrets" runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - name: "Checkout code" uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: check-file-format: name: "Check file format" runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - name: "Checkout code" uses: actions/checkout@v4 @@ -92,7 +92,7 @@ jobs: permissions: id-token: write contents: read - timeout-minutes: 10 + timeout-minutes: 15 steps: - name: "Checkout code" uses: actions/checkout@v4 @@ -111,7 +111,7 @@ jobs: permissions: id-token: write contents: read - timeout-minutes: 10 + timeout-minutes: 15 steps: - name: "Checkout code" uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index c06481dfe..ef2670258 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ tox.log node_modules/ package-lock.json downloads/RAVs-Vaccination-Report.csv +report.html diff --git a/conftest.py b/conftest.py index 4cc82f124..56b5187d0 100644 --- a/conftest.py +++ b/conftest.py @@ -497,6 +497,8 @@ def step_search_for_patient(shared_data, name): @when(parse("I click choose vaccine button and choose the {chosen_vaccine}, {batch_number} with {batch_expiry_date} and click continue")) def step_choose_vaccine_and_vaccine_type(shared_data, chosen_vaccine, batch_number, batch_expiry_date): time.sleep(3) + assert check_vaccine_history_not_available_label_element_exists() == False + attach_screenshot("checked_vaccine_history_not_available_label_element_exists") immunisation_history_records_count_before_vaccination = click_on_patient_search_result_and_click_choose_vaccine(shared_data['patient_name'], chosen_vaccine) shared_data["immunisation_history_records_count_before_vaccination"] = immunisation_history_records_count_before_vaccination choose_vaccine_and_vaccine_type_for_patient(shared_data['site'], chosen_vaccine, shared_data['chosen_vaccine_type']) diff --git a/features/record_a_vaccine_for_patient_with_nhs_number.feature b/features/record_a_vaccine_for_patient_with_nhs_number.feature index 0a79bff26..b85a80366 100644 --- a/features/record_a_vaccine_for_patient_with_nhs_number.feature +++ b/features/record_a_vaccine_for_patient_with_nhs_number.feature @@ -39,6 +39,8 @@ Feature: Record vaccine | 2 | 9450141711 | BECCLES HOUSE | Housebound patient's home | yes | today-2| yes | yes | today-1 | KRISTIA SIDAWAY | 24/6/1992 | 41 BALTIMORE ROAD, LYTHAM ST. ANNES, LANCS, FY8 3NY | Flu | AUTOMATION-IT | 19/10/2026 | | 3 | 9450144699 | BIRCH HOUSE | Outreach event | yes | today-1 | yes | yes | today-1 | HOPE TULLY | 10/1/1993 | 2 CHAPEL CLOSE, WESHAM, PRESTON, PR4 3HB | Flu | AUTOMATION-C3 | 19/10/2026 | | 4 | 9437541817 | ALBERT HOUSE | Outreach event | yes | today | yes | yes | today | FLORINDA DUNNER | 27/3/1957 | 32 HOLLAND ROAD, MANCHESTER, M8 4NP | Flu | AUTOMATION-SJ1 | 19/10/2026 | + | 4 | 9223638941 | ALBERT HOUSE | Outreach event | yes | today | yes | yes | today | MICHELLE DONNELLY | 05/5/1900 | 6 WHESSOE ROAD, HARDWICK, STOCKTON-ON-TEES, CLEVELAND, TS19 8LB | Flu | AUTOMATION-SJ1 | 19/10/2026 | + | 4 | 9727840361 | ALBERT HOUSE | Outreach event | yes | today | yes | yes | today | BOBBY TICKLE | 04/5/1983 | 1 Canning Way, LOUGHBOROUGH, Leics, LE11 5YA | COVID-19 | AUTOMATION-C10 | 19/10/2026 | @recordvaccine Scenario Outline: Record a maternity vaccine with nhs number diff --git a/pages/find_a_patient_page.py b/pages/find_a_patient_page.py index 6237a7d82..4cca84579 100644 --- a/pages/find_a_patient_page.py +++ b/pages/find_a_patient_page.py @@ -156,7 +156,7 @@ def check_postcode_invalid_error_message_text_exists(): return check_element_exists(POSTCODE_INVALID_INPUT_ERROR_LABEL) def check_patient_name_search_result_exists(name, wait): - element = ("xpath", f"//span[contains(translate(text(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), '{name.lower()}')]") + element = ("xpath", f"//span[contains(translate(text(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), \"{name.lower()}\")]") wait_for_element_to_appear(element) return check_element_exists(element, wait) diff --git a/pages/patient_details_page.py b/pages/patient_details_page.py index afaa5608d..ce8268039 100644 --- a/pages/patient_details_page.py +++ b/pages/patient_details_page.py @@ -25,6 +25,12 @@ RSV_HISTORY_ELEMENT = ("text", "Respiratory syncytial virus (RSV)") PERTUSSIS_HISTORY_ELEMENT = ("text", "Pertussis") PAGE_LOADING_ELEMENT = ("text", "Loading...Loading...") +VACCINATION_HISTORY_NOT_AVAILABLE = ("role", "heading", "No vaccination history available") + +def check_vaccine_history_not_available_label_element_exists(): + wait_for_element_to_disappear(PAGE_LOADING_ELEMENT) + wait_for_element_to_appear(CHOOSE_VACCINE_BUTTON) + return check_element_exists(VACCINATION_HISTORY_NOT_AVAILABLE) def check_covid_history_element_exists(): wait_for_element_to_appear(COVID_HISTORY_ELEMENT) diff --git a/pages/reports_check_and_confirm_page.py b/pages/reports_check_and_confirm_page.py index f774efa4f..80f5f7813 100644 --- a/pages/reports_check_and_confirm_page.py +++ b/pages/reports_check_and_confirm_page.py @@ -3,10 +3,10 @@ PAGE_LOADING_ELEMENT = ("text", "Loading...Loading...") SELECT_DATA_FOR_REPORT_ERROR_MESSAGE_LINK = ("role", "button", "Select data for report") SELECT_DATA_FOR_REPORT_ERROR_MESSAGE_TEXT = ("text", "Select data for report") -CHANGE_DATE_BUTTON = ("role", "button", "Change date") -CHANGE_VACCINES_BUTTON = ("role", "button", "Change vaccines") -CHANGE_SITES_BUTTON = ("role", "button", "Change sites") -CHANGE_DATA_BUTTON = ("role", "button", "Change data") +CHANGE_DATE_BUTTON = ("role", "link", "Change date") +CHANGE_VACCINES_BUTTON = ("role", "link", "Change vaccines") +CHANGE_SITES_BUTTON = ("role", "link", "Change sites") +CHANGE_DATA_BUTTON = ("role", "link", "Change data") CONFIRM_AND_CREATE_REPORT_BUTTON = ("role", "button", "Confirm and create report") BACK_TO_SELECT_DATA_BUTTON = ("role", "button", "Back") diff --git a/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py b/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py index cff82be2c..392af99be 100644 --- a/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py +++ b/tests/test_record_a_vaccine_for_patient_with_nhs_number_steps.py @@ -34,7 +34,4 @@ def test_record_a_vaccine_with_nhs_number(navigate_and_login): @scenario(f'{features_directory}/record_a_vaccine_for_patient_with_nhs_number.feature', 'Record a maternity vaccine with nhs number') def test_record_a_maternity_vaccine_with_nhs_number(navigate_and_login): - pass - - - + pass # All test steps are in conftest.py diff --git a/tests/test_reports_steps.py b/tests/test_reports_steps.py index f9bccf0b8..e0be2d63d 100644 --- a/tests/test_reports_steps.py +++ b/tests/test_reports_steps.py @@ -143,7 +143,8 @@ def the_no_vaccination_data_to_report_on_message_should_be_displayed(): @then("the Create report button should be disabled") def the_create_report_button_should_be_disabled(): - assert check_create_report_button_enabled() == False + assert check_create_report_button_exists() == False + assert check_no_vaccination_data_to_report_message_exists() == True attach_screenshot("Create report button should be disabled") logging.info("Create report button should be disabled") @@ -352,6 +353,18 @@ def the_report_is_downloaded_successfully(shared_data, nhs_number): assert not last_row[header], ( f"Column 'NoVaccinationReason' should be empty for NHS number {shared_data['nhs_number']} as vaccinated_decision is 'yes'." ) + assert last_row["Vaccine"].lower() == shared_data["chosen_vaccine"].lower(), ( + f"Mismatch in 'Vaccine': expected '{shared_data['chosen_vaccine']}' but found '{last_row['Vaccine']}'." + ) + assert last_row["VaccineProduct"].lower() == shared_data["chosen_vaccine_type"].lower(), ( + f"Mismatch in 'VaccineProduct': expected '{shared_data['chosen_vaccine_type']}' but found '{last_row['VaccineProduct']}'." + ) + assert last_row["BatchNumber"].lower() == shared_data["batch_number"].lower(), ( + f"Mismatch in 'BatchNumber': expected '{shared_data['batch_number']}' but found '{last_row['BatchNumber']}'." + ) + assert last_row["BatchExpiryDate"].lower() == shared_data["batch_expiry_date"].lower(), ( + f"Mismatch in 'BatchExpiryDate': expected '{shared_data['batch_expiry_date']}' but found '{last_row['BatchExpiryDate']}'." + ) else: assert last_row[header], ( f"Missing value in column 'NoVaccinationReason' for NHS number {shared_data['nhs_number']}." @@ -426,6 +439,30 @@ def the_report_is_downloaded_successfully(shared_data, nhs_number): f"Mismatch in 'AssessmentComments': expected '{shared_data['assessment_comments']}' but found '{last_row['AssessmentComments']}'." ) + assert last_row["AuditType"] == "Created", ( + f"Mismatch in 'AuditType': expected 'Created' but found '{last_row['AuditType']}'." + ) + + assert last_row["UserEnteringData"] == "Neelima Guntupalli", ( + f"Mismatch in 'UserEnteringData': expected 'Neelima Guntupalli' but found '{last_row['UserEnteringData']}'." + ) + + assert last_row["PrescribingMethod"] == shared_data["legal_mechanism"], ( + f"Mismatch in 'PrescribingMethod': expected '{shared_data['legal_mechanism']}' but found '{last_row['PrescribingMethod']}'." + ) + + assert last_row["VaccinationComments"] == shared_data["vaccination_comments"], ( + f"Mismatch in 'VaccinationComments': expected '{shared_data['vaccination_comments']}' but found '{last_row['VaccinationComments']}'." + ) + + assert last_row["VaccinatingClinician"] == shared_data["vaccinator"], ( + f"Mismatch in 'VaccinatingClinician': expected '{shared_data['vaccinator']}' but found '{last_row['VaccinatingClinician']}'." + ) + + assert last_row["ConsentingClinician"] == shared_data["consent_clinician_details"], ( + f"Mismatch in 'ConsentingClinician': expected '{shared_data['consent_clinician_details']}' but found '{last_row['ConsentingClinician']}'." + ) + if shared_data["consent_given_by"] != "Patient (informed consent)": assert last_row["ConsentingPersonName"].lower() == "Automation tester".lower(), ( f"Mismatch in 'ConsentingPersonName': expected 'Automation tester' but found '{last_row['ConsentingPersonName']}'."