From 33b8e57292d4e3226dbff2269970a4ea38a52a8f Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Mon, 26 Feb 2024 23:13:56 -0800 Subject: [PATCH] Move tests into ./tests/ --- .github/workflows/.deploy.yml | 2 +- .github/workflows/.tests.yml | 4 ++-- {integration-tests => tests/integration}/package-lock.json | 0 {integration-tests => tests/integration}/package.json | 0 {integration-tests => tests/integration}/src/main.js | 0 .../integration}/src/test_suites/it.backend.fastapi.json | 0 .../integration}/src/test_suites/it.backend.fiber.json | 0 .../integration}/src/test_suites/it.backend.nest.json | 0 .../integration}/src/test_suites/it.backend.quarkus.json | 0 {load-test => tests/load}/README.md | 0 {load-test => tests/load}/backend-test.js | 0 {load-test => tests/load}/frontend-test.js | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename {integration-tests => tests/integration}/package-lock.json (100%) rename {integration-tests => tests/integration}/package.json (100%) rename {integration-tests => tests/integration}/src/main.js (100%) rename {integration-tests => tests/integration}/src/test_suites/it.backend.fastapi.json (100%) rename {integration-tests => tests/integration}/src/test_suites/it.backend.fiber.json (100%) rename {integration-tests => tests/integration}/src/test_suites/it.backend.nest.json (100%) rename {integration-tests => tests/integration}/src/test_suites/it.backend.quarkus.json (100%) rename {load-test => tests/load}/README.md (100%) rename {load-test => tests/load}/backend-test.js (100%) rename {load-test => tests/load}/frontend-test.js (100%) diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml index 3f8ba896c..03ee8106d 100644 --- a/.github/workflows/.deploy.yml +++ b/.github/workflows/.deploy.yml @@ -47,7 +47,7 @@ on: outputs: triggered: - description: 'Has a deployment has been triggered?' + description: 'Has a deployment has been triggered? [true|false]' value: ${{ jobs.deploys.outputs.triggered }} env: diff --git a/.github/workflows/.tests.yml b/.github/workflows/.tests.yml index e7abc5d99..9d9157fc7 100644 --- a/.github/workflows/.tests.yml +++ b/.github/workflows/.tests.yml @@ -35,7 +35,7 @@ jobs: API_NAME: nest BASE_URL: https://${{ github.event.repository.name }}-${{ inputs.target }}-frontend.${{ env.DOMAIN }} run: | - cd integration-tests + cd test/integration/ npm ci node src/main.js @@ -86,5 +86,5 @@ jobs: BACKEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/api FRONTEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }} with: - filename: ./load-test/${{ matrix.name }}-test.js + filename: ./tests/load/${{ matrix.name }}-test.js flags: --vus 10 --duration 30s diff --git a/integration-tests/package-lock.json b/tests/integration/package-lock.json similarity index 100% rename from integration-tests/package-lock.json rename to tests/integration/package-lock.json diff --git a/integration-tests/package.json b/tests/integration/package.json similarity index 100% rename from integration-tests/package.json rename to tests/integration/package.json diff --git a/integration-tests/src/main.js b/tests/integration/src/main.js similarity index 100% rename from integration-tests/src/main.js rename to tests/integration/src/main.js diff --git a/integration-tests/src/test_suites/it.backend.fastapi.json b/tests/integration/src/test_suites/it.backend.fastapi.json similarity index 100% rename from integration-tests/src/test_suites/it.backend.fastapi.json rename to tests/integration/src/test_suites/it.backend.fastapi.json diff --git a/integration-tests/src/test_suites/it.backend.fiber.json b/tests/integration/src/test_suites/it.backend.fiber.json similarity index 100% rename from integration-tests/src/test_suites/it.backend.fiber.json rename to tests/integration/src/test_suites/it.backend.fiber.json diff --git a/integration-tests/src/test_suites/it.backend.nest.json b/tests/integration/src/test_suites/it.backend.nest.json similarity index 100% rename from integration-tests/src/test_suites/it.backend.nest.json rename to tests/integration/src/test_suites/it.backend.nest.json diff --git a/integration-tests/src/test_suites/it.backend.quarkus.json b/tests/integration/src/test_suites/it.backend.quarkus.json similarity index 100% rename from integration-tests/src/test_suites/it.backend.quarkus.json rename to tests/integration/src/test_suites/it.backend.quarkus.json diff --git a/load-test/README.md b/tests/load/README.md similarity index 100% rename from load-test/README.md rename to tests/load/README.md diff --git a/load-test/backend-test.js b/tests/load/backend-test.js similarity index 100% rename from load-test/backend-test.js rename to tests/load/backend-test.js diff --git a/load-test/frontend-test.js b/tests/load/frontend-test.js similarity index 100% rename from load-test/frontend-test.js rename to tests/load/frontend-test.js