|
@@ -1,5 +1,5 @@
|
|
|
DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
|
|
DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
|
|
|
-NPM := docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm npm npm
|
|
|
|
|
|
|
+npm -q := docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm npm -q npm
|
|
|
BUILD_NUMBER ?= local
|
|
BUILD_NUMBER ?= local
|
|
|
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
|
|
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
|
|
|
PROJECT_NAME = web
|
|
PROJECT_NAME = web
|
|
@@ -43,7 +43,7 @@ docker-shared.yml:
|
|
|
test: test_unit test_acceptance
|
|
test: test_unit test_acceptance
|
|
|
|
|
|
|
|
test_unit: docker-shared.yml
|
|
test_unit: docker-shared.yml
|
|
|
- docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm test_unit npm run test:unit -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
+ docker-compose ${DOCKER_COMPOSE_FLAGS} run --rm test_unit npm -q run test:unit -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
|
test_acceptance: test_acceptance_app test_acceptance_modules
|
|
test_acceptance: test_acceptance_app test_acceptance_modules
|
|
|
|
|
|
|
@@ -56,7 +56,7 @@ test_acceptance_app_stop_service: docker-shared.yml
|
|
|
docker-compose ${DOCKER_COMPOSE_FLAGS} stop test_acceptance redis mongo
|
|
docker-compose ${DOCKER_COMPOSE_FLAGS} stop test_acceptance redis mongo
|
|
|
|
|
|
|
|
test_acceptance_app_run: docker-shared.yml
|
|
test_acceptance_app_run: docker-shared.yml
|
|
|
- docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm run test:acceptance -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
+ docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm -q run test:acceptance -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
|
test_acceptance_modules: docker-shared.yml
|
|
test_acceptance_modules: docker-shared.yml
|
|
|
for dir in modules/*; \
|
|
for dir in modules/*; \
|