From ce63043887769e1f92a8c064d6647e0deb81b7fa Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 23 Mar 2021 17:50:46 +0000 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333c29a..2a59da7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d #### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0) +- Merge pull request 'Release 0.7.0' (#170) from dev into main [`e40017a`](https://git.odit.services/lfk/backend/commit/e40017a6b88d83d5bfc57ff4603abeaca7a9a37b) - Added bulk card creation tests [`438ff0f`](https://git.odit.services/lfk/backend/commit/438ff0fc3f246f83b1fa04cb11828f4a61dfcd1e) - Added new "bulk" endpoint [`c1bbda5`](https://git.odit.services/lfk/backend/commit/c1bbda51f067cbd9ac1a9a5378ae3f5d7b9f4eca) - 🧾New changelog file version [CI SKIP] [skip ci] [`7a49e7c`](https://git.odit.services/lfk/backend/commit/7a49e7c5c98eb23af1cd0d2084914641e9a1bf90) +- 🧾New changelog file version [CI SKIP] [skip ci] [`e843a46`](https://git.odit.services/lfk/backend/commit/e843a464e747c0d41280484cb54495cb2de2a9e8) - 🚀Bumped version to v0.7.0 [`d0ae50d`](https://git.odit.services/lfk/backend/commit/d0ae50d5579e969ad33d6b9cfd66dac7fa472223) - Merge pull request 'Bulk card creation feature/168-runnercards_bulk' (#169) from feature/168-runnercards_bulk into dev [`1dd6420`](https://git.odit.services/lfk/backend/commit/1dd64204cc63fb1a8a4a4aa503c21da42945eafd) - 🧾New changelog file version [CI SKIP] [skip ci] [`4705a39`](https://git.odit.services/lfk/backend/commit/4705a39aabaad894d332a5062df03840c23c6bfa) From 24aff3bac458a9886ca40163484bc72733dc766a Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 14:56:21 +0100 Subject: [PATCH 2/9] Now resolveing runnercards ref #171 --- src/controllers/RunnerCardController.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/RunnerCardController.ts b/src/controllers/RunnerCardController.ts index c611ef5..808b0d5 100644 --- a/src/controllers/RunnerCardController.ts +++ b/src/controllers/RunnerCardController.ts @@ -28,7 +28,7 @@ export class RunnerCardController { @OpenAPI({ description: 'Lists all card.' }) async getAll() { let responseCards: ResponseRunnerCard[] = new Array(); - const cards = await this.cardRepository.find({ relations: ['runner'] }); + const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); cards.forEach(card => { responseCards.push(new ResponseRunnerCard(card)); }); @@ -42,7 +42,7 @@ export class RunnerCardController { @OnUndefined(RunnerCardNotFoundError) @OpenAPI({ description: "Lists all information about the card whose id got provided." }) async getOne(@Param('id') id: number) { - let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner'] }); + let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); if (!card) { throw new RunnerCardNotFoundError(); } return card.toResponse(); } @@ -70,7 +70,7 @@ export class RunnerCardController { async post(@Body({ validate: true }) createCard: CreateRunnerCard) { let card = await createCard.toEntity(); card = await this.cardRepository.save(card); - return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner'] })).toResponse(); + return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); } @Put('/:id') @@ -92,7 +92,7 @@ export class RunnerCardController { } await this.cardRepository.save(await card.update(oldCard)); - return (await this.cardRepository.findOne({ id: id }, { relations: ['runner'] })).toResponse(); + return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); } @Delete('/:id') From 30d220bc36a28f224406e49ed27ff3f6b4f409e9 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 15:06:20 +0100 Subject: [PATCH 3/9] =?UTF-8?q?Adjusted=20jest=20timeout=20to=20mitigate?= =?UTF-8?q?=20sqlite=20from=20invalidateing=20all=20tests=E2=8F=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #171 --- src/tests/auth/auth_login.spec.ts | 1 + src/tests/auth/auth_logout.spec.ts | 1 + src/tests/auth/auth_refresh.spec.ts | 1 + src/tests/auth/auth_reset.spec.ts | 1 + src/tests/cards/cards_add.spec.ts | 1 + src/tests/cards/cards_delete.spec.ts | 1 + src/tests/cards/cards_get.spec.ts | 1 + src/tests/cards/cards_update.spec.ts | 1 + src/tests/contacts/contact_add.spec.ts | 1 + src/tests/contacts/contact_delete.spec.ts | 1 + src/tests/contacts/contact_get.spec.ts | 1 + src/tests/contacts/contact_update.spec.ts | 1 + src/tests/donations/donations_add.spec.ts | 1 + src/tests/donations/donations_delete.spec.ts | 1 + src/tests/donations/donations_get.spec.ts | 1 + src/tests/donations/donations_update.spec.ts | 1 + src/tests/donors/donor_add.spec.ts | 1 + src/tests/donors/donor_delete.spec.ts | 1 + src/tests/donors/donor_get.spec.ts | 1 + src/tests/donors/donor_update.spec.ts | 1 + src/tests/runnerOrgs/org_add.spec.ts | 1 + src/tests/runnerOrgs/org_delete.spec.ts | 1 + src/tests/runnerOrgs/org_get.spec.ts | 1 + src/tests/runnerOrgs/org_update.spec.ts | 1 + src/tests/runnerTeams/team_add.spec.ts | 1 + src/tests/runnerTeams/team_delete.spec.ts | 1 + src/tests/runnerTeams/team_get.spec.ts | 1 + src/tests/runnerTeams/team_update.spec.ts | 1 + src/tests/runners/runner_add.spec.ts | 1 + src/tests/runners/runner_delete.spec.ts | 1 + src/tests/runners/runner_get.spec.ts | 1 + src/tests/runners/runner_update.spec.ts | 1 + src/tests/scans/scans_add.spec.ts | 1 + src/tests/scans/scans_delete.spec.ts | 1 + src/tests/scans/scans_get.spec.ts | 1 + src/tests/scans/scans_update.spec.ts | 1 + src/tests/scanstations/scanstations_add.spec.ts | 1 + src/tests/scanstations/scanstations_delete.spec.ts | 1 + src/tests/scanstations/scanstations_get.spec.ts | 1 + src/tests/scanstations/scanstations_update.spec.ts | 1 + src/tests/selfservice/selfservice_forgotten.spec.ts | 1 + src/tests/selfservice/selfservice_get.spec.ts | 1 + src/tests/selfservice/selfservice_org.spec.ts | 1 + src/tests/selfservice/selfservice_register.spec.ts | 1 + src/tests/tracks/track_add.spec.ts | 1 + src/tests/tracks/track_delete.spec.ts | 1 + src/tests/tracks/track_update.spec.ts | 1 + src/tests/tracks/tracks_get.spec.ts | 1 + src/tests/trackscans/trackscans_add.spec.ts | 1 + src/tests/trackscans/trackscans_delete.spec.ts | 1 + src/tests/trackscans/trackscans_get.spec.ts | 1 + src/tests/trackscans/trackscans_update.spec.ts | 1 + 52 files changed, 52 insertions(+) diff --git a/src/tests/auth/auth_login.spec.ts b/src/tests/auth/auth_login.spec.ts index f0c49a9..a32ef9d 100644 --- a/src/tests/auth/auth_login.spec.ts +++ b/src/tests/auth/auth_login.spec.ts @@ -5,6 +5,7 @@ const base = "http://localhost:" + config.internal_port let axios_config; beforeAll(async () => { + jest.setTimeout(20000); axios_config = { validateStatus: undefined }; diff --git a/src/tests/auth/auth_logout.spec.ts b/src/tests/auth/auth_logout.spec.ts index 2594f26..0431061 100644 --- a/src/tests/auth/auth_logout.spec.ts +++ b/src/tests/auth/auth_logout.spec.ts @@ -8,6 +8,7 @@ const axios_config = { };; beforeAll(async () => { + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_logout", diff --git a/src/tests/auth/auth_refresh.spec.ts b/src/tests/auth/auth_refresh.spec.ts index bd875ba..0c0792a 100644 --- a/src/tests/auth/auth_refresh.spec.ts +++ b/src/tests/auth/auth_refresh.spec.ts @@ -8,6 +8,7 @@ const axios_config = { };; beforeAll(async () => { + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_refresh", diff --git a/src/tests/auth/auth_reset.spec.ts b/src/tests/auth/auth_reset.spec.ts index 59da15a..02f0ee0 100644 --- a/src/tests/auth/auth_reset.spec.ts +++ b/src/tests/auth/auth_reset.spec.ts @@ -8,6 +8,7 @@ const axios_config = { };; beforeAll(async () => { + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_reset", diff --git a/src/tests/cards/cards_add.spec.ts b/src/tests/cards/cards_add.spec.ts index ef967af..421ec08 100644 --- a/src/tests/cards/cards_add.spec.ts +++ b/src/tests/cards/cards_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_delete.spec.ts b/src/tests/cards/cards_delete.spec.ts index 1e657c8..ff9eb3a 100644 --- a/src/tests/cards/cards_delete.spec.ts +++ b/src/tests/cards/cards_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_get.spec.ts b/src/tests/cards/cards_get.spec.ts index 6ca41ec..309cb4e 100644 --- a/src/tests/cards/cards_get.spec.ts +++ b/src/tests/cards/cards_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_update.spec.ts b/src/tests/cards/cards_update.spec.ts index 6ec1506..addbe34 100644 --- a/src/tests/cards/cards_update.spec.ts +++ b/src/tests/cards/cards_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_add.spec.ts b/src/tests/contacts/contact_add.spec.ts index f9fd25e..69cd4b3 100644 --- a/src/tests/contacts/contact_add.spec.ts +++ b/src/tests/contacts/contact_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_delete.spec.ts b/src/tests/contacts/contact_delete.spec.ts index 9ce8ab8..e17b775 100644 --- a/src/tests/contacts/contact_delete.spec.ts +++ b/src/tests/contacts/contact_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_get.spec.ts b/src/tests/contacts/contact_get.spec.ts index 31aa895..fb26a79 100644 --- a/src/tests/contacts/contact_get.spec.ts +++ b/src/tests/contacts/contact_get.spec.ts @@ -5,6 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_update.spec.ts b/src/tests/contacts/contact_update.spec.ts index 15e4b72..67f5b72 100644 --- a/src/tests/contacts/contact_update.spec.ts +++ b/src/tests/contacts/contact_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_add.spec.ts b/src/tests/donations/donations_add.spec.ts index daad122..c851d8d 100644 --- a/src/tests/donations/donations_add.spec.ts +++ b/src/tests/donations/donations_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_delete.spec.ts b/src/tests/donations/donations_delete.spec.ts index 3296bf6..1e5f6e3 100644 --- a/src/tests/donations/donations_delete.spec.ts +++ b/src/tests/donations/donations_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_get.spec.ts b/src/tests/donations/donations_get.spec.ts index 9ce448f..507c0fb 100644 --- a/src/tests/donations/donations_get.spec.ts +++ b/src/tests/donations/donations_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_update.spec.ts b/src/tests/donations/donations_update.spec.ts index 5768ab9..0ac7e86 100644 --- a/src/tests/donations/donations_update.spec.ts +++ b/src/tests/donations/donations_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_add.spec.ts b/src/tests/donors/donor_add.spec.ts index 3226b8c..a5e08b0 100644 --- a/src/tests/donors/donor_add.spec.ts +++ b/src/tests/donors/donor_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_delete.spec.ts b/src/tests/donors/donor_delete.spec.ts index a32c41c..6f3625a 100644 --- a/src/tests/donors/donor_delete.spec.ts +++ b/src/tests/donors/donor_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_get.spec.ts b/src/tests/donors/donor_get.spec.ts index fd9d17d..c5e5a69 100644 --- a/src/tests/donors/donor_get.spec.ts +++ b/src/tests/donors/donor_get.spec.ts @@ -5,6 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_update.spec.ts b/src/tests/donors/donor_update.spec.ts index a317adc..c57f84e 100644 --- a/src/tests/donors/donor_update.spec.ts +++ b/src/tests/donors/donor_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_add.spec.ts b/src/tests/runnerOrgs/org_add.spec.ts index d40ef2a..0182f88 100644 --- a/src/tests/runnerOrgs/org_add.spec.ts +++ b/src/tests/runnerOrgs/org_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_delete.spec.ts b/src/tests/runnerOrgs/org_delete.spec.ts index 114777e..6f4c768 100644 --- a/src/tests/runnerOrgs/org_delete.spec.ts +++ b/src/tests/runnerOrgs/org_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_get.spec.ts b/src/tests/runnerOrgs/org_get.spec.ts index b770c45..a36fe1a 100644 --- a/src/tests/runnerOrgs/org_get.spec.ts +++ b/src/tests/runnerOrgs/org_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_update.spec.ts b/src/tests/runnerOrgs/org_update.spec.ts index ddc2ea2..0a09d35 100644 --- a/src/tests/runnerOrgs/org_update.spec.ts +++ b/src/tests/runnerOrgs/org_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_add.spec.ts b/src/tests/runnerTeams/team_add.spec.ts index 8b7c9ce..faed423 100644 --- a/src/tests/runnerTeams/team_add.spec.ts +++ b/src/tests/runnerTeams/team_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_delete.spec.ts b/src/tests/runnerTeams/team_delete.spec.ts index 0cf5046..ec65337 100644 --- a/src/tests/runnerTeams/team_delete.spec.ts +++ b/src/tests/runnerTeams/team_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_get.spec.ts b/src/tests/runnerTeams/team_get.spec.ts index be67268..681cd33 100644 --- a/src/tests/runnerTeams/team_get.spec.ts +++ b/src/tests/runnerTeams/team_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_update.spec.ts b/src/tests/runnerTeams/team_update.spec.ts index c8480ab..2b9fc15 100644 --- a/src/tests/runnerTeams/team_update.spec.ts +++ b/src/tests/runnerTeams/team_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_add.spec.ts b/src/tests/runners/runner_add.spec.ts index 86083d6..f5a21c6 100644 --- a/src/tests/runners/runner_add.spec.ts +++ b/src/tests/runners/runner_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_delete.spec.ts b/src/tests/runners/runner_delete.spec.ts index bd9e224..993a74c 100644 --- a/src/tests/runners/runner_delete.spec.ts +++ b/src/tests/runners/runner_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_get.spec.ts b/src/tests/runners/runner_get.spec.ts index b80afc2..f34c704 100644 --- a/src/tests/runners/runner_get.spec.ts +++ b/src/tests/runners/runner_get.spec.ts @@ -5,6 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_update.spec.ts b/src/tests/runners/runner_update.spec.ts index 8ae2aa3..fa053bf 100644 --- a/src/tests/runners/runner_update.spec.ts +++ b/src/tests/runners/runner_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_add.spec.ts b/src/tests/scans/scans_add.spec.ts index 167856d..9f3aa3e 100644 --- a/src/tests/scans/scans_add.spec.ts +++ b/src/tests/scans/scans_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_delete.spec.ts b/src/tests/scans/scans_delete.spec.ts index 02e7519..cd30323 100644 --- a/src/tests/scans/scans_delete.spec.ts +++ b/src/tests/scans/scans_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_get.spec.ts b/src/tests/scans/scans_get.spec.ts index d2203af..384db7c 100644 --- a/src/tests/scans/scans_get.spec.ts +++ b/src/tests/scans/scans_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_update.spec.ts b/src/tests/scans/scans_update.spec.ts index e711a39..2cc1d03 100644 --- a/src/tests/scans/scans_update.spec.ts +++ b/src/tests/scans/scans_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_add.spec.ts b/src/tests/scanstations/scanstations_add.spec.ts index 04ae0d2..4bca522 100644 --- a/src/tests/scanstations/scanstations_add.spec.ts +++ b/src/tests/scanstations/scanstations_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_delete.spec.ts b/src/tests/scanstations/scanstations_delete.spec.ts index ad425c7..d353db5 100644 --- a/src/tests/scanstations/scanstations_delete.spec.ts +++ b/src/tests/scanstations/scanstations_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_get.spec.ts b/src/tests/scanstations/scanstations_get.spec.ts index 3cb24ad..f8241d0 100644 --- a/src/tests/scanstations/scanstations_get.spec.ts +++ b/src/tests/scanstations/scanstations_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_update.spec.ts b/src/tests/scanstations/scanstations_update.spec.ts index 6593a13..d53fc7f 100644 --- a/src/tests/scanstations/scanstations_update.spec.ts +++ b/src/tests/scanstations/scanstations_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_forgotten.spec.ts b/src/tests/selfservice/selfservice_forgotten.spec.ts index 8f11d48..c67ef7e 100644 --- a/src/tests/selfservice/selfservice_forgotten.spec.ts +++ b/src/tests/selfservice/selfservice_forgotten.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_get.spec.ts b/src/tests/selfservice/selfservice_get.spec.ts index d8026d3..7867127 100644 --- a/src/tests/selfservice/selfservice_get.spec.ts +++ b/src/tests/selfservice/selfservice_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_org.spec.ts b/src/tests/selfservice/selfservice_org.spec.ts index f718fac..383b545 100644 --- a/src/tests/selfservice/selfservice_org.spec.ts +++ b/src/tests/selfservice/selfservice_org.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_register.spec.ts b/src/tests/selfservice/selfservice_register.spec.ts index 9409a96..36dc7fa 100644 --- a/src/tests/selfservice/selfservice_register.spec.ts +++ b/src/tests/selfservice/selfservice_register.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_add.spec.ts b/src/tests/tracks/track_add.spec.ts index b45bb45..789ad0d 100644 --- a/src/tests/tracks/track_add.spec.ts +++ b/src/tests/tracks/track_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_delete.spec.ts b/src/tests/tracks/track_delete.spec.ts index 04a1d99..5ea16ab 100644 --- a/src/tests/tracks/track_delete.spec.ts +++ b/src/tests/tracks/track_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_update.spec.ts b/src/tests/tracks/track_update.spec.ts index ab2b707..dea7aea 100644 --- a/src/tests/tracks/track_update.spec.ts +++ b/src/tests/tracks/track_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/tracks_get.spec.ts b/src/tests/tracks/tracks_get.spec.ts index 1057034..78d3a6c 100644 --- a/src/tests/tracks/tracks_get.spec.ts +++ b/src/tests/tracks/tracks_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_add.spec.ts b/src/tests/trackscans/trackscans_add.spec.ts index a79011c..3feea88 100644 --- a/src/tests/trackscans/trackscans_add.spec.ts +++ b/src/tests/trackscans/trackscans_add.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_delete.spec.ts b/src/tests/trackscans/trackscans_delete.spec.ts index 446ca84..0cf0a34 100644 --- a/src/tests/trackscans/trackscans_delete.spec.ts +++ b/src/tests/trackscans/trackscans_delete.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_get.spec.ts b/src/tests/trackscans/trackscans_get.spec.ts index d354f88..9a8ee6e 100644 --- a/src/tests/trackscans/trackscans_get.spec.ts +++ b/src/tests/trackscans/trackscans_get.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_update.spec.ts b/src/tests/trackscans/trackscans_update.spec.ts index 475d92c..2ac10be 100644 --- a/src/tests/trackscans/trackscans_update.spec.ts +++ b/src/tests/trackscans/trackscans_update.spec.ts @@ -6,6 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { From 6ab60998d4f716aded93bb3b5d15594fc5e0434a Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 15:13:31 +0100 Subject: [PATCH 4/9] Set timeout even higher b/c sqlite just kills itself during these tests ref #171 --- src/tests/auth/auth_login.spec.ts | 2 +- src/tests/auth/auth_logout.spec.ts | 2 +- src/tests/auth/auth_refresh.spec.ts | 2 +- src/tests/auth/auth_reset.spec.ts | 2 +- src/tests/cards/cards_add.spec.ts | 2 +- src/tests/cards/cards_delete.spec.ts | 2 +- src/tests/cards/cards_get.spec.ts | 2 +- src/tests/cards/cards_update.spec.ts | 2 +- src/tests/contacts/contact_add.spec.ts | 2 +- src/tests/contacts/contact_delete.spec.ts | 2 +- src/tests/contacts/contact_get.spec.ts | 2 +- src/tests/contacts/contact_update.spec.ts | 2 +- src/tests/donations/donations_add.spec.ts | 2 +- src/tests/donations/donations_delete.spec.ts | 2 +- src/tests/donations/donations_get.spec.ts | 2 +- src/tests/donations/donations_update.spec.ts | 2 +- src/tests/donors/donor_add.spec.ts | 2 +- src/tests/donors/donor_delete.spec.ts | 2 +- src/tests/donors/donor_get.spec.ts | 2 +- src/tests/donors/donor_update.spec.ts | 2 +- src/tests/runnerOrgs/org_add.spec.ts | 2 +- src/tests/runnerOrgs/org_delete.spec.ts | 2 +- src/tests/runnerOrgs/org_get.spec.ts | 2 +- src/tests/runnerOrgs/org_update.spec.ts | 2 +- src/tests/runnerTeams/team_add.spec.ts | 2 +- src/tests/runnerTeams/team_delete.spec.ts | 2 +- src/tests/runnerTeams/team_get.spec.ts | 2 +- src/tests/runnerTeams/team_update.spec.ts | 2 +- src/tests/runners/runner_add.spec.ts | 2 +- src/tests/runners/runner_delete.spec.ts | 2 +- src/tests/runners/runner_get.spec.ts | 2 +- src/tests/runners/runner_update.spec.ts | 2 +- src/tests/scans/scans_add.spec.ts | 2 +- src/tests/scans/scans_delete.spec.ts | 2 +- src/tests/scans/scans_get.spec.ts | 2 +- src/tests/scans/scans_update.spec.ts | 2 +- src/tests/scanstations/scanstations_add.spec.ts | 2 +- src/tests/scanstations/scanstations_delete.spec.ts | 2 +- src/tests/scanstations/scanstations_get.spec.ts | 2 +- src/tests/scanstations/scanstations_update.spec.ts | 2 +- src/tests/selfservice/selfservice_forgotten.spec.ts | 2 +- src/tests/selfservice/selfservice_get.spec.ts | 2 +- src/tests/selfservice/selfservice_org.spec.ts | 2 +- src/tests/selfservice/selfservice_register.spec.ts | 2 +- src/tests/tracks/track_add.spec.ts | 2 +- src/tests/tracks/track_delete.spec.ts | 2 +- src/tests/tracks/track_update.spec.ts | 2 +- src/tests/tracks/tracks_get.spec.ts | 2 +- src/tests/trackscans/trackscans_add.spec.ts | 2 +- src/tests/trackscans/trackscans_delete.spec.ts | 2 +- src/tests/trackscans/trackscans_get.spec.ts | 2 +- src/tests/trackscans/trackscans_update.spec.ts | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/tests/auth/auth_login.spec.ts b/src/tests/auth/auth_login.spec.ts index a32ef9d..64ace84 100644 --- a/src/tests/auth/auth_login.spec.ts +++ b/src/tests/auth/auth_login.spec.ts @@ -5,7 +5,7 @@ const base = "http://localhost:" + config.internal_port let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); axios_config = { validateStatus: undefined }; diff --git a/src/tests/auth/auth_logout.spec.ts b/src/tests/auth/auth_logout.spec.ts index 0431061..b14fbd6 100644 --- a/src/tests/auth/auth_logout.spec.ts +++ b/src/tests/auth/auth_logout.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_logout", diff --git a/src/tests/auth/auth_refresh.spec.ts b/src/tests/auth/auth_refresh.spec.ts index 0c0792a..4498797 100644 --- a/src/tests/auth/auth_refresh.spec.ts +++ b/src/tests/auth/auth_refresh.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_refresh", diff --git a/src/tests/auth/auth_reset.spec.ts b/src/tests/auth/auth_reset.spec.ts index 02f0ee0..d5f1a6f 100644 --- a/src/tests/auth/auth_reset.spec.ts +++ b/src/tests/auth/auth_reset.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_reset", diff --git a/src/tests/cards/cards_add.spec.ts b/src/tests/cards/cards_add.spec.ts index 421ec08..930f43e 100644 --- a/src/tests/cards/cards_add.spec.ts +++ b/src/tests/cards/cards_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_delete.spec.ts b/src/tests/cards/cards_delete.spec.ts index ff9eb3a..740dc23 100644 --- a/src/tests/cards/cards_delete.spec.ts +++ b/src/tests/cards/cards_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_get.spec.ts b/src/tests/cards/cards_get.spec.ts index 309cb4e..f1cedef 100644 --- a/src/tests/cards/cards_get.spec.ts +++ b/src/tests/cards/cards_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_update.spec.ts b/src/tests/cards/cards_update.spec.ts index addbe34..d04bfcc 100644 --- a/src/tests/cards/cards_update.spec.ts +++ b/src/tests/cards/cards_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_add.spec.ts b/src/tests/contacts/contact_add.spec.ts index 69cd4b3..b44a83d 100644 --- a/src/tests/contacts/contact_add.spec.ts +++ b/src/tests/contacts/contact_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_delete.spec.ts b/src/tests/contacts/contact_delete.spec.ts index e17b775..0953a30 100644 --- a/src/tests/contacts/contact_delete.spec.ts +++ b/src/tests/contacts/contact_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_get.spec.ts b/src/tests/contacts/contact_get.spec.ts index fb26a79..14c8103 100644 --- a/src/tests/contacts/contact_get.spec.ts +++ b/src/tests/contacts/contact_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_update.spec.ts b/src/tests/contacts/contact_update.spec.ts index 67f5b72..7b68e5f 100644 --- a/src/tests/contacts/contact_update.spec.ts +++ b/src/tests/contacts/contact_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_add.spec.ts b/src/tests/donations/donations_add.spec.ts index c851d8d..498c284 100644 --- a/src/tests/donations/donations_add.spec.ts +++ b/src/tests/donations/donations_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_delete.spec.ts b/src/tests/donations/donations_delete.spec.ts index 1e5f6e3..076d6fe 100644 --- a/src/tests/donations/donations_delete.spec.ts +++ b/src/tests/donations/donations_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_get.spec.ts b/src/tests/donations/donations_get.spec.ts index 507c0fb..df9109d 100644 --- a/src/tests/donations/donations_get.spec.ts +++ b/src/tests/donations/donations_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_update.spec.ts b/src/tests/donations/donations_update.spec.ts index 0ac7e86..4194f88 100644 --- a/src/tests/donations/donations_update.spec.ts +++ b/src/tests/donations/donations_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_add.spec.ts b/src/tests/donors/donor_add.spec.ts index a5e08b0..2c35bdf 100644 --- a/src/tests/donors/donor_add.spec.ts +++ b/src/tests/donors/donor_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_delete.spec.ts b/src/tests/donors/donor_delete.spec.ts index 6f3625a..d226492 100644 --- a/src/tests/donors/donor_delete.spec.ts +++ b/src/tests/donors/donor_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_get.spec.ts b/src/tests/donors/donor_get.spec.ts index c5e5a69..91591fe 100644 --- a/src/tests/donors/donor_get.spec.ts +++ b/src/tests/donors/donor_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_update.spec.ts b/src/tests/donors/donor_update.spec.ts index c57f84e..797fd55 100644 --- a/src/tests/donors/donor_update.spec.ts +++ b/src/tests/donors/donor_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_add.spec.ts b/src/tests/runnerOrgs/org_add.spec.ts index 0182f88..03cb999 100644 --- a/src/tests/runnerOrgs/org_add.spec.ts +++ b/src/tests/runnerOrgs/org_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_delete.spec.ts b/src/tests/runnerOrgs/org_delete.spec.ts index 6f4c768..6848da7 100644 --- a/src/tests/runnerOrgs/org_delete.spec.ts +++ b/src/tests/runnerOrgs/org_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_get.spec.ts b/src/tests/runnerOrgs/org_get.spec.ts index a36fe1a..b108b71 100644 --- a/src/tests/runnerOrgs/org_get.spec.ts +++ b/src/tests/runnerOrgs/org_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_update.spec.ts b/src/tests/runnerOrgs/org_update.spec.ts index 0a09d35..b9f3368 100644 --- a/src/tests/runnerOrgs/org_update.spec.ts +++ b/src/tests/runnerOrgs/org_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_add.spec.ts b/src/tests/runnerTeams/team_add.spec.ts index faed423..e7f1f78 100644 --- a/src/tests/runnerTeams/team_add.spec.ts +++ b/src/tests/runnerTeams/team_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_delete.spec.ts b/src/tests/runnerTeams/team_delete.spec.ts index ec65337..974b4e5 100644 --- a/src/tests/runnerTeams/team_delete.spec.ts +++ b/src/tests/runnerTeams/team_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_get.spec.ts b/src/tests/runnerTeams/team_get.spec.ts index 681cd33..b77f105 100644 --- a/src/tests/runnerTeams/team_get.spec.ts +++ b/src/tests/runnerTeams/team_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_update.spec.ts b/src/tests/runnerTeams/team_update.spec.ts index 2b9fc15..f271413 100644 --- a/src/tests/runnerTeams/team_update.spec.ts +++ b/src/tests/runnerTeams/team_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_add.spec.ts b/src/tests/runners/runner_add.spec.ts index f5a21c6..753fbd8 100644 --- a/src/tests/runners/runner_add.spec.ts +++ b/src/tests/runners/runner_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_delete.spec.ts b/src/tests/runners/runner_delete.spec.ts index 993a74c..8dd0ae0 100644 --- a/src/tests/runners/runner_delete.spec.ts +++ b/src/tests/runners/runner_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_get.spec.ts b/src/tests/runners/runner_get.spec.ts index f34c704..f5e6b63 100644 --- a/src/tests/runners/runner_get.spec.ts +++ b/src/tests/runners/runner_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_update.spec.ts b/src/tests/runners/runner_update.spec.ts index fa053bf..470635d 100644 --- a/src/tests/runners/runner_update.spec.ts +++ b/src/tests/runners/runner_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_add.spec.ts b/src/tests/scans/scans_add.spec.ts index 9f3aa3e..2d34b38 100644 --- a/src/tests/scans/scans_add.spec.ts +++ b/src/tests/scans/scans_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_delete.spec.ts b/src/tests/scans/scans_delete.spec.ts index cd30323..00c1a74 100644 --- a/src/tests/scans/scans_delete.spec.ts +++ b/src/tests/scans/scans_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_get.spec.ts b/src/tests/scans/scans_get.spec.ts index 384db7c..42cc8f9 100644 --- a/src/tests/scans/scans_get.spec.ts +++ b/src/tests/scans/scans_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_update.spec.ts b/src/tests/scans/scans_update.spec.ts index 2cc1d03..a2de310 100644 --- a/src/tests/scans/scans_update.spec.ts +++ b/src/tests/scans/scans_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_add.spec.ts b/src/tests/scanstations/scanstations_add.spec.ts index 4bca522..1b9f8af 100644 --- a/src/tests/scanstations/scanstations_add.spec.ts +++ b/src/tests/scanstations/scanstations_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_delete.spec.ts b/src/tests/scanstations/scanstations_delete.spec.ts index d353db5..e8e3a7d 100644 --- a/src/tests/scanstations/scanstations_delete.spec.ts +++ b/src/tests/scanstations/scanstations_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_get.spec.ts b/src/tests/scanstations/scanstations_get.spec.ts index f8241d0..83f97dc 100644 --- a/src/tests/scanstations/scanstations_get.spec.ts +++ b/src/tests/scanstations/scanstations_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_update.spec.ts b/src/tests/scanstations/scanstations_update.spec.ts index d53fc7f..6f5a362 100644 --- a/src/tests/scanstations/scanstations_update.spec.ts +++ b/src/tests/scanstations/scanstations_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_forgotten.spec.ts b/src/tests/selfservice/selfservice_forgotten.spec.ts index c67ef7e..e3c886f 100644 --- a/src/tests/selfservice/selfservice_forgotten.spec.ts +++ b/src/tests/selfservice/selfservice_forgotten.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_get.spec.ts b/src/tests/selfservice/selfservice_get.spec.ts index 7867127..72141c0 100644 --- a/src/tests/selfservice/selfservice_get.spec.ts +++ b/src/tests/selfservice/selfservice_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_org.spec.ts b/src/tests/selfservice/selfservice_org.spec.ts index 383b545..d5e4148 100644 --- a/src/tests/selfservice/selfservice_org.spec.ts +++ b/src/tests/selfservice/selfservice_org.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_register.spec.ts b/src/tests/selfservice/selfservice_register.spec.ts index 36dc7fa..1a1d22f 100644 --- a/src/tests/selfservice/selfservice_register.spec.ts +++ b/src/tests/selfservice/selfservice_register.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_add.spec.ts b/src/tests/tracks/track_add.spec.ts index 789ad0d..70ada77 100644 --- a/src/tests/tracks/track_add.spec.ts +++ b/src/tests/tracks/track_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_delete.spec.ts b/src/tests/tracks/track_delete.spec.ts index 5ea16ab..7718b2a 100644 --- a/src/tests/tracks/track_delete.spec.ts +++ b/src/tests/tracks/track_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_update.spec.ts b/src/tests/tracks/track_update.spec.ts index dea7aea..ef9ce2e 100644 --- a/src/tests/tracks/track_update.spec.ts +++ b/src/tests/tracks/track_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/tracks_get.spec.ts b/src/tests/tracks/tracks_get.spec.ts index 78d3a6c..2ad7199 100644 --- a/src/tests/tracks/tracks_get.spec.ts +++ b/src/tests/tracks/tracks_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_add.spec.ts b/src/tests/trackscans/trackscans_add.spec.ts index 3feea88..2ac41ee 100644 --- a/src/tests/trackscans/trackscans_add.spec.ts +++ b/src/tests/trackscans/trackscans_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_delete.spec.ts b/src/tests/trackscans/trackscans_delete.spec.ts index 0cf0a34..40e45d7 100644 --- a/src/tests/trackscans/trackscans_delete.spec.ts +++ b/src/tests/trackscans/trackscans_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_get.spec.ts b/src/tests/trackscans/trackscans_get.spec.ts index 9a8ee6e..47e9e35 100644 --- a/src/tests/trackscans/trackscans_get.spec.ts +++ b/src/tests/trackscans/trackscans_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_update.spec.ts b/src/tests/trackscans/trackscans_update.spec.ts index 2ac10be..2cc47d2 100644 --- a/src/tests/trackscans/trackscans_update.spec.ts +++ b/src/tests/trackscans/trackscans_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(20000); + jest.setTimeout(40000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { From f159252651942e442026dbcaae09b242e05d8204 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 15:14:17 +0100 Subject: [PATCH 5/9] Revert "Set timeout even higher b/c sqlite just kills itself during these tests" This reverts commit 6ab60998d4f716aded93bb3b5d15594fc5e0434a. --- src/tests/auth/auth_login.spec.ts | 2 +- src/tests/auth/auth_logout.spec.ts | 2 +- src/tests/auth/auth_refresh.spec.ts | 2 +- src/tests/auth/auth_reset.spec.ts | 2 +- src/tests/cards/cards_add.spec.ts | 2 +- src/tests/cards/cards_delete.spec.ts | 2 +- src/tests/cards/cards_get.spec.ts | 2 +- src/tests/cards/cards_update.spec.ts | 2 +- src/tests/contacts/contact_add.spec.ts | 2 +- src/tests/contacts/contact_delete.spec.ts | 2 +- src/tests/contacts/contact_get.spec.ts | 2 +- src/tests/contacts/contact_update.spec.ts | 2 +- src/tests/donations/donations_add.spec.ts | 2 +- src/tests/donations/donations_delete.spec.ts | 2 +- src/tests/donations/donations_get.spec.ts | 2 +- src/tests/donations/donations_update.spec.ts | 2 +- src/tests/donors/donor_add.spec.ts | 2 +- src/tests/donors/donor_delete.spec.ts | 2 +- src/tests/donors/donor_get.spec.ts | 2 +- src/tests/donors/donor_update.spec.ts | 2 +- src/tests/runnerOrgs/org_add.spec.ts | 2 +- src/tests/runnerOrgs/org_delete.spec.ts | 2 +- src/tests/runnerOrgs/org_get.spec.ts | 2 +- src/tests/runnerOrgs/org_update.spec.ts | 2 +- src/tests/runnerTeams/team_add.spec.ts | 2 +- src/tests/runnerTeams/team_delete.spec.ts | 2 +- src/tests/runnerTeams/team_get.spec.ts | 2 +- src/tests/runnerTeams/team_update.spec.ts | 2 +- src/tests/runners/runner_add.spec.ts | 2 +- src/tests/runners/runner_delete.spec.ts | 2 +- src/tests/runners/runner_get.spec.ts | 2 +- src/tests/runners/runner_update.spec.ts | 2 +- src/tests/scans/scans_add.spec.ts | 2 +- src/tests/scans/scans_delete.spec.ts | 2 +- src/tests/scans/scans_get.spec.ts | 2 +- src/tests/scans/scans_update.spec.ts | 2 +- src/tests/scanstations/scanstations_add.spec.ts | 2 +- src/tests/scanstations/scanstations_delete.spec.ts | 2 +- src/tests/scanstations/scanstations_get.spec.ts | 2 +- src/tests/scanstations/scanstations_update.spec.ts | 2 +- src/tests/selfservice/selfservice_forgotten.spec.ts | 2 +- src/tests/selfservice/selfservice_get.spec.ts | 2 +- src/tests/selfservice/selfservice_org.spec.ts | 2 +- src/tests/selfservice/selfservice_register.spec.ts | 2 +- src/tests/tracks/track_add.spec.ts | 2 +- src/tests/tracks/track_delete.spec.ts | 2 +- src/tests/tracks/track_update.spec.ts | 2 +- src/tests/tracks/tracks_get.spec.ts | 2 +- src/tests/trackscans/trackscans_add.spec.ts | 2 +- src/tests/trackscans/trackscans_delete.spec.ts | 2 +- src/tests/trackscans/trackscans_get.spec.ts | 2 +- src/tests/trackscans/trackscans_update.spec.ts | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/tests/auth/auth_login.spec.ts b/src/tests/auth/auth_login.spec.ts index 64ace84..a32ef9d 100644 --- a/src/tests/auth/auth_login.spec.ts +++ b/src/tests/auth/auth_login.spec.ts @@ -5,7 +5,7 @@ const base = "http://localhost:" + config.internal_port let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); axios_config = { validateStatus: undefined }; diff --git a/src/tests/auth/auth_logout.spec.ts b/src/tests/auth/auth_logout.spec.ts index b14fbd6..0431061 100644 --- a/src/tests/auth/auth_logout.spec.ts +++ b/src/tests/auth/auth_logout.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_logout", diff --git a/src/tests/auth/auth_refresh.spec.ts b/src/tests/auth/auth_refresh.spec.ts index 4498797..0c0792a 100644 --- a/src/tests/auth/auth_refresh.spec.ts +++ b/src/tests/auth/auth_refresh.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_refresh", diff --git a/src/tests/auth/auth_reset.spec.ts b/src/tests/auth/auth_reset.spec.ts index d5f1a6f..02f0ee0 100644 --- a/src/tests/auth/auth_reset.spec.ts +++ b/src/tests/auth/auth_reset.spec.ts @@ -8,7 +8,7 @@ const axios_config = { };; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res_login = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); await axios.post(base + '/api/users', { "firstname": "demo_reset", diff --git a/src/tests/cards/cards_add.spec.ts b/src/tests/cards/cards_add.spec.ts index 930f43e..421ec08 100644 --- a/src/tests/cards/cards_add.spec.ts +++ b/src/tests/cards/cards_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_delete.spec.ts b/src/tests/cards/cards_delete.spec.ts index 740dc23..ff9eb3a 100644 --- a/src/tests/cards/cards_delete.spec.ts +++ b/src/tests/cards/cards_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_get.spec.ts b/src/tests/cards/cards_get.spec.ts index f1cedef..309cb4e 100644 --- a/src/tests/cards/cards_get.spec.ts +++ b/src/tests/cards/cards_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/cards/cards_update.spec.ts b/src/tests/cards/cards_update.spec.ts index d04bfcc..addbe34 100644 --- a/src/tests/cards/cards_update.spec.ts +++ b/src/tests/cards/cards_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_add.spec.ts b/src/tests/contacts/contact_add.spec.ts index b44a83d..69cd4b3 100644 --- a/src/tests/contacts/contact_add.spec.ts +++ b/src/tests/contacts/contact_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_delete.spec.ts b/src/tests/contacts/contact_delete.spec.ts index 0953a30..e17b775 100644 --- a/src/tests/contacts/contact_delete.spec.ts +++ b/src/tests/contacts/contact_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_get.spec.ts b/src/tests/contacts/contact_get.spec.ts index 14c8103..fb26a79 100644 --- a/src/tests/contacts/contact_get.spec.ts +++ b/src/tests/contacts/contact_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/contacts/contact_update.spec.ts b/src/tests/contacts/contact_update.spec.ts index 7b68e5f..67f5b72 100644 --- a/src/tests/contacts/contact_update.spec.ts +++ b/src/tests/contacts/contact_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_add.spec.ts b/src/tests/donations/donations_add.spec.ts index 498c284..c851d8d 100644 --- a/src/tests/donations/donations_add.spec.ts +++ b/src/tests/donations/donations_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_delete.spec.ts b/src/tests/donations/donations_delete.spec.ts index 076d6fe..1e5f6e3 100644 --- a/src/tests/donations/donations_delete.spec.ts +++ b/src/tests/donations/donations_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_get.spec.ts b/src/tests/donations/donations_get.spec.ts index df9109d..507c0fb 100644 --- a/src/tests/donations/donations_get.spec.ts +++ b/src/tests/donations/donations_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donations/donations_update.spec.ts b/src/tests/donations/donations_update.spec.ts index 4194f88..0ac7e86 100644 --- a/src/tests/donations/donations_update.spec.ts +++ b/src/tests/donations/donations_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_add.spec.ts b/src/tests/donors/donor_add.spec.ts index 2c35bdf..a5e08b0 100644 --- a/src/tests/donors/donor_add.spec.ts +++ b/src/tests/donors/donor_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_delete.spec.ts b/src/tests/donors/donor_delete.spec.ts index d226492..6f3625a 100644 --- a/src/tests/donors/donor_delete.spec.ts +++ b/src/tests/donors/donor_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_get.spec.ts b/src/tests/donors/donor_get.spec.ts index 91591fe..c5e5a69 100644 --- a/src/tests/donors/donor_get.spec.ts +++ b/src/tests/donors/donor_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/donors/donor_update.spec.ts b/src/tests/donors/donor_update.spec.ts index 797fd55..c57f84e 100644 --- a/src/tests/donors/donor_update.spec.ts +++ b/src/tests/donors/donor_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_add.spec.ts b/src/tests/runnerOrgs/org_add.spec.ts index 03cb999..0182f88 100644 --- a/src/tests/runnerOrgs/org_add.spec.ts +++ b/src/tests/runnerOrgs/org_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_delete.spec.ts b/src/tests/runnerOrgs/org_delete.spec.ts index 6848da7..6f4c768 100644 --- a/src/tests/runnerOrgs/org_delete.spec.ts +++ b/src/tests/runnerOrgs/org_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_get.spec.ts b/src/tests/runnerOrgs/org_get.spec.ts index b108b71..a36fe1a 100644 --- a/src/tests/runnerOrgs/org_get.spec.ts +++ b/src/tests/runnerOrgs/org_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerOrgs/org_update.spec.ts b/src/tests/runnerOrgs/org_update.spec.ts index b9f3368..0a09d35 100644 --- a/src/tests/runnerOrgs/org_update.spec.ts +++ b/src/tests/runnerOrgs/org_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_add.spec.ts b/src/tests/runnerTeams/team_add.spec.ts index e7f1f78..faed423 100644 --- a/src/tests/runnerTeams/team_add.spec.ts +++ b/src/tests/runnerTeams/team_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_delete.spec.ts b/src/tests/runnerTeams/team_delete.spec.ts index 974b4e5..ec65337 100644 --- a/src/tests/runnerTeams/team_delete.spec.ts +++ b/src/tests/runnerTeams/team_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_get.spec.ts b/src/tests/runnerTeams/team_get.spec.ts index b77f105..681cd33 100644 --- a/src/tests/runnerTeams/team_get.spec.ts +++ b/src/tests/runnerTeams/team_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runnerTeams/team_update.spec.ts b/src/tests/runnerTeams/team_update.spec.ts index f271413..2b9fc15 100644 --- a/src/tests/runnerTeams/team_update.spec.ts +++ b/src/tests/runnerTeams/team_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_add.spec.ts b/src/tests/runners/runner_add.spec.ts index 753fbd8..f5a21c6 100644 --- a/src/tests/runners/runner_add.spec.ts +++ b/src/tests/runners/runner_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_delete.spec.ts b/src/tests/runners/runner_delete.spec.ts index 8dd0ae0..993a74c 100644 --- a/src/tests/runners/runner_delete.spec.ts +++ b/src/tests/runners/runner_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_get.spec.ts b/src/tests/runners/runner_get.spec.ts index f5e6b63..f34c704 100644 --- a/src/tests/runners/runner_get.spec.ts +++ b/src/tests/runners/runner_get.spec.ts @@ -5,7 +5,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/runners/runner_update.spec.ts b/src/tests/runners/runner_update.spec.ts index 470635d..fa053bf 100644 --- a/src/tests/runners/runner_update.spec.ts +++ b/src/tests/runners/runner_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_add.spec.ts b/src/tests/scans/scans_add.spec.ts index 2d34b38..9f3aa3e 100644 --- a/src/tests/scans/scans_add.spec.ts +++ b/src/tests/scans/scans_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_delete.spec.ts b/src/tests/scans/scans_delete.spec.ts index 00c1a74..cd30323 100644 --- a/src/tests/scans/scans_delete.spec.ts +++ b/src/tests/scans/scans_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_get.spec.ts b/src/tests/scans/scans_get.spec.ts index 42cc8f9..384db7c 100644 --- a/src/tests/scans/scans_get.spec.ts +++ b/src/tests/scans/scans_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scans/scans_update.spec.ts b/src/tests/scans/scans_update.spec.ts index a2de310..2cc1d03 100644 --- a/src/tests/scans/scans_update.spec.ts +++ b/src/tests/scans/scans_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_add.spec.ts b/src/tests/scanstations/scanstations_add.spec.ts index 1b9f8af..4bca522 100644 --- a/src/tests/scanstations/scanstations_add.spec.ts +++ b/src/tests/scanstations/scanstations_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_delete.spec.ts b/src/tests/scanstations/scanstations_delete.spec.ts index e8e3a7d..d353db5 100644 --- a/src/tests/scanstations/scanstations_delete.spec.ts +++ b/src/tests/scanstations/scanstations_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_get.spec.ts b/src/tests/scanstations/scanstations_get.spec.ts index 83f97dc..f8241d0 100644 --- a/src/tests/scanstations/scanstations_get.spec.ts +++ b/src/tests/scanstations/scanstations_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/scanstations/scanstations_update.spec.ts b/src/tests/scanstations/scanstations_update.spec.ts index 6f5a362..d53fc7f 100644 --- a/src/tests/scanstations/scanstations_update.spec.ts +++ b/src/tests/scanstations/scanstations_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_forgotten.spec.ts b/src/tests/selfservice/selfservice_forgotten.spec.ts index e3c886f..c67ef7e 100644 --- a/src/tests/selfservice/selfservice_forgotten.spec.ts +++ b/src/tests/selfservice/selfservice_forgotten.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_get.spec.ts b/src/tests/selfservice/selfservice_get.spec.ts index 72141c0..7867127 100644 --- a/src/tests/selfservice/selfservice_get.spec.ts +++ b/src/tests/selfservice/selfservice_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_org.spec.ts b/src/tests/selfservice/selfservice_org.spec.ts index d5e4148..383b545 100644 --- a/src/tests/selfservice/selfservice_org.spec.ts +++ b/src/tests/selfservice/selfservice_org.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/selfservice/selfservice_register.spec.ts b/src/tests/selfservice/selfservice_register.spec.ts index 1a1d22f..36dc7fa 100644 --- a/src/tests/selfservice/selfservice_register.spec.ts +++ b/src/tests/selfservice/selfservice_register.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_add.spec.ts b/src/tests/tracks/track_add.spec.ts index 70ada77..789ad0d 100644 --- a/src/tests/tracks/track_add.spec.ts +++ b/src/tests/tracks/track_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_delete.spec.ts b/src/tests/tracks/track_delete.spec.ts index 7718b2a..5ea16ab 100644 --- a/src/tests/tracks/track_delete.spec.ts +++ b/src/tests/tracks/track_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/track_update.spec.ts b/src/tests/tracks/track_update.spec.ts index ef9ce2e..dea7aea 100644 --- a/src/tests/tracks/track_update.spec.ts +++ b/src/tests/tracks/track_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/tracks/tracks_get.spec.ts b/src/tests/tracks/tracks_get.spec.ts index 2ad7199..78d3a6c 100644 --- a/src/tests/tracks/tracks_get.spec.ts +++ b/src/tests/tracks/tracks_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_add.spec.ts b/src/tests/trackscans/trackscans_add.spec.ts index 2ac41ee..3feea88 100644 --- a/src/tests/trackscans/trackscans_add.spec.ts +++ b/src/tests/trackscans/trackscans_add.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_delete.spec.ts b/src/tests/trackscans/trackscans_delete.spec.ts index 40e45d7..0cf0a34 100644 --- a/src/tests/trackscans/trackscans_delete.spec.ts +++ b/src/tests/trackscans/trackscans_delete.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_get.spec.ts b/src/tests/trackscans/trackscans_get.spec.ts index 47e9e35..9a8ee6e 100644 --- a/src/tests/trackscans/trackscans_get.spec.ts +++ b/src/tests/trackscans/trackscans_get.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { diff --git a/src/tests/trackscans/trackscans_update.spec.ts b/src/tests/trackscans/trackscans_update.spec.ts index 2cc47d2..2ac10be 100644 --- a/src/tests/trackscans/trackscans_update.spec.ts +++ b/src/tests/trackscans/trackscans_update.spec.ts @@ -6,7 +6,7 @@ let access_token; let axios_config; beforeAll(async () => { - jest.setTimeout(40000); + jest.setTimeout(20000); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); access_token = res.data["access_token"]; axios_config = { From f3d73d53467a4d00011d280c24e1e12fbb8e443d Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 15:17:05 +0100 Subject: [PATCH 6/9] Tests now keep the group ref #171 --- src/tests/cards/cards_add.spec.ts | 1 - src/tests/cards/cards_update.spec.ts | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/tests/cards/cards_add.spec.ts b/src/tests/cards/cards_add.spec.ts index 421ec08..9b13baa 100644 --- a/src/tests/cards/cards_add.spec.ts +++ b/src/tests/cards/cards_add.spec.ts @@ -86,7 +86,6 @@ describe('POST /api/cards successfully (with runner)', () => { "lastname": "last", "group": added_org.id }, axios_config); - delete res2.data.group; added_runner = res2.data; expect(res2.status).toEqual(200); expect(res2.headers['content-type']).toContain("application/json") diff --git a/src/tests/cards/cards_update.spec.ts b/src/tests/cards/cards_update.spec.ts index addbe34..726bc40 100644 --- a/src/tests/cards/cards_update.spec.ts +++ b/src/tests/cards/cards_update.spec.ts @@ -64,7 +64,6 @@ describe('adding + updating card.runner successfully', () => { "lastname": "last", "group": added_org.id }, axios_config); - delete res2.data.group; added_runner = res2.data; expect(res2.status).toEqual(200); expect(res2.headers['content-type']).toContain("application/json") @@ -75,7 +74,6 @@ describe('adding + updating card.runner successfully', () => { "lastname": "last", "group": added_org.id }, axios_config); - delete res2.data.group; added_runner2 = res2.data; expect(res2.status).toEqual(200); expect(res2.headers['content-type']).toContain("application/json") From 963253cbc84ed07af13ed0925952ec1b7dcc53ad Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 14:22:55 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a59da7..3fa3f50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,20 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.0) + +- Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9) +- Revert "Set timeout even higher b/c sqlite just kills itself during these tests" [`f159252`](https://git.odit.services/lfk/backend/commit/f159252651942e442026dbcaae09b242e05d8204) +- Set timeout even higher b/c sqlite just kills itself during these tests [`6ab6099`](https://git.odit.services/lfk/backend/commit/6ab60998d4f716aded93bb3b5d15594fc5e0434a) +- Adjusted jest timeout to mitigate sqlite from invalidateing all tests⏱ [`30d220b`](https://git.odit.services/lfk/backend/commit/30d220bc36a28f224406e49ed27ff3f6b4f409e9) +- Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a) +- Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d) +- 🧾New changelog file version [CI SKIP] [skip ci] [`ce63043`](https://git.odit.services/lfk/backend/commit/ce63043887769e1f92a8c064d6647e0deb81b7fa) + #### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0) +> 23 March 2021 + - Merge pull request 'Release 0.7.0' (#170) from dev into main [`e40017a`](https://git.odit.services/lfk/backend/commit/e40017a6b88d83d5bfc57ff4603abeaca7a9a37b) - Added bulk card creation tests [`438ff0f`](https://git.odit.services/lfk/backend/commit/438ff0fc3f246f83b1fa04cb11828f4a61dfcd1e) - Added new "bulk" endpoint [`c1bbda5`](https://git.odit.services/lfk/backend/commit/c1bbda51f067cbd9ac1a9a5378ae3f5d7b9f4eca) From 135852eb9a91010a4ab972ba9efc7b71dfe4d68f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 15:23:05 +0100 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=9A=80Bumped=20version=20to=20v0.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5b71fe..f9474bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@odit/lfk-backend", - "version": "0.7.0", + "version": "0.7.1", "main": "src/app.ts", "repository": "https://git.odit.services/lfk/backend", "author": { From 3ef3a94b20c1abf6fd2f19472e5f448b4c72bd7f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 26 Mar 2021 14:24:07 +0000 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fa3f50..68fab58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,16 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. -#### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.0) +#### [v0.7.1](https://git.odit.services/lfk/backend/compare/v0.7.0...v0.7.1) -- Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9) - Revert "Set timeout even higher b/c sqlite just kills itself during these tests" [`f159252`](https://git.odit.services/lfk/backend/commit/f159252651942e442026dbcaae09b242e05d8204) - Set timeout even higher b/c sqlite just kills itself during these tests [`6ab6099`](https://git.odit.services/lfk/backend/commit/6ab60998d4f716aded93bb3b5d15594fc5e0434a) - Adjusted jest timeout to mitigate sqlite from invalidateing all tests⏱ [`30d220b`](https://git.odit.services/lfk/backend/commit/30d220bc36a28f224406e49ed27ff3f6b4f409e9) +- 🧾New changelog file version [CI SKIP] [skip ci] [`963253c`](https://git.odit.services/lfk/backend/commit/963253cbc84ed07af13ed0925952ec1b7dcc53ad) - Now resolveing runnercards [`24aff3b`](https://git.odit.services/lfk/backend/commit/24aff3bac458a9886ca40163484bc72733dc766a) - Tests now keep the group [`f3d73d5`](https://git.odit.services/lfk/backend/commit/f3d73d53467a4d00011d280c24e1e12fbb8e443d) +- 🚀Bumped version to v0.7.1 [`135852e`](https://git.odit.services/lfk/backend/commit/135852eb9a91010a4ab972ba9efc7b71dfe4d68f) +- Merge pull request 'RESPONSERUNNERCARD fix bugfix/171-responserunnercards' (#172) from bugfix/171-responserunnercards into dev [`539a650`](https://git.odit.services/lfk/backend/commit/539a6509b17cfd373eef8e443eaa7d41168ac7a9) - 🧾New changelog file version [CI SKIP] [skip ci] [`ce63043`](https://git.odit.services/lfk/backend/commit/ce63043887769e1f92a8c064d6647e0deb81b7fa) #### [v0.7.0](https://git.odit.services/lfk/backend/compare/v0.6.4...v0.7.0)