refs #5739 refactor: reset.sh and runTest.sh

README.md

@@ -51,14 +51,14 @@ $ sh db/reset.sh
 
 Manually reset strucutre/fixtures always.
 ```sh
-$ sh db/resetForce.sh
+$ sh db/reset.sh --no-cache
 ```
 
 ## Running the unit tests
 
 For client-side unit tests run from project's root.
 ```sh
-$ sh runTestFront.sh
+$ sh runTest.sh front
 
 # Or with NodeJS
 $ npm run test:front
@@ -66,7 +66,7 @@ $ npm run test:front
 
 For server-side unit tests run from project's root.
 ```sh
-$ sh runTestBack.sh
+$ sh runTest.sh back
 
 # Or with NodeJS
 $ npm run test:back

db/reset.sh

@@ -1,3 +1,3 @@
 docker compose -f docker-compose.local.yml down db
-docker compose -f docker-compose.local.yml build db
+docker compose -f docker-compose.local.yml build db $1
 docker compose -f docker-compose.local.yml up db -d

db/resetForce.sh

@@ -1,3 +0,0 @@
-docker compose -f docker-compose.local.yml down db
-docker compose -f docker-compose.local.yml build db --no-cache
-docker compose -f docker-compose.local.yml up db -d

docker-compose.test.yml

@@ -14,8 +14,8 @@ services:
             context: .
             dockerfile: front/Dockerfile
             target: test
-        # depends_on:
-        #     - back
+        depends_on:
+            - back
     back:
         image: back
         restart: always

package.json

@@ -108,9 +108,9 @@
     },
     "scripts": {
         "dbtest": "nodemon -q db/tests.js -w db/tests",
-        "test:back": "sh runTestBack.sh",
+        "test:back": "sh runTest.sh back",
         "test:e2e": "node e2e/helpers/tests.js",
-        "test:front": "sh runTestFront.sh",
+        "test:front": "sh runTest.sh front",
         "test:front:ci": "npx jest --ci --maxWorkers=2",
         "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
         "lint": "eslint ./ --cache --ignore-pattern .gitignore",

runTest.sh

@@ -1,3 +1,7 @@
-docker-compose -p salix-testing -f docker-compose.test.yml build --force-rm front
-docker-compose -p salix-testing -f docker-compose.test.yml run --rm front
+docker-compose -p salix-testing -f docker-compose.test.yml build $1
+if [ $1 = "back" ]; then
+    docker-compose -p salix-testing -f docker-compose.test.yml build db
+fi
+docker-compose -p salix-testing -f docker-compose.test.yml run --rm $1
 docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f
+

runTestBack.sh

@@ -1,4 +0,0 @@
-# docker-compose -p salix-testing -f docker-compose.test.yml build --no-cache --force-rm db
-docker-compose -p salix-testing -f docker-compose.test.yml build --force-rm back db
-docker-compose -p salix-testing -f docker-compose.test.yml run --rm back
-docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f