diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | web-ui/package.json | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -36,11 +36,11 @@ create_virtualenv: ensure_virtualenv_installed virtualenv --python=python2 $(VIRTUALENV);\ fi -test: test_py test_js coverage -test_py: clean requirements install coverage linters_py unit_tests_py integration_tests_py -test_js: clean requirements_js install_js linters_js unit_tests_js +test: clean install test_py test_js coverage +test_py: linters_py unit_tests_py integration_tests_py +test_js: linters_js unit_tests_js test_all: test functional_tests -linters: clean requirements install linters_py linters_js +linters: clean install linters_py linters_js linters_py: @. $(VIRTUALENV)/bin/activate;\ diff --git a/web-ui/package.json b/web-ui/package.json index 81901c55..20b06ffd 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -102,7 +102,7 @@ "watch:handlebars": "watch 'npm run build:handlebars' app/templates", "watch:compass": "compass watch", "watch:js": "webpack --colors --progress --watch", - "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*", + "clean": "rm -rf app/js/generated/hbs/* app/css/*", "imagemin": "node config/imagemin.js", "package": "npm run build:prod && npm run imagemin", "add_git_version": "/bin/bash config/add_git_version.sh" |