summaryrefslogtreecommitdiffstats
path: root/js/Gruntfile.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-11-06 09:01:34 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-11-06 09:02:26 +0100
commit1bacdd19d6aa4760ed65d29eaaa6cd3dfebe6627 (patch)
tree66fec5137d4e416a7097860ec486a871ebb0504f /js/Gruntfile.js
parent0a97b588d0fbb677614961a7b77aed77aa160014 (diff)
add php server to grunt
Diffstat (limited to 'js/Gruntfile.js')
-rw-r--r--js/Gruntfile.js15
1 files changed, 13 insertions, 2 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index a46388298..133cf0303 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -11,6 +11,7 @@ module.exports = function (grunt) {
'use strict';
// load needed modules
+ grunt.loadNpmTasks('grunt-php');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
@@ -193,6 +194,16 @@ module.exports = function (grunt) {
base: 'tests/static/'
}
}
+ },
+ php: {
+ dist: {
+ options: {
+ port: 8080,
+ keepalive: true,
+ open: true,
+ base: '../../../'
+ }
+ }
}
});
@@ -200,8 +211,8 @@ module.exports = function (grunt) {
grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'ngAnnotate',
'uglify', 'cssmin']);
grunt.registerTask('dev', ['watch:concat']);
- grunt.registerTask('test', ['karma:unit']);
- grunt.registerTask('php', ['watch:phpunit']);
+ grunt.registerTask('unit-js', ['karma:unit']);
+ grunt.registerTask('unit-php', ['watch:phpunit']);
grunt.registerTask('e2e', ['protractor_webdriver', 'connect',
'protractor']);
grunt.registerTask('ci-unit', ['default', 'karma:continuous']);