summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2013-03-21 18:03:56 +0100
committerAlessandro Cosentino <cosenal@gmail.com>2013-03-21 18:03:56 +0100
commitd692600a31bf4aa9be8b71d8fcb16e90e9393aea (patch)
tree48cabe6a39b0d7a10143fa8b41df9703f8576c8e
parent18dda32e14fb16a7f145c562446b67191f8d2e43 (diff)
directive for testacular unit test with phantomjs
-rw-r--r--js/Gruntfile.coffee4
-rw-r--r--js/Makefile4
2 files changed, 8 insertions, 0 deletions
diff --git a/js/Gruntfile.coffee b/js/Gruntfile.coffee
index 3280d94e8..c5268a3ee 100644
--- a/js/Gruntfile.coffee
+++ b/js/Gruntfile.coffee
@@ -104,6 +104,10 @@ module.exports = (grunt) ->
reporters: ['progress', 'junit']
junitReporter:
outputFile: 'test-results.xml'
+ unit_phantom:
+ configFile: 'config/testacular_conf.js'
+ browsers: ['PhantomJS']
+
phpunit:
classes:
diff --git a/js/Makefile b/js/Makefile
index f3ee911b9..cb4c0339e 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -37,6 +37,10 @@ watch: compile
testacular: deps
export CHROME_BIN=$(chrome_bin) && export FIREFOX_BIN=$(firefox_bin) && \
$(grunt) --config $(CURDIR)/Gruntfile.coffee testacular
+
+testacular_phantom: deps
+ export PHANTOMJS_BIN=$(phantomjs) && \
+ $(grunt) --config $(CURDIR)/Gruntfile.coffee testacular:unit_phantom
phpunit: deps
$(grunt) --config $(CURDIR)/Gruntfile.coffee testphp