Skip to content

chore: merge develop into 10.0#21609

Merged
ZachJW34 merged 18 commits into
10.0-releasefrom
zachw/merge-develop-10.0
May 24, 2022
Merged

chore: merge develop into 10.0#21609
ZachJW34 merged 18 commits into
10.0-releasefrom
zachw/merge-develop-10.0

Conversation

@ZachJW34
Copy link
Copy Markdown
Contributor

@ZachJW34 ZachJW34 commented May 24, 2022

User facing changelog

na

Additional details

Last develop to 10.0 merge. There were some conflicts with vite-dev-server but the package has been reworked on 10.0 so all files could be deleted. I moved the test covering the conflicts into npm/vite-dev-server.

I have a backup of develop here in case things go south.

How has the user experience changed?

na

PR Tasks

  • Have tests been added/updated?
  • Has the original issue (or this PR, if no issue exists) been tagged with a release in ZenHub? (user-facing changes only)
  • Has a PR for user-facing changes been opened in cypress-documentation?
  • Have API changes been updated in the type definitions?
  • Have new configuration options been added to the cypress.schema.json?

@ZachJW34 ZachJW34 requested review from a team as code owners May 24, 2022 03:11
@cypress-bot
Copy link
Copy Markdown
Contributor

cypress-bot Bot commented May 24, 2022

Thanks for taking the time to open a PR!

@ZachJW34 ZachJW34 requested review from a team, emilyrohrbough, jennifer-shehane, marktnoonan and tgriesser and removed request for a team May 24, 2022 03:11
@cypress
Copy link
Copy Markdown

cypress Bot commented May 24, 2022



Test summary

37529 0 454 0Flakiness 6


Run details

Project cypress
Status Passed
Commit e487364
Started May 24, 2022 3:43 PM
Ended May 24, 2022 4:03 PM
Duration 19:29 💡
OS Linux Debian - 10.11
Browser Multiple

View run in Cypress Dashboard ➡️


Flakiness

commands/actions/click.cy.js Flakiness
1 ... > scroll-behavior > can scroll to and click elements in html with scroll-behavior: smooth
commands/net_stubbing.cy.ts Flakiness
1 network stubbing > intercepting request > can delay and throttle a StaticResponse
2 network stubbing > intercepting request > can delay and throttle a StaticResponse
next.cy.ts Flakiness
1 Working with next-12.1.6 > should detect new spec
cypress/proxy-logging.cy.ts Flakiness
1 Proxy Logging > request logging > xhr log has response body/status code when xhr response is logged second
This comment includes only the first 5 flaky tests. See all 6 flaky tests in the Cypress Dashboard.

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@ZachJW34
Copy link
Copy Markdown
Contributor Author

Merged develop again, small conflict in packages/runner/webpack.config.ts where a // ts-ignore was removed from a block of code that was removed entirely in 10.0

@ZachJW34 ZachJW34 merged commit 015e948 into 10.0-release May 24, 2022
@ZachJW34 ZachJW34 deleted the zachw/merge-develop-10.0 branch May 24, 2022 16:08
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.