From cb49993b22ad140a13491af5afa0553bf2670fd9 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 5 Oct 2016 15:07:21 +0100 Subject: [PATCH] fix test and coverage Angular2 Final release tasklist component #749 --- .../ng2-activiti-tasklist/karma-test-shim.js | 22 ++------------- .../ng2-activiti-tasklist/karma.conf.js | 25 +++++------------ .../ng2-activiti-tasklist/package.json | 14 +++++----- .../src/components/activiti-apps.component.ts | 3 +-- .../activiti-checklist.component.ts | 3 +-- .../components/activiti-comments.component.ts | 3 +-- .../components/activiti-filters.component.ts | 3 +-- .../components/activiti-people.component.ts | 3 +-- .../activiti-start-task.component.ts | 3 +-- .../activiti-task-details.component.ts | 3 +-- .../activiti-task-header.component.ts | 3 +-- .../components/activiti-tasklist.component.ts | 3 +-- .../activiti-tasklist.service.spec.ts | 27 ++++++++++--------- .../ng2-activiti-tasklist/tsconfig.json | 4 +-- 14 files changed, 42 insertions(+), 77 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js index 9662cebf0a..e788adc4ab 100644 --- a/ng2-components/ng2-activiti-tasklist/karma-test-shim.js +++ b/ng2-components/ng2-activiti-tasklist/karma-test-shim.js @@ -55,17 +55,8 @@ var map = { 'alfresco-js-api': 'npm:alfresco-js-api/dist', 'ng2-activiti-form': 'npm:ng2-activiti-form/dist', - 'ng2-activiti-processlist': 'npm:ng2-activiti-processlist/dist', - 'ng2-activiti-tasklist': 'npm:ng2-activiti-tasklist/dist', 'ng2-alfresco-core': 'npm:ng2-alfresco-core/dist', - 'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable/dist', - 'ng2-alfresco-documentlist': 'npm:ng2-alfresco-documentlist/dist', - 'ng2-alfresco-login': 'npm:ng2-alfresco-login/dist', - 'ng2-alfresco-search': 'npm:ng2-alfresco-search/dist', - 'ng2-alfresco-tag': 'npm:ng2-alfresco-tag/dist', - 'ng2-alfresco-upload': 'npm:ng2-alfresco-upload/dist', - 'ng2-alfresco-viewer': 'npm:ng2-alfresco-viewer/dist', - 'ng2-alfresco-webscript': 'npm:ng2-alfresco-webscript/dist' + 'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable/dist' }; var packages = { @@ -75,17 +66,8 @@ var packages = { 'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}, 'ng2-activiti-form': { main: './index.js', defaultExtension: 'js'}, - 'ng2-activiti-processlist': { main: './index.js', defaultExtension: 'js'}, - 'ng2-activiti-tasklist': { main: './index.js', defaultExtension: 'js'}, 'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-documentlist': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-login': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-search': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-tag': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-upload': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-viewer': { main: './index.js', defaultExtension: 'js'}, - 'ng2-alfresco-webscript': { main: './index.js', defaultExtension: 'js'} + 'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'} }; var config = { diff --git a/ng2-components/ng2-activiti-tasklist/karma.conf.js b/ng2-components/ng2-activiti-tasklist/karma.conf.js index 2aa3ff5612..efb8a75940 100644 --- a/ng2-components/ng2-activiti-tasklist/karma.conf.js +++ b/ng2-components/ng2-activiti-tasklist/karma.conf.js @@ -24,8 +24,8 @@ module.exports = function (config) { 'node_modules/zone.js/dist/fake-async-test.js', // RxJs - { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, - { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false }, + {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false}, // Paths loaded via module imports: // Angular itself @@ -39,23 +39,12 @@ module.exports = function (config) { 'karma-test-shim.js', // paths loaded via module imports - {pattern: 'dist/**/*.js', included: false, watched: true}, - {pattern: 'dist/**/*.html', included: true, served: true, watched: true}, - {pattern: 'dist/**/*.css', included: true, served: true, watched: true}, + {pattern: 'dist/**/*.*', included: false, watched: true}, // ng2-components - { pattern: 'node_modules/ng2-activiti-form/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-activiti-processlist/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-activiti-tasklist/dist/**/*.js', included: false, served: true, 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-documentlist/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-login/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-search/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-tag/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-upload/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-viewer/dist/**/*.js', included: false, served: true, watched: false }, - { pattern: 'node_modules/ng2-alfresco-webscript/dist/**/*.js', included: false, served: true, watched: false }, + {pattern: 'node_modules/ng2-activiti-form/dist/**/*.*', included: false, served: true, watched: false}, + {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.*', included: false, served: true, watched: false}, + {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.*', included: false, served: true, watched: false}, // paths to support debugging with source maps in dev tools {pattern: 'src/**/*.ts', included: false, watched: false}, @@ -107,7 +96,7 @@ module.exports = function (config) { // Source files that you wanna generate coverage for. // Do not include tests or libraries (these files will be instrumented by Istanbul) preprocessors: { - // 'dist/**/!(*spec).js': ['coverage'] + 'dist/**/!(*spec).js': ['coverage'] }, coverageReporter: { diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index bb2874af27..57306a3dec 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -57,17 +57,17 @@ "@angular/platform-browser-dynamic": "2.0.0", "@angular/router": "3.0.0", "@angular/upgrade": "2.0.0", + "@types/node": "^6.0.42", + "alfresco-js-api": "^0.3.0", "core-js": "^2.4.1", + "ng2-activiti-form": "0.3.3", + "ng2-alfresco-core": "0.3.2", + "ng2-alfresco-datatable": "0.3.2", + "ng2-translate": "2.5.0", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.12", "systemjs": "0.19.27", - "zone.js": "^0.6.23", - - "ng2-translate": "2.5.0", - "ng2-alfresco-core": "0.3.2", - "ng2-alfresco-datatable": "0.3.2", - "ng2-activiti-form": "0.3.3", - "alfresco-js-api": "^0.3.0" + "zone.js": "^0.6.23" }, "devDependencies": { "@types/core-js": "^0.9.32", diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts index d0df9379f4..d250f453c0 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-apps.component.ts @@ -24,11 +24,10 @@ import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-apps', - moduleId: __moduleName, + moduleId: module.id, templateUrl: 'activiti-apps.component.html', styleUrls: ['./activiti-apps.component.css', './activiti-apps-grid.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts index f8b10620c5..46987e8ac3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-checklist.component.ts @@ -23,11 +23,10 @@ import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-checklist', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-checklist.component.html', styleUrls: ['./activiti-checklist.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts index 2cbadd2b0c..4d5ee36750 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-comments.component.ts @@ -23,11 +23,10 @@ import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-comments', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-comments.component.html', styleUrls: ['./activiti-comments.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 9355ee363d..e11c569582 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -23,11 +23,10 @@ import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-filters', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-filters.component.html', styleUrls: ['activiti-filters.component.css'], providers: [ActivitiTaskListService] diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index f5e90b1646..f444cc8167 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -22,11 +22,10 @@ import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-people', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-people.component.html', styleUrls: ['./activiti-people.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts index d5af543e2b..3f77d032fe 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-start-task.component.ts @@ -21,11 +21,10 @@ import { TaskDetailsModel } from '../models/task-details.model'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-start-task', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-start-task.component.html', styleUrls: ['./activiti-start-task.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 0273901958..f2e2f5fb1b 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -25,11 +25,10 @@ import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-task-details', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-task-details.component.html', styleUrls: ['./activiti-task-details.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index 043725d4b3..19b1dcb95d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -20,11 +20,10 @@ import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-a import { TaskDetailsModel } from '../models/task-details.model'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-task-header', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-task-header.component.html', styleUrls: ['./activiti-task-header.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts index e1b391ebe6..7d10397c07 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts @@ -22,11 +22,10 @@ import { ActivitiTaskListService } from './../services/activiti-tasklist.service import { UserTaskFilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; declare let componentHandler: any; -declare let __moduleName: string; @Component({ selector: 'activiti-tasklist', - moduleId: __moduleName, + moduleId: module.id, templateUrl: './activiti-tasklist.component.html', styleUrls: ['./activiti-tasklist.component.css'] }) diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts index c71825153e..eeb28d4d6f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts @@ -15,10 +15,13 @@ * limitations under the License. */ -/* -import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; +import { ReflectiveInjector } from '@angular/core'; +import { + AlfrescoAuthenticationService, + AlfrescoSettingsService, + AlfrescoApiService +} from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './activiti-tasklist.service'; -import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { UserTaskFilterRepresentationModel, AppDefinitionRepresentationModel } from '../models/filter.model'; import { Comment } from '../models/comment.model'; @@ -27,8 +30,6 @@ declare let AlfrescoApi: any; declare let jasmine: any; describe('ActivitiTaskListService', () => { - let service: any; - let fakeEmptyFilters = { size: 0, total: 0, start: 0, data: [ ] @@ -129,19 +130,21 @@ describe('ActivitiTaskListService', () => { resolve(fakeAppFilter); }); - beforeEachProviders(() => { - return [ + let service, injector; + + beforeEach(() => { + injector = ReflectiveInjector.resolveAndCreate([ ActivitiTaskListService, AlfrescoSettingsService, AlfrescoApiService, AlfrescoAuthenticationService - ]; + ]); }); - beforeEach(inject([ActivitiTaskListService], (activitiTaskListService: ActivitiTaskListService) => { + beforeEach(() => { + service = injector.get(ActivitiTaskListService); jasmine.Ajax.install(); - service = activitiTaskListService; - })); + }); afterEach(() => { jasmine.Ajax.uninstall(); @@ -512,4 +515,4 @@ describe('ActivitiTaskListService', () => { }); }); -*/ + diff --git a/ng2-components/ng2-activiti-tasklist/tsconfig.json b/ng2-components/ng2-activiti-tasklist/tsconfig.json index b1effea355..7be35bfec8 100644 --- a/ng2-components/ng2-activiti-tasklist/tsconfig.json +++ b/ng2-components/ng2-activiti-tasklist/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es5", - "module": "system", + "module": "commonjs", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, @@ -16,7 +16,7 @@ "noImplicitUseStrict": false, "noFallthroughCasesInSwitch": true, "outDir": "dist", - "types": ["core-js", "jasmine"] + "types": ["core-js", "jasmine", "node"] }, "exclude": [ "demo",