From 1060b665340c552fea20f3d1586e9d211e6c7ec7 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Mon, 5 Jun 2017 02:37:12 +0100
Subject: [PATCH] move coverage separate file and get component to calculate
 coverage as input

---
 ng2-components/config/karma.conf-all.js   | 30 +++++++++++++++++------
 ng2-components/config/webpack.coverage.js | 26 ++++++++++++++++++++
 ng2-components/config/webpack.test.js     |  9 -------
 3 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 ng2-components/config/webpack.coverage.js

diff --git a/ng2-components/config/karma.conf-all.js b/ng2-components/config/karma.conf-all.js
index 643e699c1e..24321fc00a 100644
--- a/ng2-components/config/karma.conf-all.js
+++ b/ng2-components/config/karma.conf-all.js
@@ -1,3 +1,6 @@
+const webpackCoverage = require('./webpack.coverage');
+const helpers = require('./helpers');
+
 module.exports = function (config) {
     var _config = {
         basePath: '../ng2-components',
@@ -6,29 +9,42 @@ module.exports = function (config) {
 
         files: [
             {pattern: './node_modules/hammerjs/hammer.min.js', included: true, watched: false},
-            {pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css', included: true, watched: false},
+            {
+                pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
+                included: true,
+                watched: false
+            },
 
             //diagrams
             {pattern: './node_modules/chart.js/dist/Chart.js', included: true, watched: false},
             {pattern: './node_modules/alfresco-js-api/dist/alfresco-js-api.min.js', included: true, watched: false},
             {pattern: './node_modules/raphael/raphael.min.js', included: true, watched: false},
             {pattern: './node_modules/moment/min/moment.min.js', included: true, watched: false},
-            {pattern: './node_modules/md-date-time-picker/dist/js/mdDateTimePicker.min.js', included: true, watched: false},
+            {
+                pattern: './node_modules/md-date-time-picker/dist/js/mdDateTimePicker.min.js',
+                included: true,
+                watched: false
+            },
 
             {pattern: './node_modules/ng2-translate/ng2-translate.js', included: false, watched: false},
-            {pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js', included: false, served: true, watched: false},
+            {
+                pattern: './node_modules/ng2-charts/bundles/ng2-charts.umd.js',
+                included: false,
+                served: true,
+                watched: false
+            },
 
             // pdf-js
             {pattern: './node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false},
             {pattern: './node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false},
             {pattern: './node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false},
 
-            {pattern:  config.component +'/karma-test-shim.js', watched: false},
-            {pattern:  config.component +'/src/assets/**/*.*', included: false, served: true, watched: false},
-            {pattern:  config.component +'/src/**/*.ts', included: false, served: true, watched: false}
+            {pattern: config.component + '/karma-test-shim.js', watched: false},
+            {pattern: config.component + '/src/assets/**/*.*', included: false, served: true, watched: false},
+            {pattern: config.component + '/src/**/*.ts', included: false, served: true, watched: false}
         ],
 
-        webpack: require('./webpack.test'),
+        webpack: webpackCoverage(config),
 
         webpackMiddleware: {
             noInfo: true,
diff --git a/ng2-components/config/webpack.coverage.js b/ng2-components/config/webpack.coverage.js
new file mode 100644
index 0000000000..1cf1b782be
--- /dev/null
+++ b/ng2-components/config/webpack.coverage.js
@@ -0,0 +1,26 @@
+const webpack = require('webpack');
+const webpackMerge = require('webpack-merge');
+const testConfig = require('./webpack.test.js');
+const helpers = require('./helpers');
+
+module.exports = function (config) {
+    return webpackMerge(testConfig, {
+
+        devtool: 'inline-source-map',
+
+        module: {
+            rules: [
+                {
+                    enforce: 'post',
+                    test: /^(?!(.*spec|index|.*mock|.*model|.*event)).*\.ts?$/,
+                    loader: 'istanbul-instrumenter-loader',
+                    include: [helpers.root(config.component + '/src')],
+                    exclude: [
+                        /node_modules/,
+                        /test/
+                    ]
+                }
+            ]
+        }
+    });
+};
diff --git a/ng2-components/config/webpack.test.js b/ng2-components/config/webpack.test.js
index 3cd3569d0f..35ea65cfa0 100644
--- a/ng2-components/config/webpack.test.js
+++ b/ng2-components/config/webpack.test.js
@@ -8,15 +8,6 @@ module.exports = webpackMerge(commonConfig, {
 
     module: {
         rules: [
-            {
-                enforce: 'post',
-                test: /^(?!(.*spec|index|.*mock|.*model|.*event)).*\.ts?$/,
-                loader: 'istanbul-instrumenter-loader',
-                exclude: [
-                    /node_modules/,
-                    /test/
-                ]
-            },
             {
                 test: /\.(txt|pdf)$/,
                 loader: 'file-loader',