From 3f290dae064d28c25b4a2286b3cb8790f0e4812f Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Wed, 1 Sep 2021 21:08:10 -0700 Subject: [PATCH 1/2] Upgrade Cypress to v8.3.1 --- frontend/package-lock.json | 60 ++++++++++++++------------------------ frontend/package.json | 2 +- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a8ade9843..70ac711ca 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -68,7 +68,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^1.3.0", - "cypress": "^7.7.0", + "cypress": "^8.3.1", "cypress-fail-on-console-error": "^2.1.0", "cypress-wait-until": "^1.7.1", "mock-socket": "^9.0.3", @@ -1815,9 +1815,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.5", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz", - "integrity": "sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==", + "version": "2.88.6", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.6.tgz", + "integrity": "sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==", "optional": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -1833,13 +1833,12 @@ "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "uuid": "^8.3.2" }, "engines": { "node": ">= 6" @@ -1867,15 +1866,6 @@ "node": ">=0.8" } }, - "node_modules/@cypress/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "optional": true, - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/@cypress/schematic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.3.0.tgz", @@ -6069,12 +6059,13 @@ "dev": true }, "node_modules/cypress": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-7.7.0.tgz", - "integrity": "sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.1.tgz", + "integrity": "sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g==", + "hasInstallScript": true, "optional": true, "dependencies": { - "@cypress/request": "^2.88.5", + "@cypress/request": "^2.88.6", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "^6.0.2", @@ -12222,7 +12213,7 @@ "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "devOptional": true, + "dev": true, "engines": { "node": "*" } @@ -17553,7 +17544,7 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, + "devOptional": true, "bin": { "uuid": "dist/bin/uuid" } @@ -21510,9 +21501,9 @@ } }, "@cypress/request": { - "version": "2.88.5", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz", - "integrity": "sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==", + "version": "2.88.6", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.6.tgz", + "integrity": "sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==", "optional": true, "requires": { "aws-sign2": "~0.7.0", @@ -21528,13 +21519,12 @@ "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "uuid": "^8.3.2" }, "dependencies": { "qs": { @@ -21552,12 +21542,6 @@ "psl": "^1.1.28", "punycode": "^2.1.1" } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "optional": true } } }, @@ -25229,12 +25213,12 @@ "dev": true }, "cypress": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-7.7.0.tgz", - "integrity": "sha512-uYBYXNoI5ym0UxROwhQXWTi8JbUEjpC6l/bzoGZNxoKGsLrC1SDPgIDJMgLX/MeEdPL0UInXLDUWN/rSyZUCjQ==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.1.tgz", + "integrity": "sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g==", "optional": true, "requires": { - "@cypress/request": "^2.88.5", + "@cypress/request": "^2.88.6", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "^6.0.2", @@ -30373,7 +30357,7 @@ "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "devOptional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -34803,7 +34787,7 @@ "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true + "devOptional": true }, "validate-npm-package-name": { "version": "3.0.0", diff --git a/frontend/package.json b/frontend/package.json index 334be0436..239667af9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -112,7 +112,7 @@ }, "optionalDependencies": { "@cypress/schematic": "^1.3.0", - "cypress": "^7.7.0", + "cypress": "^8.3.1", "cypress-fail-on-console-error": "^2.1.0", "cypress-wait-until": "^1.7.1", "mock-socket": "^9.0.3", From 393fa78a4316febfab9327bbcd4c0fb9f049ed27 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Wed, 1 Sep 2021 21:09:14 -0700 Subject: [PATCH 2/2] Increase waitForSkeletonGone timeout to 15s --- frontend/cypress/support/commands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts index e0d07d517..ea5e88996 100644 --- a/frontend/cypress/support/commands.ts +++ b/frontend/cypress/support/commands.ts @@ -59,7 +59,7 @@ const codes = { Cypress.Commands.add('waitForSkeletonGone', () => { cy.waitUntil(() => { return Cypress.$('.skeleton-loader').length === 0; - }, { verbose: true, description: "waitForSkeletonGone", errorMsg: "skeleton loaders never went away", timeout: 7000, interval: 50}); + }, { verbose: true, description: "waitForSkeletonGone", errorMsg: "skeleton loaders never went away", timeout: 15000, interval: 50}); }); Cypress.Commands.add(