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

chore: change integration->e2e throughout code base #19345

Merged
merged 303 commits into from
Jan 11, 2022

Conversation

lmiller1990
Copy link
Contributor

@lmiller1990 lmiller1990 commented Dec 13, 2021

In #19319, the new specPattern API landed, replacing componentFolder and integrationFolder and testFiles with a single glob pattern.

This PR updates the entire code base to use the new specPattern API. The main changes that led to 1030 files changing are 98% renames:

  • renaming *.spec.js to *.cy.js everywhere (we have hundreds of test projects across npm and system-tests/projects)
  • this caused the need to update all system-tests snapshots, thus the huge diff
  • removing all references to integrationFolder. We no longer have the concept of a specific folder, but instead, a glob pattern.

There's still some remaining work around the new specPattern, namely validating the config - for example, specPattern cannot be a top level config option, but this behavior is needs to be carefully reviewed, so I'm doing it in another PR (I don't want such important behavior to be lost in a 1k files PR).

@lmiller1990
Copy link
Contributor Author

lmiller1990 commented Jan 10, 2022

@mjhenkes resolved - since this PR touches a lot of files, conflicts keep popping up when people merge things. I'll try to keep it conflict free as quickly as possible until we are able to merge it. I resolved the conflicts for now, but I'll keep an eye on this PR and resolve any more that might happen.

@emilyrohrbough I had this thought too - there's definitely some risk associated with a big PR like this. The trade-off is time... I'm not sure we can afford to spend a ton of time making 10x 100 file PRs instead - each PR takes time to get the CI green, review, merge, repeat.

Is your main concern we no longer executing some specs that we previously were? If so, I could do something like make a screen recording going through the CircleCI on 10.0-release and this PR, side by side, and manually verify the number of executed specs is the same. What do you think?

Also, I added another follow up ticket to our backlog to clean up a few small things: https://cypress-io.atlassian.net/browse/UNIFY-891. If there's any other nice to have but non blockers, I'd really like to pick them up separately, so they won't get lost in this huge PR.

emilyrohrbough
emilyrohrbough previously approved these changes Jan 10, 2022
@lmiller1990 lmiller1990 merged commit 1f28650 into 10.0-release Jan 11, 2022
@lmiller1990 lmiller1990 deleted the lmiller1990/update-integration-folder-to-e2e branch January 11, 2022 06:29
tgriesser added a commit that referenced this pull request Jan 11, 2022
* 10.0-release:
  chore: change integration->e2e throughout code base (#19345)
  fix(unify): correct location of snapshot pinning UI in runner (#19640)
  fix: runnable header open in IDE and filename (#19630)
  feat(unify): allow prompts to auto-open after set time (#19571)
  test(unify): Additional navigation tests for log in workflows (#19574)
  fix(unify): minor UI bugs in the reporter (#19445)
  fix: surface openSSL unhandled rejection errors that occur within plugin code (#19598)
  feat: add spec watcher to data-context (#19583)
tgriesser added a commit that referenced this pull request Jan 13, 2022
* 10.0-release: (28 commits)
  fix: flake in shelljs scripts during postinstall (#19678)
  fix: various lifecycle issues, followup to #19572 (#19683)
  feat: error screens in app when cloud runs are failing (#18980)
  fix: open browser at correct time during lifecycle (#19572)
  chore: remove unused types (#19621)
  fix: fileparts processing and cleanup (#19660)
  chore: change integration->e2e throughout code base (#19345)
  fix(unify): correct location of snapshot pinning UI in runner (#19640)
  fix: runnable header open in IDE and filename (#19630)
  feat(unify): allow prompts to auto-open after set time (#19571)
  test(unify): Additional navigation tests for log in workflows (#19574)
  fix(unify): minor UI bugs in the reporter (#19445)
  fix: surface openSSL unhandled rejection errors that occur within plugin code (#19598)
  feat: add spec watcher to data-context (#19583)
  chore: remove unused components (#19618)
  fix: dev-server types (#19576)
  test: ct audit updates (#19464)
  chore: fix temporarily skipped specs on 10.0-release (#19611)
  fix: remove gremlins characters from cypress types
  freeze ipc
  ...
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.

5 participants