From b04293de753d8020bfba19e6239c336962f77ddc Mon Sep 17 00:00:00 2001 From: Will Abson Date: Fri, 22 Jul 2016 09:27:14 +0100 Subject: [PATCH] Fix up processlist tests to work with datatable --- ng2-components/ng2-activiti-processlist/karma-test-shim.js | 2 ++ ng2-components/ng2-activiti-processlist/karma.conf.js | 3 +++ .../src/components/ng2-activiti-processlist.component.spec.ts | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/ng2-components/ng2-activiti-processlist/karma-test-shim.js b/ng2-components/ng2-activiti-processlist/karma-test-shim.js index c0e325be6f..8c7ba100a2 100644 --- a/ng2-components/ng2-activiti-processlist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-processlist/karma-test-shim.js @@ -10,6 +10,7 @@ var map = { 'rxjs': 'base/node_modules/rxjs', '@angular': 'base/node_modules/@angular', 'ng2-alfresco-core': '/base/node_modules/ng2-alfresco-core/dist', + 'ng2-alfresco-datatable': '/base/node_modules/ng2-alfresco-datatable/dist', 'ng2-translate' : '/base/node_modules/ng2-translate' }; @@ -17,6 +18,7 @@ var packages = { 'app': { main: 'main.js', defaultExtension: 'js' }, 'rxjs': { defaultExtension: 'js' }, 'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' }, + 'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js' }, 'ng2-translate': { defaultExtension: 'js' } }; diff --git a/ng2-components/ng2-activiti-processlist/karma.conf.js b/ng2-components/ng2-activiti-processlist/karma.conf.js index a7c2c2fe0a..ff8918b1db 100644 --- a/ng2-components/ng2-activiti-processlist/karma.conf.js +++ b/ng2-components/ng2-activiti-processlist/karma.conf.js @@ -17,6 +17,9 @@ module.exports = function (config) { {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false}, {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false}, {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false}, + {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.js', included: false, served: true, watched: false}, + {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.html', included: false, served: true, watched: false}, + {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.css', included: false, served: true, watched: false}, {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, diff --git a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.spec.ts index a63caed2e4..e9825c2de7 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.spec.ts @@ -50,6 +50,10 @@ describe('ActivitiProcesslistComponent', () => { })); it('should contain a list of processes', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { + let componentHandler = jasmine.createSpyObj('componentHandler', [ + 'upgradeAllRegistered' + ]); + window['componentHandler'] = componentHandler; return tcb .createAsync(Ng2ActivitiProcesslistComponent) .then((fixture) => {