chore: reorganize files and directories

tonitienda · Apr 30, 2024 · f7e4950 · f7e4950
1 parent 76e14fa
commit f7e4950
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 108 deletions.
diff --git a/.github/workflows/build-run-test.yaml b/.github/workflows/build-run-test.yaml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         runner: [cypress]
-        frontend: [next, golang-htmx]
+        frontend: [nextjs, htmx-go]
         backend: [go, js]
         db: [inmemory, mongo]
     steps:

diff --git a/compose.go-backend.yaml → compose.backend-go.yaml b/compose.go-backend.yaml → compose.backend-go.yaml
diff --git a/compose.js-backend.yaml → compose.backend-js.yaml b/compose.js-backend.yaml → compose.backend-js.yaml
diff --git a/compose.golang-htmx-frontend.yaml → compose.frontend-htmx-go.yaml b/compose.golang-htmx-frontend.yaml → compose.frontend-htmx-go.yaml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
   webapp:
     build:
-      context: ./webapp-golang-htmx
+      context: ./webapp-htmx-go
       dockerfile: Dockerfile
     depends_on:
       - backend

diff --git a/compose.next-frontend.yaml → compose.frontend-nextjs.yaml b/compose.next-frontend.yaml → compose.frontend-nextjs.yaml
diff --git a/compose.e2e-bdd-go.yaml → compose.system-bdd-go.yaml b/compose.e2e-bdd-go.yaml → compose.system-bdd-go.yaml
diff --git a/generate-justfile.js b/generate-justfile.js
@@ -1,39 +1,39 @@
 const fs = require("node:fs");
 
-const frontEnds = ["next", "golang-htmx"];
+const frontEnds = ["nextjs", "htmx-go"];
 const backends = ["go", "js"];
 const e2eRunners = ["cypress"];
-const apiRunners = ["bdd-go"];
+const systemtests = ["bdd-go"];
 const dbs = ["inmemory", "mongo"];
 
 const makeJustE2ETestTasks = ({ frontend, backend, runner, db }) => `
 test-${runner}-${frontend}-${backend}-${db}:
   docker compose \\
-  -f compose.${frontend}-frontend.yaml \\
-  -f compose.${backend}-backend.yaml \\
+  -f compose.frontend-${frontend}.yaml \\
+  -f compose.backend-${backend}.yaml \\
   -f compose.db-${db}.yaml \\
   -f compose.e2e-${runner}.yaml \\
   config
 
   COMPOSE_PROJECT_NAME="kadai-${runner}-${frontend}-${backend}-${db}" docker compose \\
-     -f compose.${frontend}-frontend.yaml \\
-     -f compose.${backend}-backend.yaml \\
+     -f compose.frontend-${frontend}.yaml \\
+     -f compose.backend-${backend}.yaml \\
      -f compose.db-${db}.yaml \\
      -f compose.e2e-${runner}.yaml \\
      up --build --exit-code-from e2e
 
 `;
 
-const makeJustApiTestTasks = ({ backend, runner, db }) => `
+const makeJustSystemTestTasks = ({ backend, runner, db }) => `
 test-${runner}-${backend}-${db}:
   docker compose \\
-  -f compose.${backend}-backend.yaml \\
+  -f compose.backend-${backend}.yaml \\
   -f compose.db-${db}.yaml \\
-  -f compose.e2e-${runner}.yaml \\
+  -f compose.system-${runner}.yaml \\
   config
 
   COMPOSE_PROJECT_NAME="kadai-${runner}-${backend}-${db}" docker compose \\
-     -f compose.${backend}-backend.yaml \\
+     -f compose.backend-${backend}.yaml \\
      -f compose.db-${db}.yaml \\
      -f compose.e2e-${runner}.yaml \\
      up --build --exit-code-from e2e
@@ -72,8 +72,8 @@ const appCombinations = frontEnds.flatMap((f) =>
   }))
 );
 
-const apiTestsCombinations = apiCombinations.flatMap((a) =>
-  apiRunners.flatMap((r) => ({
+const systemTestsCombinations = apiCombinations.flatMap((a) =>
+  systemtests.flatMap((r) => ({
     ...a,
     runner: r,
   }))
@@ -95,8 +95,8 @@ const contents =
     (contents, combination) => contents + makeJustE2ETestTasks(combination),
     ""
   ) +
-  apiTestsCombinations.reduce(
-    (contents, combination) => contents + makeJustApiTestTasks(combination),
+  systemTestsCombinations.reduce(
+    (contents, combination) => contents + makeJustSystemTestTasks(combination),
     ""
   );