From 2c95550df0171fe5bd30e63f2d6b7b690cdfd5b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 00:44:54 +0000 Subject: [PATCH 1/2] Bump cypress from 12.17.4 to 13.6.6 Bumps [cypress](https://github.com/cypress-io/cypress) from 12.17.4 to 13.6.6. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](https://github.com/cypress-io/cypress/compare/v12.17.4...v13.6.6) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Dockerfile.dependencies | 2 +- cypress.a11y.config.js | 1 - cypress.config.js | 23 +++++++------- cypress.visual.config.js | 1 - package-lock.json | 31 +++++++------------ package.json | 4 +-- test/a11y/cypress/config/urlTestExclusions.js | 2 ++ .../specs/companies/omis-collection-spec.js | 3 +- 8 files changed, 29 insertions(+), 38 deletions(-) diff --git a/Dockerfile.dependencies b/Dockerfile.dependencies index dba8f0e16ba..8cbeff1bb5c 100644 --- a/Dockerfile.dependencies +++ b/Dockerfile.dependencies @@ -53,7 +53,7 @@ COPY --chown=node:node package*.json "$HOME/" WORKDIR $HOME # Install specific version of cypress -RUN npm install -g cypress@12.17.4 \ +RUN npm install -g cypress@13.6.6 \ && npx cypress verify \ && npx cypress cache path \ && npx cypress cache list \ diff --git a/cypress.a11y.config.js b/cypress.a11y.config.js index d7cb5357930..601f9930e9c 100644 --- a/cypress.a11y.config.js +++ b/cypress.a11y.config.js @@ -2,7 +2,6 @@ const { defineConfig } = require('cypress') module.exports = defineConfig({ video: true, - videoUploadOnPasses: false, screenshotOnRunFailure: false, defaultCommandTimeout: 5000, requestTimeout: 5000, diff --git a/cypress.config.js b/cypress.config.js index 7462bf53193..a3d5fe10596 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,31 +1,30 @@ -const { defineConfig } = require("cypress"); +const { defineConfig } = require('cypress') module.exports = defineConfig({ video: true, - videoUploadOnPasses: false, screenshotOnRunFailure: false, defaultCommandTimeout: 5000, requestTimeout: 5000, - projectId: "w97se2", + projectId: 'w97se2', env: { codeCoverage: { - url: "http://localhost:3000/__coverage__", + url: 'http://localhost:3000/__coverage__', }, }, component: { - supportFile: "test/cypress/support/index.js", + supportFile: 'test/cypress/support/index.js', devServer: { - framework: "react", - bundler: "webpack", + framework: 'react', + bundler: 'webpack', }, }, e2e: { setupNodeEvents(on, config) { - return require("./test/cypress/plugins/index.js")(on, config); + return require('./test/cypress/plugins/index.js')(on, config) }, - specPattern: "test/functional/cypress/specs/**/*.{js,jsx}", - baseUrl: "http://localhost:3000", - supportFile: "test/cypress/support/index.js", + specPattern: 'test/functional/cypress/specs/**/*.{js,jsx}', + baseUrl: 'http://localhost:3000', + supportFile: 'test/cypress/support/index.js', }, -}); +}) diff --git a/cypress.visual.config.js b/cypress.visual.config.js index 64b14ddb9b9..3c238629796 100644 --- a/cypress.visual.config.js +++ b/cypress.visual.config.js @@ -3,7 +3,6 @@ require('dotenv').config() module.exports = defineConfig({ video: true, - videoUploadOnPasses: false, screenshotOnRunFailure: false, defaultCommandTimeout: 5000, requestTimeout: 5000, diff --git a/package-lock.json b/package-lock.json index 02edb774207..89fb2004714 100644 --- a/package-lock.json +++ b/package-lock.json @@ -118,7 +118,7 @@ "chai": "^4.4.1", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", - "cypress": "^12.17.4", + "cypress": "^13.6.6", "cypress-axe": "^1.5.0", "cypress-image-diff-js": "^1.32.0", "eslint": "^8.56.0", @@ -2304,9 +2304,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -2322,7 +2322,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -12200,21 +12200,20 @@ } }, "node_modules/cypress": { - "version": "12.17.4", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", - "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "version": "13.6.6", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.6.tgz", + "integrity": "sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", "blob-util": "^2.0.2", "bluebird": "^3.7.2", - "buffer": "^5.6.0", + "buffer": "^5.7.1", "cachedir": "^2.3.0", "chalk": "^4.1.0", "check-more-types": "^2.24.0", @@ -12232,7 +12231,7 @@ "figures": "^3.2.0", "fs-extra": "^9.1.0", "getos": "^3.2.1", - "is-ci": "^3.0.0", + "is-ci": "^3.0.1", "is-installed-globally": "~0.4.0", "lazy-ass": "^1.6.0", "listr2": "^3.8.3", @@ -12254,7 +12253,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^14.0.0 || ^16.0.0 || >=18.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-axe": { @@ -12317,12 +12316,6 @@ "humanize-duration": "^3.27.3" } }, - "node_modules/cypress/node_modules/@types/node": { - "version": "16.18.82", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.82.tgz", - "integrity": "sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q==", - "dev": true - }, "node_modules/cypress/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", diff --git a/package.json b/package.json index 9e9f9b56393..e08ca7f0b4f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "test:unit": "NODE_ENV=test API_ROOT=http://test MOCHA_FILE=junit/test-results.xml npx mocha ./src/**/*.test.js --exit", "test:functional": "CYPRESS_retries=3 nyc cypress run --browser chrome", "test:a11y": "CYPRESS_coverage=false cypress run --config-file cypress.a11y.config.js --browser chrome", - "test:a11y:watch": "CYPRESS_coverage=false cypress open --config-file cypress.a11y.config.js --browser chrome", + "test:a11y:watch": "CYPRESS_coverage=false cypress open --config-file cypress.a11y.config.js --e2e --browser chrome", "test:unit-client": "NODE_ENV=test WEBPACK_ENV=develop MOCHA_FILE=junit/test-results.xml npx mochapack --webpack-config webpack.node.config.js --opts ./test/unit-client/mocha.opts ./test/unit-client/assets/javascripts/**/*.test.{js,jsx}", "test:functional:watch": "cypress open --e2e --browser chrome", "test:e2e:lep": "CYPRESS_coverage=false cypress run --config '{\"specPattern\":[\"test/end-to-end/cypress/specs/LEP/**/*.js\"]}' --browser chrome", @@ -179,7 +179,7 @@ "chai": "^4.4.1", "chai-as-promised": "^7.1.1", "chai-subset": "^1.6.0", - "cypress": "^12.17.4", + "cypress": "^13.6.6", "cypress-axe": "^1.5.0", "cypress-image-diff-js": "^1.32.0", "eslint": "^8.56.0", diff --git a/test/a11y/cypress/config/urlTestExclusions.js b/test/a11y/cypress/config/urlTestExclusions.js index 6e7f370df02..63332c15c99 100644 --- a/test/a11y/cypress/config/urlTestExclusions.js +++ b/test/a11y/cypress/config/urlTestExclusions.js @@ -69,6 +69,7 @@ export const urlTestExclusions = [ { url: '/reminders/settings/my-tasks-task-completed/' }, { url: '/export/' }, { url: '/tasks/:taskId/edit' }, + { url: '/companies/:companyId/overview' }, // 404 errors and or no sandbox data available { url: '/companies/:companyId/audit' }, { url: '/companies/:companyId/archive' }, @@ -131,6 +132,7 @@ export const urlTestExclusions = [ { url: '/investments/projects/:investmentId/propositions/:propositionId' }, { url: '/companies/:companyId/hierarchies/ghq/:globalHqId/add' }, { url: '/companies/:companyId/hierarchies/ghq/remove' }, + { url: '/companies/:companyId' }, // API calls with redirect { url: '/tasks/:taskId/status-complete' }, { url: '/tasks/:taskId/status-active' }, diff --git a/test/functional/cypress/specs/companies/omis-collection-spec.js b/test/functional/cypress/specs/companies/omis-collection-spec.js index a59c6ca466c..7898394ad15 100644 --- a/test/functional/cypress/specs/companies/omis-collection-spec.js +++ b/test/functional/cypress/specs/companies/omis-collection-spec.js @@ -205,9 +205,8 @@ describe('Company Orders (OMIS) Collection Page', () => { }).as('archivedApiRequest') cy.visit(urls.companies.orders(archivedLtd.id)) assertPayload('@archivedApiRequest', { - offset: 0, limit: 10, - sortby: 'created_on:desc', + offset: 0, company: archivedLtd.id, }) }) From 89724b01529c436b322c3aaa9224a21959de9df8 Mon Sep 17 00:00:00 2001 From: Christopher Sunkel Date: Wed, 28 Feb 2024 11:10:15 +0000 Subject: [PATCH 2/2] Update Dependabot config --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a858f419dff..12c71dafe02 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,6 +22,9 @@ updates: - dependency-name: formidable versions: - "> 2.1.2" + - dependency-name: webpack-dev-server # Waiting for Cypress to add support + versions: + - "> 4.15.1" # These are part of dependency groups and should be updated via the relevant script. - dependency-name: "@storybook/addon-a11y"