diff --git a/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip new file mode 100644 index 000000000..a90643c5e Binary files /dev/null and b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip differ diff --git a/.yarn/cache/concurrently-npm-6.5.1-1c75a74f6e-3f4d89b464.zip b/.yarn/cache/concurrently-npm-6.5.1-1c75a74f6e-3f4d89b464.zip deleted file mode 100644 index 40ccbd1a9..000000000 Binary files a/.yarn/cache/concurrently-npm-6.5.1-1c75a74f6e-3f4d89b464.zip and /dev/null differ diff --git a/.yarn/cache/concurrently-npm-8.2.1-2922c29e4d-216cb16d5b.zip b/.yarn/cache/concurrently-npm-8.2.1-2922c29e4d-216cb16d5b.zip new file mode 100644 index 000000000..bf9e54a55 Binary files /dev/null and b/.yarn/cache/concurrently-npm-8.2.1-2922c29e4d-216cb16d5b.zip differ diff --git a/.yarn/cache/shell-quote-npm-1.8.1-fcccf06093-5f01201f4e.zip b/.yarn/cache/shell-quote-npm-1.8.1-fcccf06093-5f01201f4e.zip new file mode 100644 index 000000000..3ed7b53ce Binary files /dev/null and b/.yarn/cache/shell-quote-npm-1.8.1-fcccf06093-5f01201f4e.zip differ diff --git a/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip new file mode 100644 index 000000000..54c49dc9c Binary files /dev/null and b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip differ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 136f73a46..8604bd5a5 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/package.json b/package.json index bfb3d39d0..fffffd221 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,9 @@ "migrate": "env-cmd ts-node node_modules/.bin/migrate-mongo-ts up -f migrate-mongo-config.ts", "cypress-open": "cypress open", "cypress-run": "cypress run", - "test:e2e:cy": "env-cmd --silent concurrently -p \"[{name}]\" -n \"MongoDB,Server\" \"node dist/server/mongodb.server.js\" \"wait-on tcp:35025 && yarn seed:ci && yarn start -c config.test.ci.yaml\"" + "test:e2e:cy": "env-cmd --silent concurrently -p \"[{name}]\" -n \"MongoDB,Server\" \"yarn test:e2e:mongo-server\" \"wait-on tcp:127.0.0.1:35025 && yarn test:e2e:app-server\"", + "test:e2e:mongo-server": "node dist/server/mongodb.server.js", + "test:e2e:app-server": "yarn seed:ci && yarn start -c config.test.ci.yaml" }, "nodemonConfig": { "ignore": [ @@ -185,7 +187,7 @@ "babel-eslint": "^10.1.0", "babel-loader": "^8.2.5", "babel-plugin-styled-components": "^1.13.2", - "concurrently": "^6.2.1", + "concurrently": "^8.2.1", "copyfiles": "^2.4.1", "cypress": "^9.3.0", "env-cmd": "^10.1.0", diff --git a/server/mongodb.server.ts b/server/mongodb.server.ts index 2b5481b9e..d661ddd8a 100644 --- a/server/mongodb.server.ts +++ b/server/mongodb.server.ts @@ -1,5 +1,6 @@ -import { MongoMemoryServer } from 'mongodb-memory-server'; +import { MongoMemoryServer } from "mongodb-memory-server"; (async () => { - await MongoMemoryServer.create({instance:{port:35025}}); -}) () + const db = await MongoMemoryServer.create({ instance: { port: 35025 } }); + console.info(db.getUri()); +})(); diff --git a/yarn.lock b/yarn.lock index 6eae7f941..246848800 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10148,7 +10148,7 @@ __metadata: compromise: ^13.11.4 compromise-paragraphs: ^0.0.5 compromise-sentences: ^0.3.0 - concurrently: ^6.2.1 + concurrently: ^8.2.1 cookie-parser: ^1.4.5 copyfiles: ^2.4.1 country-flag-icons: ^1.5.5 @@ -12699,6 +12699,17 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.1 + wrap-ansi: ^7.0.0 + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 + languageName: node + linkType: hard + "clone-deep@npm:^4.0.1": version: 4.0.1 resolution: "clone-deep@npm:4.0.1" @@ -13050,21 +13061,23 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:^6.2.1": - version: 6.5.1 - resolution: "concurrently@npm:6.5.1" +"concurrently@npm:^8.2.1": + version: 8.2.1 + resolution: "concurrently@npm:8.2.1" dependencies: - chalk: ^4.1.0 - date-fns: ^2.16.1 + chalk: ^4.1.2 + date-fns: ^2.30.0 lodash: ^4.17.21 - rxjs: ^6.6.3 - spawn-command: ^0.0.2-1 - supports-color: ^8.1.0 + rxjs: ^7.8.1 + shell-quote: ^1.8.1 + spawn-command: 0.0.2 + supports-color: ^8.1.1 tree-kill: ^1.2.2 - yargs: ^16.2.0 + yargs: ^17.7.2 bin: - concurrently: bin/concurrently.js - checksum: 3f4d89b464fa5c9fb6f9489b46594c30ba54eff6ff10ab3cb5f30f64b74c83be664623a0f0cc731a3cb3f057a1f4a3292f7d3470c012a292c44aca31f214a3fa + conc: dist/bin/concurrently.js + concurrently: dist/bin/concurrently.js + checksum: 216cb16d5b301cbd9c657b19430836d1686fe8fa9b9ef35ef7ac601e1a5cf6535166a3e57de446696dbd5e7e3f45d78fc70f33c5fd4bb565342cd5e752c5b069 languageName: node linkType: hard @@ -13782,7 +13795,7 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:2.x, date-fns@npm:^2.16.1": +"date-fns@npm:2.x, date-fns@npm:^2.30.0": version: 2.30.0 resolution: "date-fns@npm:2.30.0" dependencies: @@ -26809,7 +26822,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:6.6.7, rxjs@npm:^6.6.0, rxjs@npm:^6.6.3": +"rxjs@npm:6.6.7, rxjs@npm:^6.6.0": version: 6.6.7 resolution: "rxjs@npm:6.6.7" dependencies: @@ -26818,7 +26831,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.1, rxjs@npm:^7.3.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.4, rxjs@npm:^7.5.5": +"rxjs@npm:7.8.1, rxjs@npm:^7.3.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.4, rxjs@npm:^7.5.5, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -27317,6 +27330,13 @@ __metadata: languageName: node linkType: hard +"shell-quote@npm:^1.8.1": + version: 1.8.1 + resolution: "shell-quote@npm:1.8.1" + checksum: 5f01201f4ef504d4c6a9d0d283fa17075f6770bfbe4c5850b074974c68062f37929ca61700d95ad2ac8822e14e8c4b990ca0e6e9272e64befd74ce5e19f0736b + languageName: node + linkType: hard + "shelljs@npm:0.8.5": version: 0.8.5 resolution: "shelljs@npm:0.8.5" @@ -27656,7 +27676,7 @@ __metadata: languageName: node linkType: hard -"spawn-command@npm:^0.0.2-1": +"spawn-command@npm:0.0.2": version: 0.0.2 resolution: "spawn-command@npm:0.0.2" checksum: e35c5d28177b4d461d33c88cc11f6f3a5079e2b132c11e1746453bbb7a0c0b8a634f07541a2a234fa4758239d88203b758def509161b651e81958894c0b4b64b @@ -28414,7 +28434,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1": +"supports-color@npm:^8.0.0, supports-color@npm:^8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -31252,7 +31272,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:21.1.1": +"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c @@ -31303,6 +31323,21 @@ __metadata: languageName: node linkType: hard +"yargs@npm:^17.7.2": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" + dependencies: + cliui: ^8.0.1 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.3 + y18n: ^5.0.5 + yargs-parser: ^21.1.1 + checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a + languageName: node + linkType: hard + "yauzl@npm:^2.10.0": version: 2.10.0 resolution: "yauzl@npm:2.10.0"