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

Upgrade to cypress 12 (into feature/cypress12) #668

Merged
merged 23 commits into from
Aug 24, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented May 24, 2023

Description

Creating Draft PR to understand what is required to migrate to Cypress 12 from Cypress 9.

For this PR to get the specs working I had to:

  • Rename cypress/support/index.js -> cypress/support/e2e.js
  • Turn off rule "cypress/unsafe-to-chain-command": "off" as there were 290 violations - I will file a follow-up issue to resolve the violations and re-enable the rule.
  • Added specPattern to the e2e section of the cypress config
  • The e2e section of the cypress config was added by another user with a similar PR, I copied that into here and the only modification I made was adding the specPattern into that section.

Cypress Migration Guide: https://docs.cypress.io/guides/references/migration-guide

Issues Resolved

#408

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@peterzhuamazon
Copy link
Member

Possible replacement of this one PR:

package.json Outdated Show resolved Hide resolved
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon
Copy link
Member

peterzhuamazon commented May 25, 2023

@ananzh
Copy link
Member

ananzh commented May 26, 2023

Cypress functional test fixed PR: #682

@kavilla
Copy link
Member

kavilla commented May 31, 2023

Is this still slated for 2.8?

@peterzhuamazon
Copy link
Member

There are a lot more tests so we will postpone this.

@cwperks cwperks changed the base branch from main to feature/cypress12 August 15, 2023 16:05
@cwperks
Copy link
Member Author

cwperks commented Aug 15, 2023

Rebasing to feature/cypress12. This will be worked on in a feature branch to determine all tests that need to be updated to upgrade cypress from v9 to v12.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
cwperks and others added 12 commits August 21, 2023 13:43
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>
@cwperks
Copy link
Member Author

cwperks commented Aug 24, 2023

Could a maintainer of this repo please review this / merge this into the feature (feature/cypress12) branch?

I plan to open up issues in all of the dashboards plugin repos to ensure their tests run with Cypress12 and request that any dashboards plugin that needs to update tests make a PR against the feature/cypress12 branch to show the tests working.

Once all dashboards plugins have verified their tests run with Cypress12 we can proceed to merging the feature branch into main.

The migration guide for cypress can be found here: https://docs.cypress.io/guides/references/migration-guide

Copy link
Member

@peterzhuamazon peterzhuamazon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need more changes from individual plugin repos.
And @cwperks @RyanL1997 will help with that meta issue.

Thanks

@peterzhuamazon peterzhuamazon merged commit 63aeb32 into opensearch-project:feature/cypress12 Aug 24, 2023
20 of 33 checks passed
@peterzhuamazon peterzhuamazon changed the title Upgrade to cypress 12 Upgrade to cypress 12 (into feature/cypress12) Aug 24, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-668-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 63aeb324b5378984cce6d7846d6c719d6c81428f
# Push it to GitHub
git push --set-upstream origin backport/backport-668-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-668-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

4 participants