From d573e679015a54f1fcfab8001586a4ab6b382942 Mon Sep 17 00:00:00 2001 From: Alvin Crespo Date: Sat, 6 Feb 2021 16:19:50 -0500 Subject: [PATCH 1/2] Updates Cypress defaults to use "preserve" ref: https://github.com/cypress-io/cypress/pull/7782 --- .../spec/cypress/integration/examples/cypress_api.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/cypress_api.spec.js b/lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/cypress_api.spec.js index ca5b80a..fd73fb0 100644 --- a/lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/cypress_api.spec.js +++ b/lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/cypress_api.spec.js @@ -65,7 +65,7 @@ context('Cypress.Cookies', () => { // now any cookie with the name 'session_id' will // not be cleared before each new test runs Cypress.Cookies.defaults({ - whitelist: 'session_id', + preserve: 'session_id', }) }) }) @@ -84,8 +84,8 @@ context('Cypress.Server', () => { Cypress.Server.defaults({ delay: 0, force404: false, - whitelist (xhr) { - // handle custom logic for whitelisting + preserve (xhr) { + // handle custom logic for preserving }, }) }) From fb60bf56f9c304bf93b5b2350a1040211c20460a Mon Sep 17 00:00:00 2001 From: Grant Petersen-Speelman Date: Sun, 7 Feb 2021 08:57:53 +1100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f3e74b..d4b9a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [Unreleased] + +### Fixed +* update cypress examples to use "preserve" instead of "whitelist" [PR 75](https://github.com/shakacode/cypress-on-rails/pull/75) by [alvincrespo](https://github.com/alvincrespo) + + ## [1.8.0] [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.7.0...v1.8.0