diff --git a/app/commands/network-requests.html b/app/commands/network-requests.html index b7e86552b..f7cc25b89 100644 --- a/app/commands/network-requests.html +++ b/app/commands/network-requests.html @@ -93,8 +93,8 @@

cy.server()

expect(server.enable).to.be.true // forces requests that don't match your routes to 404 expect(server.force404).to.be.false - // whitelists requests from ever being logged or stubbed - expect(server.whitelist).to.be.a('function') + // ignores requests from ever being logged or stubbed + expect(server.ignore).to.be.a('function') }) cy.server({ diff --git a/app/cypress-api.html b/app/cypress-api.html index c0b7ba3df..09f2730ba 100644 --- a/app/cypress-api.html +++ b/app/cypress-api.html @@ -120,7 +120,7 @@

Cypress.Co

Cypress.Cookies.default()

To set defaults for all cookies, use Cypress.Cookies.default().

Cypress.Cookies.defaults({
-  whitelist: 'session_id'
+  preserve: 'session_id'
 })
@@ -132,8 +132,8 @@

Cypress.S
Cypress.Server.defaults({
   delay: 0,
   force404: true,
-  whitelist: function(xhr){
-    // handle custom logic for whitelisting
+  ignore: function(xhr){
+    // handle custom logic for ignoring XHRs
   }
 })
diff --git a/cypress/integration/examples/cypress_api.spec.js b/cypress/integration/examples/cypress_api.spec.js index 393e942ff..94f5dcc2a 100644 --- a/cypress/integration/examples/cypress_api.spec.js +++ b/cypress/integration/examples/cypress_api.spec.js @@ -65,10 +65,13 @@ context('Cypress.Cookies', () => { }) it('.defaults() - set defaults for all cookies', () => { + if (Number(Cypress.version.charAt(0)) < 5) return + // now any cookie with the name 'session_id' will // not be cleared before each new test runs Cypress.Cookies.defaults({ - whitelist: 'session_id', + // @ts-ignore + preserve: 'session_id', }) }) }) diff --git a/cypress/integration/examples/network_requests.spec.js b/cypress/integration/examples/network_requests.spec.js index 27b119e00..4d92d7fc3 100644 --- a/cypress/integration/examples/network_requests.spec.js +++ b/cypress/integration/examples/network_requests.spec.js @@ -29,8 +29,12 @@ context('Network Requests', () => { expect(server.enable).to.be.true // forces requests that don't match your routes to 404 expect(server.force404).to.be.false - // whitelists requests from ever being logged or stubbed - expect(server.whitelist).to.be.a('function') + + if (Number(Cypress.version.charAt(0)) >= 5) { + // ignores requests from ever being logged or stubbed + // @ts-ignore + expect(server.ignore).to.be.a('function') + } }) cy.server({ diff --git a/package-lock.json b/package-lock.json index ecd249e8f..5d3e1eb83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2073,6 +2073,13 @@ "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "crypto-random-string": { @@ -5700,6 +5707,13 @@ "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "normalize-url": { @@ -10473,11 +10487,6 @@ } } }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, "semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",