Skip to content

chore: merge develop into 10.0-release and resolve conflicts #19134

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
Merged
merged 18 commits into from
Nov 29, 2021
Merged

chore: merge develop into 10.0-release and resolve conflicts #19134

merged 18 commits into from
Nov 29, 2021

Conversation

@lmiller1990
Copy link
Contributor

@lmiller1990 lmiller1990 commented Nov 29, 2021 •
edited
Loading

NO SQUASH

Big PR due to significant refactor around system-tests in develop recently (#18574)

semantic-release-bot and others added 17 commits November 29, 2021 12:38
@semantic-release-bot @lmiller1990
chore: release @cypress/vite-dev-server-v2.2.1
b60620d 
[skip ci]
@lmiller1990
fix: Restore broken gif (#18987)
b637334
@davidmunechika @lmiller1990
feat: Set CYPRESS=true as env var in child processes where Cypress ru…
e2e7618 
…ns user code in Node (#18981)
@emilyrohrbough @lmiller1990
fix: test config overrides leak for .only execution (#18961)
6e8296e
@renovate @renovate-bot @lmiller1990
chore(deps): update dependency aws-sdk to v2.814.0 [security] (#18948)
f7fbcf5 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
@michel-kraemer @emilyrohrbough @lmiller1990
fix(react): link to rerender example (#19020)
552d3a1 
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@lmiller1990
fix: Allow 'this' to be used in overridden commands (#18899)
25e525d
@emilyrohrbough @lmiller1990
release 9.1.0 [skip ci]
9bc80e2
@mjhenkes @lmiller1990
'Fix' flaky redirect test (#19042)
9a83eb3
@sainthkh @lmiller1990
fix: the shadow root container element is ignored when clicking an el…
d16a8ee 
…ement in it. (#18908)
@flotwig @lmiller1990
chore(contributing): clarify PULL_REQUEST_TEMPLATE (#19068)
c3cd331
@emilyrohrbough @lmiller1990
chore: remove flaky ci jobs for main builds (#19071)
b799df6
@renovate @renovate-bot
@emilyrohrbough @lmiller1990
chore(deps): update dependency semantic-release to v17.2.3 [security] (…
bb7b82d 
…#19022)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@lmiller1990
update yarn.lock
dd44be2
@flotwig @emilyrohrbough @lmiller1990
test: node_modules installs for system-tests, other improvements (#18574
28a9123 
)

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@lmiller1990
resolve conflicts
ae9b7a3
@lmiller1990
fix failing tests due to merge
fe5c05d
@lmiller1990 lmiller1990 requested a review from a team as a code owner November 29, 2021 09:25
@lmiller1990 lmiller1990 requested review from jennifer-shehane and removed request for a team November 29, 2021 09:25
@cypress-bot
Copy link
Contributor

cypress-bot bot commented Nov 29, 2021

Thanks for taking the time to open a PR!

@lmiller1990 lmiller1990 removed the request for review from jennifer-shehane November 29, 2021 09:26
@cypress
Copy link

cypress bot commented Nov 29, 2021 •
edited
Loading


Test summary

18145 • 0 • 202 • 0 • Flakiness 4

Run details
Project cypress
Status Passed
Commit 40ec175
Started Nov 29, 2021 10:03 AM
Ended Nov 29, 2021 10:15 AM
Duration 12:04 💡
OS Linux Debian - 10.10
Browser Multiple

View run in Cypress Dashboard ➡️

Flakiness

cypress/integration/commands/net_stubbing_spec.ts 4 Flakiness
1 network stubbing > intercepting request > can delay and throttle a StaticResponse
2 network stubbing > waiting and aliasing > can timeout incrementally waiting on requests
3 ... > different origin with response interception (HTTPS)
4 network stubbing > waiting and aliasing > can timeout waiting on a single request using "alias.request"

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

@lmiller1990 lmiller1990 merged commit b9f8364 into 10.0-release Nov 29, 2021
@lmiller1990 lmiller1990 deleted the lmiller1990/2021-11-29-merge-develop-into-10.0-release branch November 29, 2021 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

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

@lmiller1990 @semantic-release-bot @davidmunechika @emilyrohrbough @michel-kraemer @mjhenkes @sainthkh @flotwig