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.

Sign up for GitHub

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

Jump to bottom

chore: merge develop into 10.0-release #20531

Merged
merged 26 commits into from
Mar 9, 2022
Merged

chore: merge develop into 10.0-release #20531

merged 26 commits into from
Mar 9, 2022

Conversation

marktnoonan
Copy link
Contributor

@marktnoonan marktnoonan commented Mar 8, 2022 •
edited
Loading

We had 14 files with merge conflicts this time around. Summary:

  • Several dependency-version-related conflicts, mostly resolved in favor of the 10.0 versions, unless develop was a higher version.
  • circle.yml conflict with branch names to test for in specific workflows, resolved by dropping old branches and adding this branch name
  • Couple of tiny conflicts related to unexpected ANSI color chars shown on Firefox warning message about chromeWebSecurity changes
  • Some conflicts around new uses in develop of the global root variable from spec_helper that's been removed in 10.0-release

The rest were straightforward conflicts where keeping both changes was fine, or it was obvious that, eg a deleted file in 10.0-release that was edited in develop should stay deleted in 10.0-release

brian-mann and others added 19 commits February 28, 2022 12:01
@brian-mann
fix: error regression - strip ansi colors out of cy.fixture() error m…
e0bd6ac 
…essage (#20335)

* fix cy.fixture regression - strip ansi colors out of fixture error message

* empty commit to appease the semantic release gods

* fix 2nd regression formatting when setting invalid config values - remove extra backtick

* increase webpack dev server timeout values
@tgriesser
chore: fix ExpectType assertions (#20395)
f0f9786 
* chore: fix  assertions

* fix ExpectType for config.baseUrl
@emilyrohrbough
release 9.5.1 [skip ci]
e896efc
@github-actions
chore: Update Chrome (beta) to 99.0.4844.51 (#20415)
134e3c0 
Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
@ryanthemanuel
chore: fix net stubbing flaky tests due to bleeding interceptions (#2…
9db7d96 
…0319)
@renovate @renovate-bot
fix(deps): update dependency url-parse to v1.5.8 [security] (#20386)
47ee6e2 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
@github-actions
chore: Update Chrome (stable) to 99.0.4844.51 (#20445)
a8fdcdc 
Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
@flotwig @emilyrohrbough
chore: fix system tests types and add type checking (#20430)
731c7fe 
Co-authored-by: Emily Rohrbough  <emilyrohrbough@users.noreply.github.com>
@github-actions
chore: Update Chrome (beta) to 100.0.4896.20 (#20479)
521a8f3 
Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
@tbiethman
fix: Prepare for Chrome's update for immutable document.domain (#20405)
5a30e76 
* Setting response header for origin-agent-cluster for runner, iframes, and proxied requests that have domain injection

* Adding comments around header injection

* Adding unit tests
@emilyrohrbough
chore: speed up mac build times in CI (#20473)
469dfe4
@emilyrohrbough
chore: update release scripts to work with AWS SSO (#20438)
ef3be70
@ryanthemanuel
test: update screenshot system-tests flake so that it no longer compa…
2e62bbb 
…res images for uniqueness that represent the same state (#20463)
@flotwig
fix: use unique install cache folders for betas (#20296)
3c28617
@renovate @renovate-bot
fix(deps): update dependency url-parse to v1.5.9 [security] (#20439)
ae3c753 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
@flotwig
docs: document patch-package best practices (#20511)
2d81628
@davidmunechika
fix: error regression - unexpected ANSI color chars shown on Firefox …
047aefc 
…warning message about chromeWebSecurity (#20512)
@marktnoonan
resolve conflicts
a7c8367
@marktnoonan
remove reference to global.root
bd3188e
@cypress-bot
Copy link
Contributor

cypress-bot bot commented Mar 8, 2022

Thanks for taking the time to open a PR!

@cypress
Copy link

cypress bot commented Mar 8, 2022 •
edited
Loading


Test summary

17787 • 0 • 217 • 0 • Flakiness 1

Run details
Project cypress
Status Passed
Commit 3a63b92
Started Mar 9, 2022 4:16 PM
Ended Mar 9, 2022 4:28 PM
Duration 11:47 💡
OS Linux Debian - 10.10
Browser Multiple

View run in Cypress Dashboard ➡️

Flakiness

cypress/e2e/commands/xhr.cy.js 1 Flakiness
1 ... > no status when request isnt forced 404

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

@marktnoonan marktnoonan marked this pull request as ready for review March 9, 2022 00:09
@marktnoonan marktnoonan requested review from lmiller1990 and flotwig and removed request for lmiller1990 March 9, 2022 00:10
lmiller1990
lmiller1990 previously approved these changes Mar 9, 2022
View reviewed changes
@lmiller1990
Copy link
Contributor

Easy one - changes seem fine, can you re-run CI to see if it's just flake?

@marktnoonan
Copy link
Contributor Author

@lmiller1990 one of the CI failures was flake, the windows one was pre-existing on 10.0-release, but not usually run on PRs, so I'll make a bug ticket for what seems to be the cause of the flake.

flotwig
flotwig previously approved these changes Mar 9, 2022
View reviewed changes
@marktnoonan marktnoonan dismissed stale reviews from flotwig and lmiller1990 via b70bbc3 March 9, 2022 14:38
@marktnoonan marktnoonan closed this Mar 9, 2022
@marktnoonan marktnoonan reopened this Mar 9, 2022
@marktnoonan
Copy link
Contributor Author

@lmiller1990 @flotwig I've fixed the failing windows tests in this branch now so we should be able to get the whole PR green.

The fix is here: https://github.com/cypress-io/cypress/pull/20531/files#diff-6e2089ba2acfd61684acf48d4f7cf5419a1e1ac4c69c853af6a99630de5ca4c2R220

Talking with Lachlan this am we pinned it down to an unintended side effect of path.normalize on windows.

Zach if you approve I'm happy to merge w/o re-approval from Lachlan if he's offline, since the solution I added is small and in line with Lachlan's suggestion.

@flotwig
Copy link
Contributor

flotwig commented Mar 9, 2022

@marktnoonan it seems weird to me that your change didn't require changing any tests, isn't this covered by some spec somewhere?

@marktnoonan
Copy link
Contributor Author

marktnoonan commented Mar 9, 2022 •
edited
Loading

@flotwig /packages/launchpad/cypress/e2e/migration.cy.ts was failing in windows due to path.normalize converting forward slashes to backslashes, so when we use a different method to manage the ./ at the start of the paths we generate, we are now avoiding those (unwanted) backslashes, so the test is passing now. The test itself was correct all along.

@marktnoonan marktnoonan merged commit 203484d into 10.0-release Mar 9, 2022
@marktnoonan marktnoonan deleted the marktnoonan/backmerge-develop-3-8-22 branch March 9, 2022 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flotwig flotwig flotwig approved these changes

@lmiller1990 lmiller1990 lmiller1990 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@marktnoonan @lmiller1990 @flotwig @brian-mann @tgriesser @emilyrohrbough @ryanthemanuel @tbiethman @davidmunechika