Skip to content

Commit

Permalink
Merge branch 'feat/app-cloud-intergation' into muaz/CLOUD-577-spec-li…
Browse files Browse the repository at this point in the history
…st-display-latest-runs
  • Loading branch information
MuazOthman committed May 13, 2022
2 parents b4d29d9 + df3ca15 commit 029f489
Show file tree
Hide file tree
Showing 115 changed files with 4,457 additions and 1,597 deletions.
2 changes: 1 addition & 1 deletion graphql-codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ generates:
nonOptionalTypename: true
- 'packages/frontend-shared/script/codegen-type-map.js'

'./packages/frontend-shared/cypress/support/generated/test-cloud-graphql-types.gen.ts':
'./packages/graphql/src/gen/test-cloud-graphql-types.gen.ts':
schema: 'packages/graphql/schemas/cloud.graphql'
plugins:
- add:
Expand Down
8 changes: 2 additions & 6 deletions guides/e2e-open-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ When we hit the remote GraphQL server, we mock against the same mocked schema we
cy.remoteGraphQLIntercept(async (obj) => {
// Currently, all remote requests go through here, we want to use this to modify the
// remote request before it's used and avoid touching the login query
if (obj.result.data?.cloudProjectsBySlugs) {
for (const proj of obj.result.data.cloudProjectsBySlugs) {
if (proj.runs?.nodes) {
proj.runs.nodes = []
}
}
if (obj.result.data?.cloudProjectBySlug.runs?.nodes) {
obj.result.data.cloudProjectBySlug.runs.nodes = []
}

return obj.result
Expand Down
7 changes: 7 additions & 0 deletions npm/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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 Expand Up @@ -87,7 +87,6 @@
"@graphql-codegen/typescript": "2.4.2",
"@graphql-codegen/typescript-operations": "2.2.3",
"@graphql-codegen/typescript-urql-graphcache": "2.2.3",
"@graphql-tools/batch-delegate": "8.1.0",
"@graphql-tools/delegate": "8.2.1",
"@graphql-tools/utils": "8.2.3",
"@graphql-tools/wrap": "8.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/cypress/e2e/runner/retries.ui.cy.ts
Original file line number Diff line number Diff line change
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
Loading

0 comments on commit 029f489

Please sign in to comment.