yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes JS test runner and all test pass

Browse Source
This commit is contained in:
Shannon
2018-06-15 12:06:21 +10:00
parent feb16f901f
commit 4acc3f48bf
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/test/config/app.unit.js
View File

@@ -5,10 +5,8 @@ var app = angular.module('umbraco', [
'umbraco.services',
'umbraco.mocks',
'umbraco.interceptors',
'ngRoute',
'ngCookies',
'LocalStorageModule'
]);
/* For Angular 1.2: we need to load in Routing separately
'ngRoute'
*/
'LocalStorageModule'
]);

15
src/Umbraco.Web.UI.Client/test/config/karma.conf.js
View File

@@ -12,15 +12,18 @@ module.exports = function (config) {
//libraries
'lib-bower/jquery/jquery.min.js',
'lib/angular/1.1.5/angular.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mocks.js',
'lib/angular/angular-ui-sortable.js',
'lib-bower/angular/angular.js',
'lib-bower/angular-animate/angular-animate.js',
'lib-bower/angular-cookies/angular-cookies.js',
'lib-bower/angular-local-storage/angular-local-storage.min.js',
'lib-bower/angular-route/angular-route.js',
'lib-bower/angular-sanitize/angular-sanitize.js',
'bower_components/angular-mocks/angular-mocks.js',
'lib-bower/angular-ui-sortable/sortable.js',
'lib-bower/underscore/underscore-min.js',
'lib-bower/moment/moment-with-locales.js',
'lib/umbraco/Extensions.js',
'lib-bower/rgrove-lazyload/lazyload.js',
'lib-bower//angular-local-storage/angular-local-storage.min.js',
//app bootstrap and loader
'test/config/app.unit.js',
@@ -29,7 +32,7 @@ module.exports = function (config) {
'src/common/directives/*.js',
'src/common/filters/*.js',
'src/common/services/*.js',
'src/common/security/*.js',
'src/common/interceptors/*.js',
'src/common/resources/*.js',
'src/views/**/*.controller.js',

7
src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
View File

@@ -3,10 +3,7 @@ describe('contentEditingHelper tests', function () {
beforeEach(module('umbraco.services'));
beforeEach(module('umbraco.mocks'));
//Only for 1.2: beforeEach(module('ngRoute'));
beforeEach(module('ngRoute'));
beforeEach(inject(function ($injector, localizationMocks) {
localizationMocks.register();
@@ -236,4 +233,4 @@ describe('contentEditingHelper tests', function () {
});
});
});
});