summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-05-07 18:01:28 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-05-07 18:01:28 +0200
commite90e0779f3ccdc18c9143c0cf73adc53c5dc10dc (patch)
tree9a0b2774be293eb02a90b35b3b4ffefdf93c15ab /Makefile
parent8ee79c729abe0f5121732f9cdcbc71ac7f864c16 (diff)
make it easier to run js tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 14cf6b3fb..1cffbeba5 100644
--- a/Makefile
+++ b/Makefile
@@ -36,17 +36,21 @@ dist: clean
git archive HEAD --format=zip --prefix=$(app_name)/ > $(package_name).zip
-test: unit integration acceptance
+# tests
+test: javascript-tests unit-tests integration-tests acceptance-tests
-
-unit:
+unit-tests:
phpunit tests/unit
-integration:
+integration-tests:
phpunit tests/integration
-acceptance:
- cd tests/acceptance; make
+acceptance-tests:
+ cd tests/acceptance; make headless
+
+
+javascript-tests:
+ cd js; make test