Skip to content

Commit 3896538

Browse files
authored
Merge branch '10.0-release' into zachw/fix-flaky-cy-in-cy-test
2 parents 5cf61d9 + 07478cb commit 3896538

File tree

57 files changed

+2647
-1032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2647
-1032
lines changed

npm/vue/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [@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)
2+
3+
4+
### Bug Fixes
5+
6+
* 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))
7+
18
# [@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)
29

310

npm/vue/src/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ export type CyMountOptions<Props, Data= {}> = Omit<MountingOptions<Props, Data>,
3939
}
4040
} & Partial<StyleOptions>
4141

42-
let initialInnerHtml = ''
43-
4442
Cypress.on('run:start', () => {
4543
// `mount` is designed to work with component testing only.
4644
// it assumes ROOT_SELECTOR exists, which is not the case in e2e.
@@ -52,13 +50,11 @@ Cypress.on('run:start', () => {
5250
return
5351
}
5452

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

6057
el.innerHTML = ''
61-
document.head.innerHTML = initialInnerHtml
6258
})
6359
})
6460

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cypress",
3-
"version": "9.6.0",
3+
"version": "9.6.1",
44
"description": "Cypress.io end to end testing tool",
55
"private": true,
66
"scripts": {

packages/app/cypress/e2e/runner/retries.ui.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ describe('runner/cypress retries.ui.spec', {
122122
cy.get(attemptTag(3)).parentsUntil('.collapsible').last().parent().within(() => {
123123
cy.get('.instruments-container').should('contain', 'Spies / Stubs (2)')
124124
cy.get('.instruments-container').should('contain', 'Routes (2)')
125-
cy.get('.runnable-err').should('not.be.visible')
125+
cy.get('.runnable-err').should('not.exist')
126126
})
127127
})
128128

0 commit comments

Comments
 (0)