Skip to content

Commit

Permalink
Ravs 1094 automate reports feature (#45)
Browse files Browse the repository at this point in the history
* screenshot helper change

* Fix screenshots]

* Fix issue with headless mode

* Set geo location

* Set geo location

* Fix issue with attaching screenshots

* Fix issue with attaching screenshots

* Fix issue with attaching screenshots

* Fix issue with attaching screenshots

* 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](pypa/setuptools@v65.5.1...v70.0.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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](actions/github-script@v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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] <[email protected]>
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](pallets/jinja@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](golang/net@v0.17.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/upload-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](docker/setup-buildx-action@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] <[email protected]>
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](actions/download-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](pallets/werkzeug@3.0.1...3.0.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: neelimaguntupalli1-nhs <[email protected]>

* 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](actions/upload-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/download-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](docker/setup-buildx-action@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] <[email protected]>
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](peaceiris/actions-gh-pages@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] <[email protected]>
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 <root@FA-0817>

* 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](actions/github-script@v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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] <[email protected]>
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](pallets/jinja@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](golang/net@v0.17.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/upload-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](docker/setup-buildx-action@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] <[email protected]>
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](actions/download-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](pallets/werkzeug@3.0.1...3.0.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: neelimaguntupalli1-nhs <[email protected]>

* 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](actions/upload-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/download-artifact@v2...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](docker/setup-buildx-action@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] <[email protected]>
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](peaceiris/actions-gh-pages@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] <[email protected]>
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] <[email protected]>
Co-authored-by: Colin Piper <[email protected]>
Co-authored-by: neelimaguntupalli1-nhs <[email protected]>
Co-authored-by: root <root@FA-0817>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: chinmaymudholkar1 <[email protected]>

* 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 <root@FA-0817>

* 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 <root@FA-0817>
Co-authored-by: Colin Piper <[email protected]>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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](pallets/werkzeug@3.0.3...3.0.6)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](nhs-england-tools/notify-msteams-action@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] <[email protected]>
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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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 <root@FA-0817>

* 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](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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](actions/cache@v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: root <root@FA-0817>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: chinmaymudholkar1 <[email protected]>
Co-authored-by: colinpiper3 <[email protected]>
Co-authored-by: Colin Piper <[email protected]>
  • Loading branch information
6 people authored Dec 3, 2024
1 parent 118950a commit 1a5c9cd
Show file tree
Hide file tree
Showing 8 changed files with 270 additions and 101 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/stage-1-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
check-file-format:
name: "Check file format"
runs-on: ubuntu-latest
timeout-minutes: 5
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand All @@ -58,7 +58,7 @@ jobs:
check-markdown-format:
name: "Check Markdown format"
runs-on: ubuntu-latest
timeout-minutes: 5
timeout-minutes: 15
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand All @@ -69,7 +69,7 @@ jobs:
check-english-usage:
name: "Check English usage"
runs-on: ubuntu-latest
timeout-minutes: 5
timeout-minutes: 15
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand All @@ -92,7 +92,7 @@ jobs:
permissions:
id-token: write
contents: read
timeout-minutes: 5
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand All @@ -111,7 +111,7 @@ jobs:
permissions:
id-token: write
contents: read
timeout-minutes: 5
timeout-minutes: 10
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand Down
102 changes: 82 additions & 20 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,26 +351,25 @@ def record_consent_details_and_click_continue_to_vaccinate(consent_decision, co
attach_screenshot("patient_decided_to_not_consent_saved_and_returned")

def enter_vaccine_details_and_click_continue_to_check_and_confirm(vaccinate_decision, care_model, vaccination_date, vaccine, vaccine_type2, vaccination_site, batch_number, batch_expiry_date, dose_amount, vaccinator, vaccination_comments, legal_mechanism, no_vaccination_reason=None):
set_vaccination_date(vaccination_date)
attach_screenshot("vaccination_date_is_set")
logging.debug("Vaccination legal mechanism is: " + legal_mechanism)
logging.debug("Vaccinator to select is: " + vaccinator)
if (legal_mechanism) != "Patient Group Direction (PGD)":
select_vaccinator_name_and_council(vaccinator)
attach_screenshot("selected_vaccinator_name_and_council")
enter_vaccination_comments(vaccination_comments)
attach_screenshot("entered_vaccination_comments")
click_care_model_option(care_model)
attach_screenshot("clicked_care_model_option")
if care_model == "Care home":
enter_care_home_details("WHITESTONES CARE HOME")
attach_screenshot("entered_care_home_details")
if vaccinate_decision.lower() == 'yes':
click_yes_vaccinated_radiobutton()
attach_screenshot("clicked_yes_vaccinated_radiobutton")

click_vaccine_type(vaccine_type2)
attach_screenshot("clicked_vaccine_type")
set_vaccination_date(vaccination_date)
attach_screenshot("vaccination_date_is_set")
click_care_model_option(care_model)
attach_screenshot("clicked_care_model_option")
if care_model == "Care home":
enter_care_home_details("WHITESTONES CARE HOME")
attach_screenshot("entered_care_home_details")
logging.debug("Vaccination legal mechanism is: " + legal_mechanism)
logging.debug("Vaccinator to select is: " + vaccinator)
if (legal_mechanism) != "Patient Group Direction (PGD)":
select_vaccinator_name_and_council(vaccinator)
attach_screenshot("selected_vaccinator_name_and_council")
enter_vaccination_comments(vaccination_comments)
attach_screenshot("entered_vaccination_comments")
select_vaccination_site(vaccination_site)
attach_screenshot("selected_vaccination_site")
batch_number_to_select = batch_number.upper() + " - " + batch_expiry_date
Expand All @@ -381,22 +380,62 @@ def enter_vaccine_details_and_click_continue_to_check_and_confirm(vaccinate_deci
attach_screenshot("entered_dose_amount_value")

if click_continue_to_check_and_confirm_screen_button() == True:
vaccination_date = format_date(vaccination_date, "safari")
set_vaccination_date(vaccination_date)
attach_screenshot("vaccination_date_is_set")
select_batch_number(batch_number_to_select)
attach_screenshot("selected_batch_number")

click_continue_to_check_and_confirm_screen_button()
attach_screenshot("clicked_continue_to_check_and_confirm_screen_button")
else:
click_not_vaccinated_radiobutton()
attach_screenshot("clicked_not_vaccinated_radiobutton")
if no_vaccination_reason is not None:
select_reason_for_no_vaccination(no_vaccination_reason)
attach_screenshot("selected_reason_for_no_vaccination")
click_save_and_return_button_on_record_vaccinated_page()
attach_screenshot("clicked_save_and_return_button_on_record_vaccinated_page")
attach_screenshot("patient_decided_to_not_vaccinate_saved_and_returned")

def enter_vaccine_details_and_click_save_and_return(vaccinate_decision, care_model, vaccination_date, vaccine, vaccine_type2, vaccination_site, batch_number, batch_expiry_date, dose_amount, vaccinator, vaccination_comments, legal_mechanism, no_vaccination_reason=None):
set_vaccination_date(vaccination_date)
attach_screenshot("vaccination_date_is_set")
logging.debug("Vaccination legal mechanism is: " + legal_mechanism)
logging.debug("Vaccinator to select is: " + vaccinator)
if (legal_mechanism) != "Patient Group Direction (PGD)":
select_vaccinator_name_and_council(vaccinator)
attach_screenshot("selected_vaccinator_name_and_council")
enter_vaccination_comments(vaccination_comments)
attach_screenshot("entered_vaccination_comments")
click_care_model_option(care_model)
attach_screenshot("clicked_care_model_option")
if care_model == "Care home":
enter_care_home_details("WHITESTONES CARE HOME")
attach_screenshot("entered_care_home_details")
if vaccinate_decision.lower() == 'yes':
click_yes_vaccinated_radiobutton()
attach_screenshot("clicked_yes_vaccinated_radiobutton")
click_vaccine_type(vaccine_type2)
attach_screenshot("clicked_vaccine_type")
select_vaccination_site(vaccination_site)
attach_screenshot("selected_vaccination_site")
batch_number_to_select = batch_number.upper() + " - " + batch_expiry_date
logging.debug("Batch number to select is: " + batch_number_to_select)
select_batch_number(batch_number_to_select)
attach_screenshot("selected_batch_number")
enter_dose_amount_value(dose_amount)
attach_screenshot("entered_dose_amount_value")
if click_continue_to_check_and_confirm_screen_button() == True:
attach_screenshot("vaccination_date_is_set")
select_batch_number(batch_number_to_select)
attach_screenshot("selected_batch_number")
click_continue_to_check_and_confirm_screen_button()
attach_screenshot("clicked_continue_to_check_and_confirm_screen_button")
else:
click_not_vaccinated_radiobutton()
attach_screenshot("clicked_not_vaccinated_radiobutton")
if no_vaccination_reason is not None:
select_reason_for_no_vaccination(no_vaccination_reason)
attach_screenshot("selected_reason_for_no_vaccination")
click_save_and_return_button_on_record_vaccinated_page
click_save_and_return_button_on_record_vaccinated_page()
attach_screenshot("clicked_save_and_return_button_on_record_vaccinated_page")
click_save_and_return_button_on_record_vaccinated_page()
attach_screenshot("patient_decided_to_not_vaccinate_saved_and_returned")
Expand Down Expand Up @@ -525,6 +564,25 @@ def step_enter_vaccination_details_and_continue_to_check_and_confirm_screen(shar
attach_screenshot("entered_vaccination_details")
logging.info(shared_data)

@when(parse("I record {vaccination} details and date as {vaccination_date} and click Save and return button"))
def step_enter_vaccination_details_and_continue_to_check_and_confirm_screen(shared_data, vaccination, vaccination_date):
shared_data["vaccinated_decision"] = vaccination
if shared_data["consent_decision"].lower() == "yes":
if shared_data["eligibility_assessment_outcome"].lower() == "give vaccine":
shared_data["vaccination_date"] = format_date(str(get_date_value(vaccination_date)), config["browser"])
chosen_vaccine = shared_data["chosen_vaccine"]
shared_data["vaccination_site"] = get_vaccination_site(shared_data["index"])
shared_data["dose_amount"] = str(get_vaccine_dose_amount(shared_data["chosen_vaccine_type"]))
if shared_data['legal_mechanism'] == "Patient Group Direction (PGD)":
shared_data['vaccinator'] = shared_data['eligibility_assessing_clinician']
else:
shared_data["vaccinator"] = get_vaccinator(shared_data["index"])
shared_data["vaccination_comments"] = shared_data["chosen_vaccine_type"] + "vaccination given on " + shared_data["vaccination_date"] + " for " + shared_data["patient_name"]
shared_data["no_vaccination_reason"] = get_vaccination_not_given_reason(shared_data["index"])
enter_vaccine_details_and_click_save_and_return(shared_data["vaccinated_decision"], shared_data["care_model"], shared_data["vaccination_date"], chosen_vaccine, shared_data["chosen_vaccine_type"], shared_data["vaccination_site"], shared_data["batch_number"], shared_data["batch_expiry_date"], shared_data["dose_amount"], shared_data["vaccinator"], shared_data["vaccination_comments"], shared_data["legal_mechanism"], shared_data["no_vaccination_reason"])
attach_screenshot("entered_vaccination_details")
logging.info(shared_data)

@then(parse("I need to be able to see the patient {name}, {dob}, {address} and vaccination details on the check and confirm screen"))
def step_see_patient_details_on_check_and_confirm_screen(shared_data, name, dob, address):
if shared_data["vaccinated_decision"].lower() == "Yes".lower() and shared_data["consent_decision"].lower() == "Yes".lower() and shared_data["eligibility_assessment_outcome"].lower() == "Give vaccine".lower():
Expand All @@ -537,6 +595,7 @@ def step_see_patient_details_on_check_and_confirm_screen(shared_data, name, dob,
assert get_patient_eligibility_assessment_date_value() == date_format_with_day_of_week(shared_data['eligibility_assessment_date'])
assert get_patient_vaccinated_date_value() == date_format_with_day_of_week(shared_data['vaccination_date'])
assert get_patient_dob_value() == date_format_with_age(dob)
shared_data['dob'] = date_format_with_age(dob)
assert get_patient_vaccination_batch_expiry_date_value() == date_format_with_name_of_month(shared_data['batch_expiry_date'])
assert get_patient_eligibility_assessing_clinician_vaccine_value() == shared_data['eligibility_assessing_clinician']
assert get_patient_consent_recorded_by_clinician_value() == shared_data['consent_clinician_details']
Expand Down Expand Up @@ -565,7 +624,10 @@ def immunisation_history_should_be_updated(shared_data):
def immunisation_history_should_be_updated(shared_data):
attach_screenshot("immunisation_history_records_count_after_vaccination")
immunisation_history_records_count_after_vaccination = get_count_of_immunisation_history_records(shared_data["chosen_vaccine"])
assert int(immunisation_history_records_count_after_vaccination) >= int(shared_data["immunisation_history_records_count_before_vaccination"]) + 1
if shared_data['vaccinated_decision'].lower() == "yes":
assert int(immunisation_history_records_count_after_vaccination) >= int(shared_data["immunisation_history_records_count_before_vaccination"]) + 1
else:
assert int(immunisation_history_records_count_after_vaccination) == int(shared_data["immunisation_history_records_count_before_vaccination"])

@then("when I click confirm and save button, the immunisation history of the patient should be updated in the patient details page")
def click_confirm_and_save_button_immunisation_history_should_be_updated(shared_data):
Expand Down
27 changes: 26 additions & 1 deletion features/reports.feature
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ Scenario Outline: Choose data page is displayed
And I select the site <site> and click continue
Then the choose data page should be displayed and all data options should be checked by default


Examples:
|vaccineType | site |
| COVID-19 | Albert House |
Expand Down Expand Up @@ -178,3 +177,29 @@ Scenario Outline: User can download the report
| index | nhs_number | site | care_model | eligibility | assess_date | consent | vaccination | vaccination_date | name | dob | address | chosen_vaccine | batch_number | batch_expiry_date |
| 0 | 9693632109 | Albert House | Vaccination Centre open to the public | yes | today | yes | yes | today | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | AUTOMATION-SJ1 | 19/10/2026 |
| 0 | 9693632109 | Albert House | Vaccination Centre open to the public | yes | today | yes | yes | today-32 | Bill GARTON | 23/6/1946 | 1 MOUNT AVENUE, BARTON-UPON-HUMBER, S HUMBERSIDE, DN18 5DW | COVID-19 | AUTOMATION-SJ1 | 19/10/2026 |

Scenario Outline: Record a vaccine and generate a report for no vaccination decision on the last screen
Given I am logged into the RAVS app
And I login to RAVS and set vaccinator details with <site> and <care_model> and get patient details for <nhs_number> with option <index> and choose to vaccinate with vaccine details as <chosen_vaccine>, <batch_number> with <batch_expiry_date>
And I search for a patient with the NHS number in the find a patient screen
And I open the patient record by clicking on patient <name>
When I click choose vaccine button and choose the <chosen_vaccine>, <batch_number> with <batch_expiry_date> and click continue
And I assess the patient's <eligibility> with the details and date as <assess_date> and click continue to record consent screen button
And I record <consent> with the details and click continue to vaccinate button
And I record <vaccination> details and date as <vaccination_date> and click Save and return button
Then I search for a patient with the NHS number in the find a patient screen
And I open the patient record by clicking on patient <name>
And the immunisation history of the patient should be updated in the patient details page and not be deleted
When I click the reports navigation link
And I click the create report button
And I click the Today radio button and click Continue
And I select the vaccine type <chosen_vaccine> 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 and contains the vaccine record for <nhs_number>

Examples:
| index | nhs_number | site | care_model | eligibility | assess_date | consent | vaccination | vaccination_date | name | dob | address | chosen_vaccine | batch_number | batch_expiry_date |
| 4 | 9437541817 | KINGSTON HOUSE | Outreach event | yes | today | yes | no | today | FLORINDA DUNNER | 27/3/1957 | 32 HOLLAND ROAD, MANCHESTER, M8 4NP | Flu | AUTOMATION-SJ1 | 19/10/2026 |
4 changes: 2 additions & 2 deletions helpers/playwrightHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def find_element_and_perform_action(self, locator_or_element, action, inputValue
if element.is_visible():
if element.text_content() != '':
element.clear() # Clear existing text
element.type(inputValue)
element.type(inputValue, delay=50)
print(f"Typed text '{inputValue}' successfully.")
else:
print(f"Unsupported action: {action}")
Expand Down Expand Up @@ -381,7 +381,7 @@ def get_element_by_type(self, locator_type_or_selector, locator_value=None, name
elif locator_type_or_selector == "text":
return self.page.get_by_text(locator_value, exact=exact)
elif locator_type_or_selector == "label":
return self.page.get_by_label(locator_value, exact=exact)
return self.page.get_by_label(locator_value, exact=exact).nth(0)
elif locator_type_or_selector == "placeholder":
return self.page.get_by_placeholder(locator_value)
elif locator_type_or_selector == "xpath":
Expand Down
16 changes: 8 additions & 8 deletions pages/find_a_patient_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
PAGE_LOADING_ELEMENT = ("text", "Loading...Loading...")

# Shared
NHS_NUMBER_INPUT = ("label", "Enter a 10 digit NHS number")

FIRST_NAME_INPUT = ("label", "First name")
LAST_NAME_INPUT = ("label", "Last name")
GENDER_OPTIONAL_SELECT = ("label", "Gender field optional")
POSTCODE_OPTIONAL_INPUT = ("label", "Postcode field optional")
GENDER_SELECT = ("label", "Gender")
POSTCODE_INPUT = ("label", "Postcode")
NHS_NUMBER_INPUT = ("id", "NhsNumber")

FIRST_NAME_INPUT = ("id", "FirstName")
LAST_NAME_INPUT = ("id", "LastName")
GENDER_OPTIONAL_SELECT = ("id", "GenderId")
POSTCODE_OPTIONAL_INPUT = ("id", "Postcode")
GENDER_SELECT = ("id", "GenderId")
POSTCODE_INPUT = ("id", "Postcode")
DOB_DAY_INPUT = ("label", "Day")
DOB_MONTH_INPUT = ("label", "Month")
DOB_YEAR_INPUT = ("label", "Year")
Expand Down
6 changes: 4 additions & 2 deletions pages/record_vaccinated_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from test_data.get_values_from_models import get_covid_vaccine_xpath, get_flu_vaccine_xpath

YES_VACCINATED_RADIO_BUTTON=("label", "Yes")
NO_VACCINATED_RADIO_BUTTON=("label", "No")
NO_VACCINATED_RADIO_BUTTON=("label", "No", True)
VACCINATOR_DROPDOWN_ELEMENT = ("label","Vaccinator")
SAVE_AND_RETURN_BUTTON=("role", "button", "Save and return")
CONTINUE_TO_CHECK_AND_CONFIRM_BUTTON=("role", "button", "Continue")
Expand Down Expand Up @@ -62,10 +62,12 @@ def check_no_to_vaccinated_radiobutton_exists():
return check_element_exists(NO_VACCINATED_RADIO_BUTTON, True)

def click_yes_vaccinated_radiobutton():
wait_for_element_to_appear(YES_VACCINATED_RADIO_BUTTON)
find_element_and_perform_action(YES_VACCINATED_RADIO_BUTTON, "click")

def click_not_vaccinated_radiobutton():
find_element_and_perform_action(NO_VACCINATED_RADIO_BUTTON, "click")
wait_for_element_to_appear(NO_VACCINATED_RADIO_BUTTON)
find_element_and_perform_action(NO_VACCINATED_RADIO_BUTTON, "check")

def select_vaccinator_name_and_council(nameandcouncil):
if check_element_enabled(VACCINATOR_DROPDOWN_ELEMENT):
Expand Down
2 changes: 1 addition & 1 deletion pages/reports_data_selection_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def check_continue_to_reports_check_and_confirm_button_exists():
wait_for_element_to_disappear(PAGE_LOADING_ELEMENT)
wait_for_element_to_appear(CONTINUE_TO_REPORTS_CHECK_AND_CONFIRM_BUTTON)
return check_element_exists(CONTINUE_TO_REPORTS_CHECK_AND_CONFIRM_BUTTON)

def click_continue_to_reports_select_data_button():
wait_for_element_to_disappear(PAGE_LOADING_ELEMENT)
wait_for_element_to_appear(CONTINUE_TO_REPORTS_CHECK_AND_CONFIRM_BUTTON)
Expand Down
Loading

0 comments on commit 1a5c9cd

Please sign in to comment.