Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into issues/23552-regre…
Browse files Browse the repository at this point in the history
…ssion
  • Loading branch information
lmiller1990 committed Sep 8, 2022
2 parents 9c27d0b + 35fe5b4 commit cc74340
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
14 changes: 7 additions & 7 deletions cli/types/cypress.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2720,6 +2720,13 @@ declare namespace Cypress {
* @default 60000
*/
pageLoadTimeout: number
/**
* Whether Cypress will search for and replace
* obstructive JS code in .js or .html files.
*
* @see https://on.cypress.io/configuration#modifyObstructiveCode
*/
modifyObstructiveCode: boolean
/**
* Time, in milliseconds, to wait for an XHR request to go out in a [cy.wait()](https://on.cypress.io/wait) command
* @default 5000
Expand Down Expand Up @@ -2968,13 +2975,6 @@ declare namespace Cypress {
* Whether Cypress was launched via 'cypress open' (interactive mode)
*/
isInteractive: boolean
/**
* Whether Cypress will search for and replace
* obstructive JS code in .js or .html files.
*
* @see https://on.cypress.io/configuration#modifyObstructiveCode
*/
modifyObstructiveCode: boolean
/**
* The platform Cypress is running on.
*/
Expand Down
6 changes: 5 additions & 1 deletion cli/types/tests/cypress-npm-api-test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// type tests for Cypress NPM module
// https://on.cypress.io/module-api
import cypress from 'cypress'
import cypress, { defineConfig } from 'cypress'

cypress.run // $ExpectType (options?: Partial<CypressRunOptions> | undefined) => Promise<CypressRunResult | CypressFailedRunResult>
cypress.open // $ExpectType (options?: Partial<CypressOpenOptions> | undefined) => Promise<void>
Expand Down Expand Up @@ -51,6 +51,10 @@ cypress.run().then(results => {
}
})

const config = defineConfig({
modifyObstructiveCode: true
})

// component options
const componentConfigNextWebpack: Cypress.ConfigOptions = {
component: {
Expand Down

0 comments on commit cc74340

Please sign in to comment.