diff --git a/.gitignore b/.gitignore index 2e19abc..278c2fd 100644 --- a/.gitignore +++ b/.gitignore @@ -231,3 +231,4 @@ Various *.rej build/ +js/yarn.lock diff --git a/js/Gruntfile.js b/js/Gruntfile.js index 9e6338f..5b60b4c 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -82,43 +82,8 @@ module.exports = function(grunt) { }, tasks: ['js'] } - }, - karma: { - unit: { - configFile: 'config/karma.js' - }, - continuous: { - configFile: 'config/karma.js', - singleRun: true, - browsers: ['PhantomJS'], - reporters: ['progress', 'junit'], - junitReporter: { - outputFile: 'test-results.xml' - } - }, - unit_phantom: { - configFile: 'config/karma.js', - browsers: ['PhantomJS'] - } - }, - phpunit: { - classes: { - dir: '../tests' - }, - options: { - colors: true - } - }, - phpdocumentor: { - "default": { - options: { - directory: '../appinfo,../db,../controllers,../service', - target: '../docs' - } - } } }); - grunt.registerTask('ci', ['karma:continuous']); grunt.registerTask('js', ['concat', 'wrap']); grunt.registerTask('default', 'js'); }; diff --git a/js/package.json b/js/package.json index 5c6e103..59bf5c8 100644 --- a/js/package.json +++ b/js/package.json @@ -25,12 +25,8 @@ "grunt-contrib-concat": "~0.1.2", "grunt-contrib-less": "~0.6.4", "grunt-contrib-watch": "~0.2.0", - "grunt-karma": "~0.4.5", "grunt-newer": "~1.1.1", - "grunt-phpdocumentor": "^0.4.1", - "grunt-phpunit": "0.2.0", - "grunt-wrap": "~0.2.0", - "phantomjs": "~1.8.1-3" + "grunt-wrap": "~0.2.0" }, "engine": "node >= 0.8" }