From 8dbee32eeec8ee3d013e4446e8f53544ee4cb577 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 16 Jan 2021 18:34:53 +0100 Subject: [PATCH] Test's now accept the new address format ref #105 --- src/tests/donors/donor_add.spec.ts | 10 ---------- src/tests/runnerOrgs/org_add.spec.ts | 16 ++++++++++++++-- src/tests/runnerOrgs/org_delete.spec.ts | 16 ++++++++++++++-- src/tests/runnerOrgs/org_update.spec.ts | 8 +++++++- src/tests/runnerTeams/team_update.spec.ts | 1 - src/tests/runners/runner_update.spec.ts | 6 +----- 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/tests/donors/donor_add.spec.ts b/src/tests/donors/donor_add.spec.ts index 954fd2e..3226b8c 100644 --- a/src/tests/donors/donor_add.spec.ts +++ b/src/tests/donors/donor_add.spec.ts @@ -29,16 +29,6 @@ describe('POST /api/donors with errors', () => { expect(res2.status).toEqual(400); expect(res2.headers['content-type']).toContain("application/json") }); - it('creating a new donor with a invalid address should return 404', async () => { - const res2 = await axios.post(base + '/api/donors', { - "firstname": "first", - "middlename": "middle", - "lastname": "last", - "address": 99999999999999999999999999 - }, axios_config); - expect(res2.status).toEqual(404); - expect(res2.headers['content-type']).toContain("application/json") - }); it('creating a new donor with a invalid phone number should return 400', async () => { const res2 = await axios.post(base + '/api/donors', { "firstname": "first", diff --git a/src/tests/runnerOrgs/org_add.spec.ts b/src/tests/runnerOrgs/org_add.spec.ts index 6ee0606..9d939ef 100644 --- a/src/tests/runnerOrgs/org_add.spec.ts +++ b/src/tests/runnerOrgs/org_add.spec.ts @@ -56,7 +56,13 @@ describe('adding + getting from all orgs', () => { expect(added_org).toEqual({ "name": "test123", "contact": null, - "address": null, + "address": { + "address1": null, + "address2": null, + "city": null, + "country": null, + "postalcode": null, + }, "teams": [] }) }); @@ -83,7 +89,13 @@ describe('adding + getting explicitly', () => { expect(added_org2).toEqual({ "name": "test123", "contact": null, - "address": null, + "address": { + "address1": null, + "address2": null, + "city": null, + "country": null, + "postalcode": null, + }, "teams": [] }) }); diff --git a/src/tests/runnerOrgs/org_delete.spec.ts b/src/tests/runnerOrgs/org_delete.spec.ts index 08891f8..d28faa1 100644 --- a/src/tests/runnerOrgs/org_delete.spec.ts +++ b/src/tests/runnerOrgs/org_delete.spec.ts @@ -44,7 +44,13 @@ describe('adding + deletion (successfull)', () => { expect(added_org2).toEqual({ "name": "test123", "contact": null, - "address": null, + "address": { + "address1": null, + "address2": null, + "city": null, + "country": null, + "postalcode": null, + }, "teams": [] }); }); @@ -121,7 +127,13 @@ describe('adding + deletion with teams still existing (with force)', () => { expect(added_org2).toEqual({ "name": "test123", "contact": null, - "address": null + "address": { + "address1": null, + "address2": null, + "city": null, + "country": null, + "postalcode": null, + }, }); }); it('check if org really was deleted', async () => { diff --git a/src/tests/runnerOrgs/org_update.spec.ts b/src/tests/runnerOrgs/org_update.spec.ts index e6a1055..3db1254 100644 --- a/src/tests/runnerOrgs/org_update.spec.ts +++ b/src/tests/runnerOrgs/org_update.spec.ts @@ -42,7 +42,13 @@ describe('adding + updating name', () => { expect(added_org2).toEqual({ "name": "testlelele", "contact": null, - "address": null, + "address": { + "address1": null, + "address2": null, + "city": null, + "country": null, + "postalcode": null, + }, "teams": [] }) }); diff --git a/src/tests/runnerTeams/team_update.spec.ts b/src/tests/runnerTeams/team_update.spec.ts index 7acacd7..0257bfd 100644 --- a/src/tests/runnerTeams/team_update.spec.ts +++ b/src/tests/runnerTeams/team_update.spec.ts @@ -123,7 +123,6 @@ describe('add+update parent org (valid)', () => { let updated_team = res4.data; expect(res4.status).toEqual(200); expect(res4.headers['content-type']).toContain("application/json") - delete added_org2.address; delete added_org2.contact; delete added_org2.teams; expect(updated_team.parentGroup).toEqual(added_org2) diff --git a/src/tests/runners/runner_update.spec.ts b/src/tests/runners/runner_update.spec.ts index 39acc5f..92c80e7 100644 --- a/src/tests/runners/runner_update.spec.ts +++ b/src/tests/runners/runner_update.spec.ts @@ -44,7 +44,6 @@ describe('Update runner name after adding', () => { expect(res3.status).toEqual(200); expect(res3.headers['content-type']).toContain("application/json") updated_runner = res3.data; - delete added_org.address; delete added_org.contact; delete added_org.teams; runnercopy.group = added_org; @@ -56,7 +55,6 @@ describe('Update runner group after adding', () => { let added_org_id; let added_org_2; let added_runner; - let updated_runner; it('creating a new org with just a name should return 200', async () => { const res1 = await axios.post(base + '/api/organisations', { "name": "test123" @@ -81,7 +79,6 @@ describe('Update runner group after adding', () => { "name": "test123" }, axios_config); added_org_2 = res3.data - delete added_org_2.address; delete added_org_2.contact; delete added_org_2.teams; expect(res3.status).toEqual(200); @@ -92,8 +89,7 @@ describe('Update runner group after adding', () => { const res3 = await axios.put(base + '/api/runners/' + added_runner.id, added_runner, axios_config); expect(res3.status).toEqual(200); expect(res3.headers['content-type']).toContain("application/json") - updated_runner = res3.data - expect(updated_runner.group).toEqual(added_org_2); + expect(res3.data.group).toEqual(added_org_2); }); }); // ---------------