Skip to content

Commit

Permalink
Merge branch '10.0-release' into tgriesser/feat/remoteField-stitching
Browse files Browse the repository at this point in the history
* 10.0-release: (22 commits)
  fix: migrate multiples projects when in global mode (#21458)
  test: fix flaky cy-in-cy selector validity test (#21360)
  chore: remove unused codeGenGlobs (#21438)
  fix: use correct path for scaffolding spec on CT (#21411)
  fix: remove breaking options from testing type on migration (#21437)
  fix: test-recording instructions in Component Test mode (#21422)
  feat: distinguish app vs launchpad utm_source when using utm params (#21424)
  chore: update stubbed cloud types (#21451)
  chore: change to yarn registry
  fix(sessions): refactor flows, fix grouping bugs and align validation fail text (#21379)
  chore(sessions): more driver tests (#21378)
  chore: rename domain_fn to origin_fn (#21413)
  chore: release 9.6.1 (#21404)
  fix: ensure that proxy logs are updated after the xhr has actually completed (#21373)
  chore: Re-organize tests in assertions_spec.js (#21283)
  chore: Distribute tests to desktop-gui containers. Make `desktop-gui` tests faster! (#21305)
  chore(sessions): add additional tests (#21338)
  fix: Allow submit button to be outside of the form for implicit submission (#21279)
  fix(launcher): support Firefox as a snap (#21328)
  chore(sessions): break out sessions manager code and add unit tests (#21268)
  ...
  • Loading branch information
tgriesser committed May 13, 2022
2 parents 9554901 + dcb4a61 commit 7383e79
Show file tree
Hide file tree
Showing 69 changed files with 2,701 additions and 1,135 deletions.
7 changes: 7 additions & 0 deletions npm/vue/CHANGELOG.md
@@ -1,3 +1,10 @@
# [@cypress/vue-v3.1.2](https://github.com/cypress-io/cypress/compare/@cypress/vue-v3.1.1...@cypress/vue-v3.1.2) (2022-05-03)


### Bug Fixes

* head content reset, fix [#19721](https://github.com/cypress-io/cypress/issues/19721) ([#21291](https://github.com/cypress-io/cypress/issues/21291)) ([77ab6a5](https://github.com/cypress-io/cypress/commit/77ab6a51a0de1929171a2275e9cec9580c57241d))

# [@cypress/vue-v3.1.1](https://github.com/cypress-io/cypress/compare/@cypress/vue-v3.1.0...@cypress/vue-v3.1.1) (2022-02-10)


Expand Down
4 changes: 0 additions & 4 deletions npm/vue/src/index.ts
Expand Up @@ -39,8 +39,6 @@ export type CyMountOptions<Props, Data= {}> = Omit<MountingOptions<Props, Data>,
}
} & Partial<StyleOptions>

let initialInnerHtml = ''

Cypress.on('run:start', () => {
// `mount` is designed to work with component testing only.
// it assumes ROOT_SELECTOR exists, which is not the case in e2e.
Expand All @@ -52,13 +50,11 @@ Cypress.on('run:start', () => {
return
}

initialInnerHtml = document.head.innerHTML
Cypress.on('test:before:run', () => {
Cypress.vueWrapper?.unmount()
const el = getContainerEl()

el.innerHTML = ''
document.head.innerHTML = initialInnerHtml
})
})

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "cypress",
"version": "9.6.0",
"version": "9.6.1",
"description": "Cypress.io end to end testing tool",
"private": true,
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions packages/app/cypress/e2e/cypress-in-cypress.cy.ts
Expand Up @@ -208,8 +208,10 @@ describe('Cypress in Cypress', { viewportWidth: 1500, defaultCommandTimeout: 100
it(`resets selector playground validity when selecting element with playground selector in ${testingType}`, () => {
startAtSpecsPage(testingType)

cy.get('[data-cy="spec-item"]').first().click()
cy.get('#unified-reporter').should('be.visible')
const spec = testingType === 'e2e' ? 'dom-content.spec.js' : 'TestComponent.spec.jsx'

cy.get('[data-cy="spec-item"]').contains(spec).click()
cy.get('.passed > .num').should('contain', 1)

cy.get('[data-cy="playground-activator"]').click()
cy.get('[data-cy="playground-selector"]').clear()
Expand Down
2 changes: 1 addition & 1 deletion packages/app/cypress/e2e/runner/retries.ui.cy.ts
Expand Up @@ -122,7 +122,7 @@ describe('runner/cypress retries.ui.spec', {
cy.get(attemptTag(3)).parentsUntil('.collapsible').last().parent().within(() => {
cy.get('.instruments-container').should('contain', 'Spies / Stubs (2)')
cy.get('.instruments-container').should('contain', 'Routes (2)')
cy.get('.runnable-err').should('not.be.visible')
cy.get('.runnable-err').should('not.exist')
})
})

Expand Down

0 comments on commit 7383e79

Please sign in to comment.