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

chore: Use upstream cypress-testing-library again #25548

Merged
merged 7 commits into from
Jan 30, 2023

Conversation

BlueWinds
Copy link
Contributor

User facing changelog

No user facing changes.

Additional details

During the rollout of Cypress 12, we used a fork of @testing-library/cypress. They've now merged in our changes, so it's no longer necessary. This PR moves Cypress back to using the upstream version rather than our fork.

Steps to test

How has the user experience changed?

PR Tasks

  • [n/a] 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)
  • [n/a] Has a PR for user-facing changes been opened in cypress-documentation?
  • [n/a] Have API changes been updated in the type definitions?

@cypress
Copy link

cypress bot commented Jan 24, 2023

1 flaky tests on run #43619 ↗︎

0 93 0 0 Flakiness 1

Details:

Merge branch 'develop' into issue-24529-cypress-testing-use-upstream
Project: cypress Commit: 8733622ba7
Status: Passed Duration: 16:03 💡
Started: Jan 30, 2023 10:52 PM Ended: Jan 30, 2023 11:08 PM
Flakiness  cypress/e2e/next.cy.ts • 1 flaky test • webpack-dev-server

View Output Video

Test
Working with next-12.1.6 > should show compilation errors on src changes Screenshot

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@BlueWinds
Copy link
Contributor Author

The two failing tests are unrelated and flaky, going to merge this in.

@BlueWinds BlueWinds merged commit 09091d2 into develop Jan 30, 2023
@BlueWinds BlueWinds deleted the issue-24529-cypress-testing-use-upstream branch January 30, 2023 22:50
tgriesser added a commit that referenced this pull request Jan 31, 2023
* develop:
  chore: fix changlelog section parsing and reference right ENV (#25633)
  feat: Debug page [IATR] (#25488)
  fix(deps): update dependency underscore.string to v3.3.6 🌟 (#25574)
  chore: Use upstream cypress-testing-library again (#25548)
  fix: match alternate edge version string format (#25457)
  chore: update name for graphql batch operations (#25610)
  chore: clean up config for external contibutors (#25552)
  chore: fix childProcess.execSync encoding (#25625)
  chore: update next-version to handle using the next bump package.json… (#25599)
  chore: update packages/example deployment script and cleanup package/example (#25091)
  fix: allow version 9 of the babel-loader peer dependency (#25569)
  docs: remove cypress-example-todomvc-redux from release-process (#25613)
  chore: bump version and remove misleading changelog entry (#25612)
BlueWinds pushed a commit that referenced this pull request Feb 1, 2023
* fix: match alternate edge version string format (#25457)

* fix: match alternate edge version string format

* chore: add changelog entry

* Apply suggestions from code review

* Update cli/CHANGELOG.md

* Update cli/CHANGELOG.md

* chore: update changelog to release on Tuesday for 12.5

* [run ci]

---------

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Co-authored-by: Bill Glesias <bglesias@gmail.com>

* chore: Use upstream cypress-testing-library again (#25548)

* chore: Use upstream cypress-testing-library again

* Update cypress-example-kitchensink commit hash

* Revert "Update cypress-example-kitchensink commit hash"

This reverts commit 8de5d1f.

---------

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>

* fix(deps): update dependency underscore.string to v3.3.6 🌟 (#25574)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Bill Glesias <bglesias@gmail.com>

* feat: Debug page [IATR] (#25488)

Co-authored-by: Zachary Williams <ZachJW34@gmail.com>
Co-authored-by: Ankit <ankit@cypress.io>
Co-authored-by: Stokes Player <stokes.player@gmail.com>
Co-authored-by: elevatebart <bart@cypress.io>
Co-authored-by: Rocky <25568640+rockindahizzy@users.noreply.github.com>
Co-authored-by: Stokes Player <stokes@cypress.io>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Co-authored-by: Mark Noonan <mark@cypress.io>
Co-authored-by: Mike Plummer <mikep@cypress.io>
Co-authored-by: amehta265 <65267668+amehta265@users.noreply.github.com>
Co-authored-by: Adam Stone-Lord <adams@cypress.io>
Co-authored-by: Mike Plummer <mike-plummer@users.noreply.github.com>
Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>

* chore: fix changlelog section parsing and reference right ENV (#25633)

* test: skip flaky migration test (#25378)

* chore: Update README to add Cloud badges (#25645)

* perf: remove reporter logs for collapsed tests in run mode (#25632)

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>

* chore: 12.5.0 release (#25648)

* dependency: update dependency simple-git to v3.16.0 [security] (#25603)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zachary Williams <zachjw34@gmail.com>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>

* chore: renovate semantic types and percy ci updates (#25651)

---------

Co-authored-by: Steven Collins <steven@carboncollins.uk>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Co-authored-by: Bill Glesias <bglesias@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Stokes Player <stokes@cypress.io>
Co-authored-by: Zachary Williams <ZachJW34@gmail.com>
Co-authored-by: Ankit <ankit@cypress.io>
Co-authored-by: Stokes Player <stokes.player@gmail.com>
Co-authored-by: elevatebart <bart@cypress.io>
Co-authored-by: Rocky <25568640+rockindahizzy@users.noreply.github.com>
Co-authored-by: Mark Noonan <mark@cypress.io>
Co-authored-by: Mike Plummer <mikep@cypress.io>
Co-authored-by: amehta265 <65267668+amehta265@users.noreply.github.com>
Co-authored-by: Adam Stone-Lord <adams@cypress.io>
Co-authored-by: Mike Plummer <mike-plummer@users.noreply.github.com>
Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
Co-authored-by: Jennifer Shehane <jennifer@cypress.io>
Co-authored-by: Matt Schile <mschile@cypress.io>
@AtofStryker AtofStryker removed their assignment Mar 23, 2023
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.

Update cypress-testing-library dependency back to upstream after they update to queries
3 participants