diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 02:22:02 +0200 |
commit | 90584316b8f275fcad904b644676544eb0322636 (patch) | |
tree | 35ead28e8f0cdccc1771464442bb83ce5b558cc6 /js/Gruntfile.js | |
parent | ded252d29e99e068ea341506129e47a05e053a24 (diff) |
add test for firstrun page
Diffstat (limited to 'js/Gruntfile.js')
-rw-r--r-- | js/Gruntfile.js | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js index df0afc2ba..5dd29b9fc 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -14,7 +14,9 @@ var globals = [ 'angular', // app 'app', + // ownCloud 'OC', + 'oc_requesttoken', // angular 'inject', 'module', @@ -62,9 +64,10 @@ module.exports = function (grunt) { }, dist: { src: [ - 'app/app.js', - 'app/config.js', - 'app/run.js', + 'app/App.js', + 'app/Config.js', + 'app/Run.js', + 'controller/**/*.js', 'filter/**/*.js', 'service/**/*.js', 'directive/**/*.js' @@ -84,8 +87,8 @@ module.exports = function (grunt) { dest: '<%= meta.production %>app.js', options: { wrapper: [ - '(function(angular, $, OC, undefined){\n\n\'use strict\';\n\n', - '\n})(angular, jQuery, OC);' + '(function(angular, $, OC, oc_requesttoken, undefined){\n\n\'use strict\';\n\n', + '\n})(angular, jQuery, OC, oc_requesttoken);' ] } } @@ -96,6 +99,7 @@ module.exports = function (grunt) { 'app/**/*.js', 'filter/**/*.js', 'service/**/*.js', + 'controller/**/*.js', 'directive/**/*.js', 'tests/**/*.js', 'Gruntfile.js', @@ -119,10 +123,10 @@ module.exports = function (grunt) { 'service/**/*.js', '../templates/**/*.php' ], + tasks: ['default'], options: { livereload: true - }, - tasks: ['default'] + } }, phpunit: { files: [ @@ -189,7 +193,9 @@ module.exports = function (grunt) { // make tasks available under simpler commands grunt.registerTask('default', ['jslint', 'concat', 'ngmin', 'wrap']); + grunt.registerTask('dev', ['watch:concat']); grunt.registerTask('test', ['karma:unit']); + grunt.registerTask('phpunit', ['watch:phpunit']); grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor:chrome']); grunt.registerTask('ci-unit', ['default', 'karma:continuous']); grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor:phantomjs']); |