|
@@ -6,7 +6,7 @@
|
|
|
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 = filestore
|
|
PROJECT_NAME = filestore
|
|
|
-DOCKER_COMPOSE_FLAGS ?= -f docker-compose.yml
|
|
|
|
|
|
|
+DOCKER_COMPOSE_FLAGS ?= -f docker-compose.ci.yml
|
|
|
DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
|
|
DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
|
|
|
BRANCH_NAME=$(BRANCH_NAME) \
|
|
BRANCH_NAME=$(BRANCH_NAME) \
|
|
|
PROJECT_NAME=$(PROJECT_NAME) \
|
|
PROJECT_NAME=$(PROJECT_NAME) \
|
|
@@ -23,10 +23,10 @@ clean:
|
|
|
test: test_unit test_acceptance
|
|
test: test_unit test_acceptance
|
|
|
|
|
|
|
|
test_unit:
|
|
test_unit:
|
|
|
- @[ ! -d test/unit ] && echo "filestore has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit npm run test:unit -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
+ @[ ! -d test/unit ] && echo "filestore has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit
|
|
|
|
|
|
|
|
test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run
|
|
test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run
|
|
|
- @[ ! -d test/acceptance ] && echo "filestore has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance npm run test:acceptance -- ${MOCHA_ARGS}
|
|
|
|
|
|
|
+ @[ ! -d test/acceptance ] && echo "filestore has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
|
|
|
|
|
|
|
|
test_clean:
|
|
test_clean:
|
|
|
$(DOCKER_COMPOSE) down -v -t 0
|
|
$(DOCKER_COMPOSE) down -v -t 0
|