summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2017-02-07 16:51:03 -0200
committerTulio Casagrande <tcasagra@thoughtworks.com>2017-02-07 16:51:03 -0200
commit6d5bc7819d4498877e09ad78ae4305b329d43652 (patch)
tree6e29d91bd9fb5e2076ee25d62a9ee618808ddf39
parent3cd797a6da2f14d191006e5e110faf1f51ac3599 (diff)
Simplify test routines to not install packages every time
-rw-r--r--Makefile10
-rw-r--r--web-ui/package.json2
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a263ec42..3968c113 100644
--- a/Makefile
+++ b/Makefile
@@ -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"