Gets unit tests running again and added a task runTests

This commit is contained in:
Shannon
2019-02-07 16:22:29 +11:00
parent 86b31c2782
commit 261ddfbcd6
3 changed files with 25 additions and 12 deletions

View File

@@ -9,7 +9,10 @@ var karmaServer = require('karma').Server;
**************************/
// Karma test
gulp.task('test:unit', function() {
gulp.task('runTests', ["js", "test:unit"]);
gulp.task('test:unit', function () {
new karmaServer({
configFile: __dirname + "/../../test/config/karma.conf.js",
keepalive: true

View File

@@ -1,12 +1,20 @@
var app = angular.module('umbraco', [
'umbraco.filters',
'umbraco.directives',
'umbraco.resources',
'umbraco.services',
'umbraco.filters',
'umbraco.directives',
'umbraco.resources',
'umbraco.services',
'umbraco.mocks',
'umbraco.interceptors',
'ngRoute',
'ngAnimate',
'ngCookies',
'LocalStorageModule'
'ngSanitize',
//'ngMessages',
'tmh.dynamicLocale',
//'ngFileUpload',
//'LocalStorageModule',
//'chart.js'
]);

View File

@@ -24,17 +24,19 @@ module.exports = function (config) {
'node_modules/moment/min/moment-with-locales.js',
'lib/umbraco/Extensions.js',
'node_modules/lazyload-js/lazyload.min.js',
'node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js',
//app bootstrap and loader
'test/config/app.unit.js',
//application files
'src/common/directives/*.js',
'src/common/filters/*.js',
'src/common/services/*.js',
'src/common/interceptors/*.js',
'src/common/resources/*.js',
'src/views/**/*.controller.js',
'../Umbraco.Web.UI/Umbraco/js/*.controllers.js',
'../Umbraco.Web.UI/Umbraco/js/*.directives.js',
'../Umbraco.Web.UI/Umbraco/js/*.filters.js',
'../Umbraco.Web.UI/Umbraco/js/*.services.js',
'../Umbraco.Web.UI/Umbraco/js/*.interceptors.js',
'../Umbraco.Web.UI/Umbraco/js/*.security.js',
'../Umbraco.Web.UI/Umbraco/js/*.resources.js',
//mocked data and routing
'src/common/mocks/umbraco.servervariables.js',