Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop onto Main #1119

Merged
merged 9 commits into from
Sep 11, 2024
Merged

Merge Develop onto Main #1119

merged 9 commits into from
Sep 11, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 3, 2024

This PR was auto-generated - see create-release-pr.yml and
actions/github-script.
Merging this PR will trigger an automatic deployment to production.

* Move welcome e2e tests to tests folder

* Tidy up existing test

* Add header section test

* Add account actions section test

* Simplify image src value

* Add Apply code tests

* Remove non used var

* Add about-you page tests

* Add disable service emails tests

* fix: stop pre-commit add all command

* upgrade: cypress

* fix: hydration issue in meet the team page

* move: cypress tests into correct folder

* fix: racey cypress tests

* fix: timeouts in cypress tests and removing async

* fix: async issues in reset password cypress test

* feat: fix checkPageUrl

* Fix: racey user account page tests

* fix: don't clean up users after test run only before

* fix: urls now that the NEXT_PUBLIC_API_URL no longer has a trailing slash

* fix: return user in cy.logInWithEMailAndPassword

* fix: signInWithEmailAndPassword cypress command

* fix: before.cy.tsx to chain events properly

* fix: checkPageUrl

* fix: checkUrl should check pathname not full url

* fix: remove after.tsx

* fix: meet-the-team cypress test

* Home e2e test (#1098)

* Move meet-the-team page to new cypress test location

* Add join us section test

* Add our free services section test

* Add why bloom section test

* Add our bloom team section test

* Add our themes section test

* Add testimonial section test

* Add create access code badoo tests (#1102)

* Admin e2e test (#1101)

* Add ids to form fields

* Add admin dashboard tests

* build(deps): bump react-cookie-consent from 8.0.1 to 9.0.0

Bumps [react-cookie-consent](https://github.com/Mastermindzh/react-cookie-consent) from 8.0.1 to 9.0.0.
- [Release notes](https://github.com/Mastermindzh/react-cookie-consent/releases)
- [Changelog](https://github.com/Mastermindzh/react-cookie-consent/blob/master/CHANGELOG.md)
- [Commits](Mastermindzh/react-cookie-consent@8.0.1...9.0.0)

---
updated-dependencies:
- dependency-name: react-cookie-consent
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix removed only after merge

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ellie Re'em <eleanor.reem@hotmail.co.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link

vercel bot commented Sep 3, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
bloom-frontend ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 11, 2024 10:18am

* Add id to phone input

* Create subscription whatsapp data

* Create subscription whatsapp tests

* fix: stop pre-commit add all command

* upgrade: cypress

* fix: hydration issue in meet the team page

* move: cypress tests into correct folder

* fix: racey cypress tests

* fix: timeouts in cypress tests and removing async

* fix: async issues in reset password cypress test

* feat: fix checkPageUrl

* Fix: racey user account page tests

* fix: don't clean up users after test run only before

* fix: urls now that the NEXT_PUBLIC_API_URL no longer has a trailing slash

* fix: return user in cy.logInWithEMailAndPassword

* fix: signInWithEmailAndPassword cypress command

* fix: before.cy.tsx to chain events properly

* fix: checkPageUrl

* fix: add cy.wait as form seems to detach in user-account-settings.tsx

* fix: checkUrl should check pathname not full url

* fix: extend wait for email  form to reload

* fix: remove after.tsx

* fix: meet-the-team cypress test

* Home e2e test (#1098)

* Move meet-the-team page to new cypress test location

* Add join us section test

* Add our free services section test

* Add why bloom section test

* Add our bloom team section test

* Add our themes section test

* Add testimonial section test

* Add create access code badoo tests (#1102)

* Admin e2e test (#1101)

* Add ids to form fields

* Add admin dashboard tests

* build(deps): bump react-cookie-consent from 8.0.1 to 9.0.0

Bumps [react-cookie-consent](https://github.com/Mastermindzh/react-cookie-consent) from 8.0.1 to 9.0.0.
- [Release notes](https://github.com/Mastermindzh/react-cookie-consent/releases)
- [Changelog](https://github.com/Mastermindzh/react-cookie-consent/blob/master/CHANGELOG.md)
- [Commits](Mastermindzh/react-cookie-consent@8.0.1...9.0.0)

---
updated-dependencies:
- dependency-name: react-cookie-consent
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge subscription tests within notes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ellie Re'em <eleanor.reem@hotmail.co.uk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@annarhughes annarhughes merged commit c9246d3 into main Sep 11, 2024
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants