verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #5739 refactor: reset.sh and runTest.sh
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2024-01-17 08:09:58 +01:00
parent 280e3c6760
commit 5dc9062444
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

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

2
db/reset.sh
View File

@ -1,3 +1,3 @@
docker compose -f docker-compose.local.yml down db 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 docker compose -f docker-compose.local.yml up db -d

3
db/resetForce.sh
View File

@ -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

4
docker-compose.test.yml
View File

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

4
package.json
View File

@ -108,9 +108,9 @@
}, },
"scripts": { "scripts": {
"dbtest": "nodemon -q db/tests.js -w db/tests", "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: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", "test:front:ci": "npx jest --ci --maxWorkers=2",
"back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back", "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
"lint": "eslint ./ --cache --ignore-pattern .gitignore", "lint": "eslint ./ --cache --ignore-pattern .gitignore",

8
runTestFront.sh → runTest.sh
View File

@ -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 build $1
docker-compose -p salix-testing -f docker-compose.test.yml run --rm front 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 docker-compose -p salix-testing -f docker-compose.test.yml rm -s -v -f

4
runTestBack.sh
View File

@ -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