diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-05 23:26:20 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-05 23:26:20 +0200 |
| commit | a19aedbec8749c0e944728d4c8d024a50e6d9d0d (patch) | |
| tree | 7fb0fc0ac596d65ca9a63de4428f410043c2649b /js/Makefile | |
| parent | a5b1c6370588635ced856468ee3b8756e1390af6 (diff) | |
updated build tools, testacular is now named karma
Diffstat (limited to 'js/Makefile')
| -rw-r--r-- | js/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/Makefile b/js/Makefile index 4b3bc39ae..f9cf87dec 100644 --- a/js/Makefile +++ b/js/Makefile @@ -33,16 +33,16 @@ watch: compile $(coffee) --compile --watch --output $(CURDIR)/build/tests $(CURDIR)/tests/ & \ $(grunt) --config $(CURDIR)/Gruntfile.coffee run -testacular: deps +karma: deps export CHROME_BIN=$(chrome_bin) && export FIREFOX_BIN=$(firefox_bin) && \ - $(grunt) --config $(CURDIR)/Gruntfile.coffee testacular - -testacular_phantom: deps + $(grunt) --config $(CURDIR)/Gruntfile.coffee karma + +karma_phantom: deps export PHANTOMJS_BIN=$(phantomjs) && \ - $(grunt) --config $(CURDIR)/Gruntfile.coffee testacular:unit_phantom + $(grunt) --config $(CURDIR)/Gruntfile.coffee karma:unit_phantom phpunit: deps - $(grunt) --config $(CURDIR)/Gruntfile.coffee testphp + $(grunt) --config $(CURDIR)/Gruntfile.coffee testphp compile: deps mkdir -p $(CURDIR)/build/app |