#841 Client modules mixed with service modules

client/spliting.js

@@ -1,18 +0,0 @@
-export default {
-    client:
-        cb => require.ensure([], () => cb(require('client'))),
-    route:
-        cb => require.ensure([], () => cb(require('route'))),
-    item:
-        cb => require.ensure([], () => cb(require('item'))),
-    ticket:
-        cb => require.ensure([], () => cb(require('ticket'))),
-    order:
-        cb => require.ensure([], () => cb(require('order'))),
-    claim:
-        cb => require.ensure([], () => cb(require('claim'))),
-    agency:
-        cb => require.ensure([], () => cb(require('agency'))),
-    travel:
-        cb => require.ensure([], () => cb(require('travel')))
-};

front/core/src/components/chip/index.spec.js

@@ -4,19 +4,14 @@ import template from './index.html';
 describe('Component vnChip', () => {
     let $element;
     let $scope;
-    let $httpBackend;
     let controller;
 
-    beforeEach(() => {
-        angular.mock.module('client');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
+    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
         $scope = $rootScope.$new();
         $element = angular.element(`<div>${template}</div>`);
-        $httpBackend = _$httpBackend_;
-        $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
-        controller = _$componentController_('vnChip', {$element, $scope, $httpBackend, $transclude: () => {}});
+        controller = $componentController('vnChip', {$element, $scope, $transclude: () => {}});
     }));
 
     describe('remove()', () => {

front/core/src/components/dialog/dialog.spec.js

@@ -1,14 +1,10 @@
 describe('Component vnDialog', () => {
-    let $componentController;
     let $element;
     let controller;
 
-    beforeEach(() => {
-        angular.mock.module('client');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject(_$componentController_ => {
-        $componentController = _$componentController_;
+    beforeEach(angular.mock.inject($componentController => {
         $element = angular.element('<vn-dialog></vn-dialog>');
         controller = $componentController('vnDialog', {$element, $transclude: null});
         controller.onOpen = jasmine.createSpy('onOpen');

front/core/src/components/input-number/index.spec.js

@@ -1,22 +1,17 @@
 import './index.js';
 
 describe('Component vnInputNumber', () => {
-    let $componentController;
     let $scope;
     let $attrs;
     let $timeout;
     let $element;
     let controller;
 
-    beforeEach(() => {
-        angular.mock.module('claim');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
-        $componentController = _$componentController_;
+    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
         $scope = $rootScope.$new();
         $attrs = {};
-        $timeout = _$timeout_;
         $element = angular.element('<div><input><div class="infix invalid validated"><div class="rightIcons"></div></div>');
         controller = $componentController('vnInputNumber', {$element, $scope, $attrs, $timeout, $transclude: () => {}});
     }));

front/core/src/components/input-time/index.spec.js

@@ -1,22 +1,17 @@
 import './index.js';
 
 describe('Component vnInputNumber', () => {
-    let $componentController;
     let $scope;
     let $attrs;
     let $timeout;
     let $element;
     let controller;
 
-    beforeEach(() => {
-        angular.mock.module('claim');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
-        $componentController = _$componentController_;
+    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
         $scope = $rootScope.$new();
         $attrs = {};
-        $timeout = _$timeout_;
         $element = angular.element('<div><input><div class="infix invalid validated"><div class="rightIcons"></div></div>');
         controller = $componentController('vnInputNumber', {$element, $scope, $attrs, $timeout, $transclude: () => {}});
     }));

front/core/src/components/multi-check/multi-check.spec.js

@@ -1,16 +1,12 @@
 import './multi-check.js';
 
 describe('Component vnMultiCheck', () => {
-    let $componentController;
     let controller;
     let $element;
 
-    beforeEach(() => {
-        angular.mock.module('ticket');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject(_$componentController_ => {
-        $componentController = _$componentController_;
+    beforeEach(angular.mock.inject($componentController => {
         $element = angular.element(`<div class="shown"></div>`);
         controller = $componentController('vnMultiCheck', {$element: $element});
     }));

front/core/src/components/paging/paging.spec.js

@@ -1,20 +1,14 @@
 import './paging.js';
 
 describe('Component vnPaging', () => {
-    let $componentController;
     let $scope;
-    let $httpBackend;
     let controller;
 
-    beforeEach(() => {
-        angular.mock.module('client');
-    });
+    beforeEach(ngModule('vnCore'));
 
-    beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => {
-        $componentController = _$componentController_;
+    beforeEach(angular.mock.inject(($componentController, $rootScope) => {
         $scope = $rootScope.$new();
-        $httpBackend = _$httpBackend_;
-        controller = $componentController('vnPaging', {$scope, $httpBackend});
+        controller = $componentController('vnPaging', {$scope});
     }));
 
     describe('$onChanges()', () => {