From fa07b3087e85caab7ad1a3662de2d7570cc6c0d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:06:36 +1030 Subject: [PATCH] Bump chai from 4.3.10 to 5.0.0 (#1796) * Bump chai from 4.3.10 to 5.0.0 Bumps [chai](https://github.com/chaijs/chai) from 4.3.10 to 5.0.0. - [Release notes](https://github.com/chaijs/chai/releases) - [Changelog](https://github.com/chaijs/chai/blob/main/History.md) - [Commits](https://github.com/chaijs/chai/compare/v4.3.10...v5.0.0) --- updated-dependencies: - dependency-name: chai dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Refactored code to work with chai 5 * Reverted mongo version update pending mongo 6 upgrade work --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Brazzatti --- package-lock.json | 75 +++++++------------ package.json | 2 +- .../docker-compose.mocha.yml | 2 +- .../docker-compose.newman.yml | 2 +- test/bootstrap.test.js | 73 +++++++++--------- test/unit/services/AgendaService.test.js | 1 - test/unit/services/DOIService.test.js | 4 - test/unit/services/FormsService.test.js | 2 +- test/unit/services/ReportsService.test.js | 4 +- test/unit/services/SolrSearchService.test.js | 4 - 10 files changed, 72 insertions(+), 97 deletions(-) mode change 100644 => 100755 support/integration-testing/docker-compose.mocha.yml mode change 100644 => 100755 support/integration-testing/docker-compose.newman.yml diff --git a/package-lock.json b/package-lock.json index 9b76d5195f..40e196028c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,7 @@ "@types/lodash-es": "^4.17.12", "@types/node": "^20.10.8", "bower": "^1.8.14", - "chai": "^4.3.10", + "chai": "^5.0.0", "ejs-cli": "^2.2.3", "istanbul": "^0.4.5", "mocha": "^10.2.0", @@ -2570,12 +2570,12 @@ } }, "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", "dev": true, "engines": { - "node": "*" + "node": ">=12" } }, "node_modules/async": { @@ -3087,21 +3087,19 @@ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, "node_modules/chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.0.0.tgz", + "integrity": "sha512-HO5p0oEKd5M6HEcwOkNAThAE3j960vIZvVcc0t2tI06Dd0ATu69cEnMB2wOhC5/ZyQ6m67w3ePjU/HzXsSsdBA==", "dev": true, "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "assertion-error": "^2.0.1", + "check-error": "^2.0.0", + "deep-eql": "^5.0.1", + "loupe": "^3.0.0", + "pathval": "^2.0.0" }, "engines": { - "node": ">=4" + "node": ">=12" } }, "node_modules/chalk": { @@ -3141,15 +3139,12 @@ } }, "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.0.0.tgz", + "integrity": "sha512-tjLAOBHKVxtPoHe/SA7kNOMvhCRdCJ3vETdeY0RuAc9popf+hyaSV6ZEg9hr4cpWF7jmo/JSWEnLDrnijS9Tog==", "dev": true, - "dependencies": { - "get-func-name": "^2.0.2" - }, "engines": { - "node": "*" + "node": ">= 16" } }, "node_modules/chokidar": { @@ -4030,13 +4025,10 @@ } }, "node_modules/deep-eql": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", - "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.1.tgz", + "integrity": "sha512-nwQCf6ne2gez3o1MxWifqkciwt0zhl0LO1/UwVu4uMBuPmflWM4oQ70XMqHqnBJA+nhzncaqL9HVL6KkHJ28lw==", "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, "engines": { "node": ">=6" } @@ -6958,12 +6950,12 @@ "integrity": "sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==" }, "node_modules/loupe": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", - "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.0.tgz", + "integrity": "sha512-qKl+FrLXUhFuHUoDJG7f8P8gEMHq9NFS0c6ghXG1J0rldmZFQZoNVv/vyirE9qwCIhWZDsvEFd1sbFu3GvRQFg==", "dev": true, "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/lru-cache": { @@ -8278,12 +8270,12 @@ } }, "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", "dev": true, "engines": { - "node": "*" + "node": ">= 14.16" } }, "node_modules/pause": { @@ -11562,15 +11554,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", diff --git a/package.json b/package.json index 612db2663c..0e7fdd5a03 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@types/lodash-es": "^4.17.12", "@types/node": "^20.10.8", "bower": "^1.8.14", - "chai": "^4.3.10", + "chai": "^5.0.0", "ejs-cli": "^2.2.3", "istanbul": "^0.4.5", "mocha": "^10.2.0", diff --git a/support/integration-testing/docker-compose.mocha.yml b/support/integration-testing/docker-compose.mocha.yml old mode 100644 new mode 100755 index 8e6841179b..2dccb8429c --- a/support/integration-testing/docker-compose.mocha.yml +++ b/support/integration-testing/docker-compose.mocha.yml @@ -3,7 +3,7 @@ networks: main: services: redboxportal: - image: qcifengineering/redbox-portal:feature-node20 + image: qcifengineering/redbox-portal:develop ports: - "1500:1500" volumes: diff --git a/support/integration-testing/docker-compose.newman.yml b/support/integration-testing/docker-compose.newman.yml old mode 100644 new mode 100755 index 76fbe90b3d..33a893c1b5 --- a/support/integration-testing/docker-compose.newman.yml +++ b/support/integration-testing/docker-compose.newman.yml @@ -3,7 +3,7 @@ networks: main: services: redboxportal: - image: qcifengineering/redbox-portal:feature-node20 + image: qcifengineering/redbox-portal:develop ports: - "1500:1500" volumes: diff --git a/test/bootstrap.test.js b/test/bootstrap.test.js index dcc3f5fe27..b4a28d52ce 100644 --- a/test/bootstrap.test.js +++ b/test/bootstrap.test.js @@ -1,54 +1,57 @@ var sails = require('sails'); var _ = require('lodash'); - -global.chai = require('chai'); -global.should = chai.should(); -global.expect = chai.expect; global.moment = require('moment'); + + before(function (done) { - // Increase the Mocha timeout so that Sails has enough time to lift. - this.timeout(120000); - sails.lift({ - log: { - level: 'verbose' - }, - hooks: { - grunt: false - }, - models: { - datastore: 'mongodb', - migrate: 'drop' - }, - security: { - csrf: false - }, - datacite: { + import('chai').then(chai => { + global.chai = chai; + global.should = chai.should(); + global.expect = chai.expect; + + // Increase the Mocha timeout so that Sails has enough time to lift. + this.timeout(120000); + sails.lift({ + log: { + level: 'verbose' + }, + hooks: { + grunt: false + }, + models: { + datastore: 'mongodb', + migrate: 'drop' + }, + security: { + csrf: false + }, + datacite: { username: process.env.datacite_username, password: process.env.datacite_password, doiPrefix: process.env.datacite_doiPrefix - }, - auth: { - default: { - local: { - default: { - token: 'jA8mF8CBpwHGkJqlgg6dT3hEDoZTQIif5t1V9ElIcN8=' - } - } - } - } + }, + auth: { + default: { + local: { + default: { + token: 'jA8mF8CBpwHGkJqlgg6dT3hEDoZTQIif5t1V9ElIcN8=' + } + } + } + } }, function (err, server) { - if (err) return done(err); - done(err, sails); + if (err) return done(err); + done(err, sails); + }); }); - }); after(function (done) { // here you can clear fixtures, etc. if (sails && _.isFunction(sails.lower)) { - sails.lower(done); + sails.lower(done); } }); diff --git a/test/unit/services/AgendaService.test.js b/test/unit/services/AgendaService.test.js index 3cdcb2a8e3..522c64d098 100644 --- a/test/unit/services/AgendaService.test.js +++ b/test/unit/services/AgendaService.test.js @@ -1,4 +1,3 @@ -const { expect } = require("chai"); describe('The Agenda Queue Service', function () { before(function (done) { diff --git a/test/unit/services/DOIService.test.js b/test/unit/services/DOIService.test.js index 314f568097..7600a5cfae 100644 --- a/test/unit/services/DOIService.test.js +++ b/test/unit/services/DOIService.test.js @@ -1,7 +1,3 @@ -const { - expect -} = require("chai"); - describe('The DOI Service', function () { before(function (done) { done(); diff --git a/test/unit/services/FormsService.test.js b/test/unit/services/FormsService.test.js index 38b820ff61..b39c73a4e8 100644 --- a/test/unit/services/FormsService.test.js +++ b/test/unit/services/FormsService.test.js @@ -1,4 +1,4 @@ -const { expect } = require("chai"); + describe('The FormsService', function () { before(function (done) { diff --git a/test/unit/services/ReportsService.test.js b/test/unit/services/ReportsService.test.js index 286fb33974..252ddf7a0c 100644 --- a/test/unit/services/ReportsService.test.js +++ b/test/unit/services/ReportsService.test.js @@ -1,6 +1,4 @@ -const { - expect -} = require("chai"); + describe('The Reporting Service', function () { before(function (done) { diff --git a/test/unit/services/SolrSearchService.test.js b/test/unit/services/SolrSearchService.test.js index 2ec488789e..6e095caa19 100644 --- a/test/unit/services/SolrSearchService.test.js +++ b/test/unit/services/SolrSearchService.test.js @@ -1,7 +1,3 @@ -const { - expect -} = require("chai"); - describe('The Solr Indexing Service', function () { before(function (done) { done()