update build scripts to 1.1.1

This commit is contained in:
Henry Oswald 2018-05-21 15:14:24 +01:00
parent ee81a6af00
commit 58ab4c72dc
4 changed files with 17 additions and 11 deletions

View file

@ -1,3 +1,9 @@
node_modules/*
gitrev
.git
.gitignore
.npm
.nvmrc
nodemon.json
app.js
**/js/*

View file

@ -23,10 +23,10 @@ clean:
test: test_unit test_acceptance
test_unit:
@[ ! -d test/unit ] && echo "filestore has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit
@[ ! -d test/unit ] && echo "filestore has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit npm run test:unit -- ${MOCHA_ARGS}
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
@[ ! -d test/acceptance ] && echo "filestore has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance npm run test:acceptance -- ${MOCHA_ARGS}
test_clean:
$(DOCKER_COMPOSE) down -v -t 0

View file

@ -18,7 +18,7 @@
"start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
"nodemon": "nodemon --config nodemon.json",
"test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
"test:unit:_run": "mocha --recursive --exit --reporter spec $@ test/unit/js"
"test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js"
},
"dependencies": {
"async": "~0.2.10",