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

Add EE E2E Test Coverage Support and Fix Edit Stage Instance Bug #2326

Merged
merged 9 commits into from
Jun 27, 2023

Conversation

Pezmc
Copy link
Contributor

@Pezmc Pezmc commented Jun 22, 2023

Description

This PR has two halves:

  • Fixing the bug when changing a stages instance
  • Adding support for EE E2E test coverage to flowforge

Cypress commands are now as follows:

  cy:web-server
    npm-run-all --parallel cy:web-server:os cy:web-server:ee
  cy:web-server:os
    node ./test/e2e/frontend/test_environment_os
  cy:web-server:ee
    node ./test/e2e/frontend/test_environment_ee
  cy:run
    npm-run-all --parallel cy:run:os cy:run:ee
  cy:run:os
    cypress run --config-file ./config/cypress-os.config.js
  cy:run:ee
    cypress run --config-file ./config/cypress-ee.config.js
  cy:open:os
    cypress open --config-file ./config/cypress-os.config.js
  cy:open:ee
    cypress open --config-file ./config/cypress-ee.config.js

A developer would run cy:web-server(:os/:ee) and then cy:open:os or cy:open:ee to work on the tests.

To run the tests cy:web-server(:os/:ee) and then cy:run(:ee/:os)

The EE E2E tests live in test/e2e/frontend/cypress/tests-ee

Related Issue(s)

Fixes #2287

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on flowforge/helm to update ConfigMap Template
    • Issue/PR raised on flowforge/CloudProject to update values for Staging/Production

Labels

  • Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

@Pezmc Pezmc marked this pull request as ready for review June 27, 2023 13:49
@Pezmc Pezmc requested a review from joepavitt June 27, 2023 13:49
@Pezmc
Copy link
Contributor Author

Pezmc commented Jun 27, 2023

This PR now has test coverage. Importantly this is EE test coverage.

Going forward, EE E2E test coverage lives in: test/e2e/frontend/cypress/tests-ee

You can run EE E2E test coverage using: npm run cy:web-server:ee and npm run cy:run:ee

OS is also now scoped to: npm run cy:web-server:os and npm run cy:run:os

cy:run, cy:web-server will run both EE and OS in parallel.

@joepavitt
Copy link
Contributor

worth updating PR title just to reflect the scope of work done here now?

@Pezmc Pezmc changed the title Use instanceId not instance on edit Add EE E2E Test Coverage Support and Fix Edit Stage Instance Bug Jun 27, 2023
@joepavitt joepavitt self-requested a review June 27, 2023 14:11
@joepavitt joepavitt merged commit 1fa35f3 into main Jun 27, 2023
4 checks passed
@joepavitt joepavitt deleted the fix-2287-swap-pipeline-instance branch June 27, 2023 14:11
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.

Cannot change Instance on a Pipeline Stage
2 participants