From 13820a0f9f41cafee31b567b98820c8e66ad534d Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 13 Jul 2016 09:03:36 +0100
Subject: [PATCH] Fix running tests via npm run test

Refs #344
---
 .../karma-test-shim.js                        | 22 +++++++++++++++++--
 .../ng2-activiti-processlist/karma.conf.js    | 15 +++++++------
 ...ng2-activiti-processlist.component.spec.ts |  7 +-----
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ng2-components/ng2-activiti-processlist/karma-test-shim.js b/ng2-components/ng2-activiti-processlist/karma-test-shim.js
index f69a25dfca..c0e325be6f 100644
--- a/ng2-components/ng2-activiti-processlist/karma-test-shim.js
+++ b/ng2-components/ng2-activiti-processlist/karma-test-shim.js
@@ -8,12 +8,16 @@ __karma__.loaded = function() {};
 var map = {
   'app': 'base/dist',
   'rxjs': 'base/node_modules/rxjs',
-  '@angular': 'base/node_modules/@angular'
+  '@angular': 'base/node_modules/@angular',
+  'ng2-alfresco-core': '/base/node_modules/ng2-alfresco-core/dist',
+  'ng2-translate' : '/base/node_modules/ng2-translate'
 };
 
 var packages = {
   'app': { main: 'main.js',  defaultExtension: 'js' },
-  'rxjs': { defaultExtension: 'js' }
+  'rxjs': { defaultExtension: 'js' },
+  'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+  'ng2-translate': { defaultExtension: 'js' }
 };
 
 var packageNames = [
@@ -48,6 +52,20 @@ System.config(config);
 
 System.import('@angular/platform-browser/src/browser/browser_adapter')
   .then(function(browser_adapter) { browser_adapter.BrowserDomAdapter.makeCurrent(); })
+  .then(function () {
+    return Promise.all([
+      System.import('@angular/core/testing'),
+      System.import('@angular/platform-browser-dynamic/testing')
+    ])
+  })
+  .then(function (providers) {
+    var testing = providers[0];
+    var testingBrowser = providers[1];
+
+    testing.setBaseTestProviders(
+      testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+      testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
+  })
   .then(function() { return Promise.all(resolveTestFiles()); })
   .then(
     function() {
diff --git a/ng2-components/ng2-activiti-processlist/karma.conf.js b/ng2-components/ng2-activiti-processlist/karma.conf.js
index 625d82b450..a7c2c2fe0a 100644
--- a/ng2-components/ng2-activiti-processlist/karma.conf.js
+++ b/ng2-components/ng2-activiti-processlist/karma.conf.js
@@ -9,14 +9,15 @@ module.exports = function (config) {
 
     files: [
       // paths loaded by Karma
-      {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
+      {pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true},
       {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false},
-      {pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: false},
-      {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: false},
-      {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: false},
-      {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: false},
-      {pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: false},
-      {pattern: 'node_modules/alfresco-core-rest-api/bundle.js', included: true, watched: false},
+      {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true},
+      {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
+      {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false},
+      {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-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 15ab619c34..0e8b8e50b8 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
@@ -15,16 +15,11 @@
  * limitations under the License.
  */
 
-import {describe, expect, it, inject, setBaseTestProviders} from '@angular/core/testing';
+import {describe, expect, it, inject} from '@angular/core/testing';
 import { TestComponentBuilder } from '@angular/compiler/testing';
-import {
-  TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-  TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
-} from '@angular/platform-browser-dynamic/testing';
 import {Ng2ActivitiProcesslistComponent} from '../../src/components/ng2-activiti-processlist.component';
 
 describe('Basic Example test ng2-activiti-processlist', () => {
-  setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
 
   it('Test hello world', inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
     return tcb