From 6e316a7533daca0c2045b8947ce9c0cb84253876 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 9 Dec 2020 19:57:02 +0100 Subject: [PATCH] Cleanup ref #17 --- src/tests/runnerOrgs/org_add+delete.spec.ts | 53 ++++++------- src/tests/runnerOrgs/org_add+get.spec.ts | 44 +++++------ src/tests/runnerOrgs/org_add+update.spec.ts | 88 ++++++++++----------- 3 files changed, 88 insertions(+), 97 deletions(-) diff --git a/src/tests/runnerOrgs/org_add+delete.spec.ts b/src/tests/runnerOrgs/org_add+delete.spec.ts index 6ac8f5a..a3c09b8 100644 --- a/src/tests/runnerOrgs/org_add+delete.spec.ts +++ b/src/tests/runnerOrgs/org_add+delete.spec.ts @@ -6,42 +6,39 @@ const base = "http://localhost:" + config.internal_port describe('adding + deletion (successfull)', () => { let added_org_id let added_org - describe('adding org', () => { - it('creating a new org with just a name should return 200', async () => { - const res1 = await axios.post(base + '/api/organisations', { - "name": "test123" - }); - added_org = res1.data - added_org_id = added_org.id; - expect(res1.status).toEqual(200); - expect(res1.headers['content-type']).toContain("application/json") + it('creating a new org with just a name should return 200', async () => { + const res1 = await axios.post(base + '/api/organisations', { + "name": "test123" }); - it('delete', async () => { - const res2 = await axios.delete(base + '/api/organisations/' + added_org_id); - expect(res2.status).toEqual(200); - expect(res2.headers['content-type']).toContain("application/json") - let added_org2 = res2.data - added_org_id = added_org2.id; - delete added_org2.id - expect(added_org2).toEqual({ - "name": "test123", - "contact": null, - "address": null, - "teams": [] - }); - }); - it('check if org really was deleted', async () => { - const res3 = await axios.get(base + '/api/organisations/' + added_org_id, { validateStatus: undefined }); - expect(res3.status).toEqual(404); - expect(res3.headers['content-type']).toContain("application/json") + added_org = res1.data + added_org_id = added_org.id; + expect(res1.status).toEqual(200); + expect(res1.headers['content-type']).toContain("application/json") + }); + it('delete', async () => { + const res2 = await axios.delete(base + '/api/organisations/' + added_org_id); + expect(res2.status).toEqual(200); + expect(res2.headers['content-type']).toContain("application/json") + let added_org2 = res2.data + added_org_id = added_org2.id; + delete added_org2.id + expect(added_org2).toEqual({ + "name": "test123", + "contact": null, + "address": null, + "teams": [] }); }); + it('check if org really was deleted', async () => { + const res3 = await axios.get(base + '/api/organisations/' + added_org_id, { validateStatus: undefined }); + expect(res3.status).toEqual(404); + expect(res3.headers['content-type']).toContain("application/json") + }); }); // --------------- describe('adding + deletion (non-existant)', () => { it('delete', async () => { const res2 = await axios.delete(base + '/api/organisations/0', { validateStatus: undefined }); expect(res2.status).toEqual(204); - expect(res2.headers['content-type']).toContain("application/json") }); }); diff --git a/src/tests/runnerOrgs/org_add+get.spec.ts b/src/tests/runnerOrgs/org_add+get.spec.ts index 88423ba..fb28b62 100644 --- a/src/tests/runnerOrgs/org_add+get.spec.ts +++ b/src/tests/runnerOrgs/org_add+get.spec.ts @@ -52,29 +52,27 @@ describe('adding + getting from all orgs', () => { // --------------- describe('adding + getting explicitly', () => { let added_org_id - describe('adding + getting orgs', () => { - it('creating a new org with just a name should return 200', async () => { - const res1 = await axios.post(base + '/api/organisations', { - "name": "test123" - }); - let added_org = res1.data - added_org_id = added_org.id; - expect(res1.status).toEqual(200); - expect(res1.headers['content-type']).toContain("application/json") - }); - it('check if org was added', async () => { - const res2 = await axios.get(base + '/api/organisations/' + added_org_id); - expect(res2.status).toEqual(200); - expect(res2.headers['content-type']).toContain("application/json") - let added_org2 = res2.data - added_org_id = added_org2.id; - delete added_org2.id - expect(added_org2).toEqual({ - "name": "test123", - "contact": null, - "address": null, - "teams": [] - }) + it('creating a new org with just a name should return 200', async () => { + const res1 = await axios.post(base + '/api/organisations', { + "name": "test123" }); + let added_org = res1.data + added_org_id = added_org.id; + expect(res1.status).toEqual(200); + expect(res1.headers['content-type']).toContain("application/json") + }); + it('check if org was added', async () => { + const res2 = await axios.get(base + '/api/organisations/' + added_org_id); + expect(res2.status).toEqual(200); + expect(res2.headers['content-type']).toContain("application/json") + let added_org2 = res2.data + added_org_id = added_org2.id; + delete added_org2.id + expect(added_org2).toEqual({ + "name": "test123", + "contact": null, + "address": null, + "teams": [] + }) }); }); \ No newline at end of file diff --git a/src/tests/runnerOrgs/org_add+update.spec.ts b/src/tests/runnerOrgs/org_add+update.spec.ts index fa2a349..06a35f6 100644 --- a/src/tests/runnerOrgs/org_add+update.spec.ts +++ b/src/tests/runnerOrgs/org_add+update.spec.ts @@ -6,60 +6,56 @@ const base = "http://localhost:" + config.internal_port describe('adding + updating name', () => { let added_org_id let added_org - describe('adding org', () => { - it('creating a new org with just a name should return 200', async () => { - const res1 = await axios.post(base + '/api/organisations', { - "name": "test123" - }); - added_org = res1.data - added_org_id = added_org.id; - expect(res1.status).toEqual(200); - expect(res1.headers['content-type']).toContain("application/json") + it('creating a new org with just a name should return 200', async () => { + const res1 = await axios.post(base + '/api/organisations', { + "name": "test123" }); - it('update org', async () => { - const res2 = await axios.put(base + '/api/organisations/' + added_org_id, { - "id": added_org_id, - "name": "testlelele", - "contact": null, - "address": null, - }); - expect(res2.status).toEqual(200); - expect(res2.headers['content-type']).toContain("application/json") - let added_org2 = res2.data - added_org_id = added_org2.id; - delete added_org2.id - expect(added_org2).toEqual({ - "name": "testlelele", - "contact": null, - "address": null, - "teams": [] - }) + added_org = res1.data + added_org_id = added_org.id; + expect(res1.status).toEqual(200); + expect(res1.headers['content-type']).toContain("application/json") + }); + it('update org', async () => { + const res2 = await axios.put(base + '/api/organisations/' + added_org_id, { + "id": added_org_id, + "name": "testlelele", + "contact": null, + "address": null, }); + expect(res2.status).toEqual(200); + expect(res2.headers['content-type']).toContain("application/json") + let added_org2 = res2.data + added_org_id = added_org2.id; + delete added_org2.id + expect(added_org2).toEqual({ + "name": "testlelele", + "contact": null, + "address": null, + "teams": [] + }) }); }); // --------------- describe('adding + try updating id (should return 406)', () => { let added_org_id let added_org - describe('adding org', () => { - it('creating a new org with just a name should return 200', async () => { - const res1 = await axios.post(base + '/api/organisations', { - "name": "test123" - }); - added_org = res1.data - added_org_id = added_org.id; - expect(res1.status).toEqual(200); - expect(res1.headers['content-type']).toContain("application/json") - }); - it('update org', async () => { - const res2 = await axios.put(base + '/api/organisations/' + added_org_id, { - "id": added_org_id + 1, - "name": "testlelele", - "contact": null, - "address": null, - }, { validateStatus: undefined }); - expect(res2.status).toEqual(406); - expect(res2.headers['content-type']).toContain("application/json") + it('creating a new org with just a name should return 200', async () => { + const res1 = await axios.post(base + '/api/organisations', { + "name": "test123" }); + added_org = res1.data + added_org_id = added_org.id; + expect(res1.status).toEqual(200); + expect(res1.headers['content-type']).toContain("application/json") + }); + it('update org', async () => { + const res2 = await axios.put(base + '/api/organisations/' + added_org_id, { + "id": added_org_id + 1, + "name": "testlelele", + "contact": null, + "address": null, + }, { validateStatus: undefined }); + expect(res2.status).toEqual(406); + expect(res2.headers['content-type']).toContain("application/json") }); }); \ No newline at end of file