Joeri de Gooijer pushed to branch feature/cmng-psp1 at cms / hippo-addon-channel-manager
Commits: c43d90b1 by Joeri de Gooijer at 2016-02-10T17:09:11+01:00 CHANNELMGR-445 add karma coverage output to gitignore - - - - - da0ad235 by Joeri de Gooijer at 2016-02-10T17:09:52+01:00 CHANNELMGR-445 add comma's to last elements in arrays in karma.conf - - - - - 2 changed files: - .gitignore - frontend-ng/karma.conf.js Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ +*.log *.iml -/.idea/ -.project/ .settings +.idea/ +.project/ target/ node_modules/ bower_components/ -frontend/*.log +coverage/ ===================================== frontend-ng/karma.conf.js ===================================== --- a/frontend-ng/karma.conf.js +++ b/frontend-ng/karma.conf.js @@ -32,14 +32,14 @@ module.exports = function karmaConfig(config) { cfg.bowerDir + 'angular-mocks/angular-mocks.js', cfg.npmDir + 'babel-core/external-helpers.js', cfg.npmDir + 'systemjs/dist/system-polyfills.js', - cfg.npmDir + 'systemjs/dist/system-register-only.js' + cfg.npmDir + 'systemjs/dist/system-register-only.js', ]; options.files = [ cfg.src.templates, cfg.src.scripts, cfg.src.unitTests, - cfg.srcDir + './angularjs/mock.environment.spec.js' + cfg.srcDir + './angularjs/mock.environment.spec.js', ]; config.set(options); View it on GitLab: https://code.onehippo.org/cms/hippo-addon-channel-manager/compare/5fa545341aac86d33816e1d3e4e3fd89fb0de290...da0ad235eba8a3acc051e268ce1b7a050f5bed95
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn