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

fix: retain original array after defaultsDeep #27240 #27312

Merged
merged 21 commits into from Mar 25, 2024

Conversation

lmiller1990
Copy link
Contributor

@lmiller1990 lmiller1990 commented Jul 17, 2023

note remaking - original PR #27312 got stuck on red on CI, I could not get it to pass. New branch is fine 🤷

Additional details

What is affected by this change?
Previously the defaultsDeep function was merging/combining arrays. This PR will fix that issue and restore any arrays modified by the setupNodeEvents function.

Steps to test

To test, copy the cypress.config.js from the reproduction section of the issue and configure for e2e testing. Then run cypress using yarn cypress open --dev --config-file cypress.config.js. After setting any key within the config object to any array value (within the setupNodeEvents function), it should reflect as is in the final config.

How has the user experience changed?

User will get the exact config they supply in the setupNodeEvents function.

PR Tasks

@cypress
Copy link

cypress bot commented Jul 17, 2023

8 flaky tests on run #54622 ↗︎

0 29118 1332 0 Flakiness 8

Details:

fix typo and move changelog entry and fix link
Project: cypress Commit: 7b8dc96616
Status: Passed Duration: 30:25 💡
Started: Mar 25, 2024 1:21 PM Ended: Mar 25, 2024 1:52 PM
Flakiness  e2e/origin/basic_login.cy.ts • 1 flaky test • 5x-driver-firefox

View Output

Test Artifacts
... > establishes a session
    </td>
  </tr></table>
Flakiness  commands/files.cy.js • 1 flaky test • 5x-driver-electron

View Output

Test Artifacts
... > passes through assertion error when not about existence Test Replay
Flakiness  commands/net_stubbing.cy.ts • 1 flaky test • 5x-driver-chrome

View Output

Test Artifacts
network stubbing > waiting and aliasing > yields the expected interception when two requests are raced Test Replay
Flakiness  commands/querying/querying.cy.js • 1 flaky test • 5x-driver-chrome

View Output

Test Artifacts
... > throws when alias property is `0` Test Replay
Flakiness  commands/waiting.cy.js • 1 flaky test • 5x-driver-chrome

View Output

Test Artifacts
... > errors > throws when waiting for 2nd response to route Test Replay

The first 5 flaky specs are shown, see all 7 specs in Cypress Cloud.

Review all test suite changes for PR #27312 ↗︎

@lmiller1990
Copy link
Contributor Author

@NiharPhansalkar #27240 kept failing - I made a new branch and it passes fine, I am not sure why. I've seen this happen before -- some CI weirdness.

Can you approve this? I left an approval on your original PR, but had to remake it. You'll still get credit, your commits are here.

@NiharPhansalkar
Copy link
Contributor

Sure will approve!

@cypress-app-bot
Copy link
Collaborator

This PR has not had any activity in 180 days. If no activity is detected in the next 14 days, this PR will be closed.

@cypress-app-bot cypress-app-bot added the stale no activity on this issue for a long period label Feb 26, 2024
@jennifer-shehane jennifer-shehane removed the stale no activity on this issue for a long period label Mar 1, 2024
@AtofStryker AtofStryker merged commit 19075c7 into develop Mar 25, 2024
80 of 82 checks passed
@AtofStryker AtofStryker deleted the lmiller/issue-27103 branch March 25, 2024 14:00
cacieprins added a commit that referenced this pull request Mar 26, 2024
* modifying object after array combination to hold older values

* regression test

* made suggested changes

* config defaults

* log

* logs

* log

* log again

* update log

* changelog

* updates changelog

* fix typo and move changelog entry and fix link

---------

Co-authored-by: Nihar Phansalkar <phansalkarnihar@gmail.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
Co-authored-by: Cacie Prins <cacie@cypress.io>
Co-authored-by: AtofStryker <bglesias@gmail.com>
cacieprins added a commit that referenced this pull request Mar 26, 2024
* modifying object after array combination to hold older values

* regression test

* made suggested changes

* config defaults

* log

* logs

* log

* log again

* update log

* changelog

* updates changelog

* fix typo and move changelog entry and fix link

---------

Co-authored-by: Nihar Phansalkar <phansalkarnihar@gmail.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
Co-authored-by: Cacie Prins <cacie@cypress.io>
Co-authored-by: AtofStryker <bglesias@gmail.com>
cacieprins added a commit that referenced this pull request Mar 26, 2024
* modifying object after array combination to hold older values

* regression test

* made suggested changes

* config defaults

* log

* logs

* log

* log again

* update log

* changelog

* updates changelog

* fix typo and move changelog entry and fix link

---------

Co-authored-by: Nihar Phansalkar <phansalkarnihar@gmail.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
Co-authored-by: Cacie Prins <cacie@cypress.io>
Co-authored-by: AtofStryker <bglesias@gmail.com>
cacieprins added a commit that referenced this pull request Mar 26, 2024
* modifying object after array combination to hold older values

* regression test

* made suggested changes

* config defaults

* log

* logs

* log

* log again

* update log

* changelog

* updates changelog

* fix typo and move changelog entry and fix link

---------

Co-authored-by: Nihar Phansalkar <phansalkarnihar@gmail.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
Co-authored-by: Cacie Prins <cacie@cypress.io>
Co-authored-by: AtofStryker <bglesias@gmail.com>
cacieprins added a commit that referenced this pull request Mar 26, 2024
* modifying object after array combination to hold older values

* regression test

* made suggested changes

* config defaults

* log

* logs

* log

* log again

* update log

* changelog

* updates changelog

* fix typo and move changelog entry and fix link

---------

Co-authored-by: Nihar Phansalkar <phansalkarnihar@gmail.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
Co-authored-by: Cacie Prins <cacie@cypress.io>
Co-authored-by: AtofStryker <bglesias@gmail.com>
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.

Empty returned specPattern doesn't yield error if specPattern was originally an array
6 participants