From ea7e2b9c3923c83ae060b0a91f380f62ea99bca8 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Thu, 6 Oct 2016 12:11:59 +0100
Subject: [PATCH] Fix import moment js inside the component

---
 .../ng2-activiti-analytics/karma-test-shim.js | 28 ++++++++++---------
 .../ng2-activiti-analytics/karma.conf.js      |  1 +
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ng2-components/ng2-activiti-analytics/karma-test-shim.js b/ng2-components/ng2-activiti-analytics/karma-test-shim.js
index 4702804ae0..a9c385d263 100644
--- a/ng2-components/ng2-activiti-analytics/karma-test-shim.js
+++ b/ng2-components/ng2-activiti-analytics/karma-test-shim.js
@@ -53,6 +53,7 @@ var map = {
     'rxjs': 'npm:rxjs',
     'ng2-translate': 'npm:ng2-translate',
     'ng2-charts' : 'npm:ng2-charts',
+    'moment' : 'npm:moment/min/moment.min.js',
 
     'alfresco-js-api': 'npm:alfresco-js-api/dist',
     'ng2-alfresco-core': 'npm:ng2-alfresco-core/dist'
@@ -62,8 +63,9 @@ var packages = {
     'app': { main: 'main.js',  defaultExtension: 'js' },
     'rxjs': {  defaultExtension: 'js' },
     'ng2-translate': { defaultExtension: 'js' },
+    'ng2-charts': { defaultExtension: 'js' },
+    'moment': { defaultExtension: 'js' },
 
-    'ng2-charts' : '/base/node_modules/ng2-charts',
     'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'},
     'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'}
 };
@@ -82,17 +84,17 @@ System.import('@angular/core/testing')
 
 function initTestBed(){
     return Promise.all([
-            System.import('@angular/core/testing'),
-            System.import('@angular/platform-browser-dynamic/testing')
-        ])
-        .then(function (providers) {
-            var coreTesting    = providers[0];
-            var browserTesting = providers[1];
+        System.import('@angular/core/testing'),
+        System.import('@angular/platform-browser-dynamic/testing')
+    ])
+    .then(function (providers) {
+        var coreTesting    = providers[0];
+        var browserTesting = providers[1];
 
-            coreTesting.TestBed.initTestEnvironment(
-                browserTesting.BrowserDynamicTestingModule,
-                browserTesting.platformBrowserDynamicTesting());
-        })
+        coreTesting.TestBed.initTestEnvironment(
+            browserTesting.BrowserDynamicTestingModule,
+            browserTesting.platformBrowserDynamicTesting());
+    })
 }
 
 // Import all spec files and start karma
@@ -101,6 +103,6 @@ function initTesting () {
         allSpecFiles.map(function (moduleName) {
             return System.import(moduleName);
         })
-        )
-        .then(__karma__.start, __karma__.error);
+    )
+    .then(__karma__.start, __karma__.error);
 }
diff --git a/ng2-components/ng2-activiti-analytics/karma.conf.js b/ng2-components/ng2-activiti-analytics/karma.conf.js
index 1f5f12c324..5d4459ff78 100644
--- a/ng2-components/ng2-activiti-analytics/karma.conf.js
+++ b/ng2-components/ng2-activiti-analytics/karma.conf.js
@@ -45,6 +45,7 @@ module.exports = function (config) {
 
       { pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false },
       { pattern: 'node_modules/ng2-charts/**/*.js', included: false, served: true, watched: false },
+      { pattern: 'node_modules/moment/**/*.js', included: false, served: true, watched: false },
 
       // ng2-components
       {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.*', included: false, served: true, watched: false},