From d295100a48b46aaa1b2f085464ae282e9d626c10 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 10 Dec 2020 20:32:57 +0100 Subject: [PATCH] refactoring: cleaned up the names ref #17 --- .../{org_add+get.spec.ts => org_add.spec.ts} | 8 -------- ..._add+delete.spec.ts => org_delete.spec.ts} | 0 src/tests/runnerOrgs/org_get.spec.ts | 19 +++++++++++++++++++ ..._add+update.spec.ts => org_update.spec.ts} | 0 ...{team_add+get.spec.ts => team_add.spec.ts} | 0 ...add+delete.spec.ts => team_delete.spec.ts} | 0 src/tests/runnerTeams/team_get.spec.ts | 19 +++++++++++++++++++ ...add+update.spec.ts => team_update.spec.ts} | 0 ...d+delete.spec.ts => runner_delete.spec.ts} | 0 ...ner_add+get.spec.ts => runner_get.spec.ts} | 0 ...d+update.spec.ts => runner_update.spec.ts} | 0 11 files changed, 38 insertions(+), 8 deletions(-) rename src/tests/runnerOrgs/{org_add+get.spec.ts => org_add.spec.ts} (89%) rename src/tests/runnerOrgs/{org_add+delete.spec.ts => org_delete.spec.ts} (100%) create mode 100644 src/tests/runnerOrgs/org_get.spec.ts rename src/tests/runnerOrgs/{org_add+update.spec.ts => org_update.spec.ts} (100%) rename src/tests/runnerTeams/{team_add+get.spec.ts => team_add.spec.ts} (100%) rename src/tests/runnerTeams/{team_add+delete.spec.ts => team_delete.spec.ts} (100%) create mode 100644 src/tests/runnerTeams/team_get.spec.ts rename src/tests/runnerTeams/{team_add+update.spec.ts => team_update.spec.ts} (100%) rename src/tests/runners/{runner_add+delete.spec.ts => runner_delete.spec.ts} (100%) rename src/tests/runners/{runner_add+get.spec.ts => runner_get.spec.ts} (100%) rename src/tests/runners/{runner_add+update.spec.ts => runner_update.spec.ts} (100%) diff --git a/src/tests/runnerOrgs/org_add+get.spec.ts b/src/tests/runnerOrgs/org_add.spec.ts similarity index 89% rename from src/tests/runnerOrgs/org_add+get.spec.ts rename to src/tests/runnerOrgs/org_add.spec.ts index fb28b62..eaf7b94 100644 --- a/src/tests/runnerOrgs/org_add+get.spec.ts +++ b/src/tests/runnerOrgs/org_add.spec.ts @@ -2,14 +2,6 @@ import axios from 'axios'; import { config } from '../../config'; const base = "http://localhost:" + config.internal_port -describe('GET /api/organisations', () => { - it('basic get should return 200', async () => { - const res = await axios.get(base + '/api/organisations'); - expect(res.status).toEqual(200); - expect(res.headers['content-type']).toContain("application/json") - }); -}); -// --------------- describe('POST /api/organisations', () => { it('creating a new org with just a name should return 200', async () => { const res = await axios.post(base + '/api/organisations', { diff --git a/src/tests/runnerOrgs/org_add+delete.spec.ts b/src/tests/runnerOrgs/org_delete.spec.ts similarity index 100% rename from src/tests/runnerOrgs/org_add+delete.spec.ts rename to src/tests/runnerOrgs/org_delete.spec.ts diff --git a/src/tests/runnerOrgs/org_get.spec.ts b/src/tests/runnerOrgs/org_get.spec.ts new file mode 100644 index 0000000..3e899f7 --- /dev/null +++ b/src/tests/runnerOrgs/org_get.spec.ts @@ -0,0 +1,19 @@ +import axios from 'axios'; +import { config } from '../../config'; +const base = "http://localhost:" + config.internal_port + +describe('GET /api/organisations', () => { + it('basic get should return 200', async () => { + const res = await axios.get(base + '/api/organisations'); + expect(res.status).toEqual(200); + expect(res.headers['content-type']).toContain("application/json") + }); +}); +// --------------- +describe('GET /api/organisations/0', () => { + it('basic get should return 404', async () => { + const res = await axios.get(base + '/api/runners/0', { validateStatus: undefined }); + expect(res.status).toEqual(404); + expect(res.headers['content-type']).toContain("application/json") + }); +}); \ No newline at end of file diff --git a/src/tests/runnerOrgs/org_add+update.spec.ts b/src/tests/runnerOrgs/org_update.spec.ts similarity index 100% rename from src/tests/runnerOrgs/org_add+update.spec.ts rename to src/tests/runnerOrgs/org_update.spec.ts diff --git a/src/tests/runnerTeams/team_add+get.spec.ts b/src/tests/runnerTeams/team_add.spec.ts similarity index 100% rename from src/tests/runnerTeams/team_add+get.spec.ts rename to src/tests/runnerTeams/team_add.spec.ts diff --git a/src/tests/runnerTeams/team_add+delete.spec.ts b/src/tests/runnerTeams/team_delete.spec.ts similarity index 100% rename from src/tests/runnerTeams/team_add+delete.spec.ts rename to src/tests/runnerTeams/team_delete.spec.ts diff --git a/src/tests/runnerTeams/team_get.spec.ts b/src/tests/runnerTeams/team_get.spec.ts new file mode 100644 index 0000000..f30b230 --- /dev/null +++ b/src/tests/runnerTeams/team_get.spec.ts @@ -0,0 +1,19 @@ +import axios from 'axios'; +import { config } from '../../config'; +const base = "http://localhost:" + config.internal_port + +describe('GET /api/teams', () => { + it('basic get should return 200', async () => { + const res = await axios.get(base + '/api/teams'); + expect(res.status).toEqual(200); + expect(res.headers['content-type']).toContain("application/json") + }); +}); +// --------------- +describe('GET /api/teams/0', () => { + it('basic get should return 404', async () => { + const res = await axios.get(base + '/api/teams/0', { validateStatus: undefined }); + expect(res.status).toEqual(404); + expect(res.headers['content-type']).toContain("application/json") + }); +}); \ No newline at end of file diff --git a/src/tests/runnerTeams/team_add+update.spec.ts b/src/tests/runnerTeams/team_update.spec.ts similarity index 100% rename from src/tests/runnerTeams/team_add+update.spec.ts rename to src/tests/runnerTeams/team_update.spec.ts diff --git a/src/tests/runners/runner_add+delete.spec.ts b/src/tests/runners/runner_delete.spec.ts similarity index 100% rename from src/tests/runners/runner_add+delete.spec.ts rename to src/tests/runners/runner_delete.spec.ts diff --git a/src/tests/runners/runner_add+get.spec.ts b/src/tests/runners/runner_get.spec.ts similarity index 100% rename from src/tests/runners/runner_add+get.spec.ts rename to src/tests/runners/runner_get.spec.ts diff --git a/src/tests/runners/runner_add+update.spec.ts b/src/tests/runners/runner_update.spec.ts similarity index 100% rename from src/tests/runners/runner_add+update.spec.ts rename to src/tests/runners/runner_update.spec.ts