diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | web-ui/package.json | 2 |
2 files changed, 6 insertions, 6 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: linters_py linters_js linters_py: @. $(VIRTUALENV)/bin/activate;\ @@ -68,7 +68,7 @@ unit_tests_js: @cd web-ui;\ npm run test -integration_tests: +integration_tests_py: @. $(VIRTUALENV)/bin/activate;\ cd service;\ trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration diff --git a/web-ui/package.json b/web-ui/package.json index 6f9b03d4..017e6d38 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -79,7 +79,7 @@ "build-js": "webpack --colors --progress", "build-js-watch": "webpack --colors --progress --watch", "jshint": "jshint --config=.jshintrc app test", - "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*", + "clean": "rm -rf app/js/generated/hbs/* app/css/*", "package": "PIXELATED_BUILD='package' npm run build-prod && npm run imagemin", "imagemin": "node config/imagemin.js", "add_git_version": "/bin/bash config/add_git_version.sh" |