Merge pull request #857 from Alfresco/dev-eromano-ProcessListFIx

fix test and coverage Angular2 Final release processlist component #749

ng2-components/ng2-activiti-processlist/karma-test-shim.js

@@ -54,18 +54,9 @@ var map = {
     'ng2-translate': 'npm:ng2-translate',
 
     '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-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'
 };
 
 var packages = {
@@ -74,18 +65,9 @@ var packages = {
     'ng2-translate': { defaultExtension: 'js' },
 
     '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-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'}
 };
 
 var config = {

ng2-components/ng2-activiti-processlist/karma.conf.js

@@ -44,18 +44,9 @@ module.exports = function (config) {
       {pattern: 'dist/**/*.css', included: true, served: true, watched: true},
 
       // ng2-components
-      { pattern: 'node_modules/ng2-activiti-form/dist/**/*.js', included: false, served: true, watched: false },
+      { pattern: 'node_modules/ng2-alfresco-core/dist/**/*.*', included: false, served: true, watched: false },
-      { pattern: 'node_modules/ng2-activiti-processlist/dist/**/*.js', included: false, served: true, watched: false },
+      { pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.*', 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 },
 
       // paths to support debugging with source maps in dev tools
       {pattern: 'src/**/*.ts', included: false, watched: false},
@@ -107,10 +98,11 @@ 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|index|*mock|*model).js': 'coverage'
     },
 
     coverageReporter: {
+      includeAllSources: true,
       dir: 'coverage/',
       subdir: 'report',
       reporters: [

ng2-components/ng2-activiti-processlist/package.json

@@ -53,17 +53,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-tasklist": "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",
+    "zone.js": "^0.6.23"
-
-    "ng2-translate": "2.5.0",
-    "alfresco-js-api": "^0.3.0",
-    "ng2-alfresco-core": "0.3.2",
-    "ng2-alfresco-datatable": "0.3.2",
-    "ng2-activiti-tasklist": "0.3.3"
   },
   "devDependencies": {
     "@types/core-js": "^0.9.32",

ng2-components/ng2-activiti-processlist/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-process-instance-comments',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-comments.component.html',
     styleUrls: ['./activiti-comments.component.css'],
     providers: [ActivitiProcessService]

ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts

@@ -22,11 +22,10 @@ import { FilterRepresentationModel } from '../models/filter.model';
 import { Observable, Observer } from 'rxjs/Rx';
 
 declare let componentHandler: any;
-declare let __moduleName: string;
 
 @Component({
     selector: 'activiti-process-instance-filters',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-filters.component.html',
     styleUrls: ['activiti-filters.component.css']
 })

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts

@@ -23,13 +23,11 @@ import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.
 import { ActivitiComments } from './activiti-comments.component';
 import { ProcessInstance } from '../models/process-instance';
 
-
 declare let componentHandler: any;
-declare let __moduleName: string;
 
 @Component({
     selector: 'activiti-process-instance-details',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-process-instance-details.component.html',
     styleUrls: ['./activiti-process-instance-details.component.css']
 })

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts

@@ -21,11 +21,10 @@ import { ProcessInstance } from '../models/process-instance';
 import { ActivitiProcessService } from './../services/activiti-process.service';
 
 declare let componentHandler: any;
-declare let __moduleName: string;
 
 @Component({
     selector: 'activiti-process-instance-header',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-process-instance-header.component.html',
     styleUrls: ['./activiti-process-instance-header.component.css']
 })

ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts

@@ -22,11 +22,10 @@ import { TaskDetailsModel } from '../models/task-details.model';
 import { Observable, Observer } from 'rxjs/Rx';
 
 declare let componentHandler: any;
-declare let __moduleName: string;
 
 @Component({
     selector: 'activiti-process-instance-tasks',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-process-instance-tasks.component.html',
     styleUrls: ['./activiti-process-instance-tasks.component.css']
 })

ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts

@@ -21,10 +21,8 @@ import { ObjectDataTableAdapter, DataRowEvent, DataTableAdapter, ObjectDataRow }
 import { ActivitiProcessService } from '../services/activiti-process.service';
 import { UserProcessInstanceFilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
 
-declare let __moduleName: string;
-
 @Component({
-    moduleId: __moduleName,
+    moduleId: module.id,
     selector: 'activiti-process-instance-list',
     styles: [
       `

ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts

@@ -20,11 +20,10 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ActivitiProcessService } from './../services/activiti-process.service';
 
 declare let componentHandler: any;
-declare let __moduleName: string;
 
 @Component({
     selector: 'activiti-start-process-instance',
-    moduleId: __moduleName,
+    moduleId: module.id,
     templateUrl: './activiti-start-process.component.html',
     styleUrls: ['./activiti-start-process.component.css']
 })

ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts

@@ -15,40 +15,35 @@
  * limitations under the License.
  */
 
-/*
+import { ReflectiveInjector } from '@angular/core';
-import { it, describe, expect, beforeEachProviders, beforeEach, inject } from '@angular/core/testing';
+import {
-import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
+    AlfrescoAuthenticationService,
+    AlfrescoSettingsService,
+    AlfrescoApiService
+} from 'ng2-alfresco-core';
 import { ActivitiProcessService } from './activiti-process.service';
-// import { ProcessInstance } from '../models/process-instance';
 
 describe('ActivitiProcessService', () => {
 
-    let processService;
+    let service, injector;
 
-    beforeEachProviders(() => {
+    beforeEach(() => {
-        return [
+        injector = ReflectiveInjector.resolveAndCreate([
             ActivitiProcessService,
             AlfrescoSettingsService,
             AlfrescoApiService,
             AlfrescoAuthenticationService
-        ];
+        ]);
     });
 
-    beforeEach(inject([ActivitiProcessService], (service: ActivitiProcessService) => {
+    beforeEach(() => {
-        processService = service;
+        service = injector.get(ActivitiProcessService);
-    }));
+    });
 
     it('should get process instances', (done) => {
 
         expect(true).toBe(true);
         done();
+    });
+});
 
-        // processService.getProcesses().subscribe((instances: ProcessInstance[]) => {
-        //     expect(instances.length).toBe(1);
-        //     expect(instances[0].id).toBe('myprocess:1');
-        //     expect(instances[0].name).toBe('my process');
-        //     done();
-        // });
-    });
-});
-*/

ng2-components/ng2-activiti-processlist/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",