FIX fikset test:coverage

Author: PetterRuud

.eslintignore

@@ -1,2 +1 @@
-webpack.dev.js
-webpack.prod.js
+webpack/*

package.json

@@ -111,7 +111,7 @@
   "scripts": {
     "test": "mocha-webpack  --webpack-config webpack/webpack.test.js \"packages/**/*.spec.jsx\"",
     "test:watch": "mocha-webpack --watch --webpack-config webpack/webpack.test.watch.js \"packages/**/*.spec.jsx\"",
-    "test:coverage": "nyc mocha-webpack --webpack-config webpack/webpack.test.coverage.js  \"packages/*/**/*.jsx\"",
+    "test:coverage": "nyc mocha-webpack --webpack-config webpack/webpack.test.coverage.js  \"packages/fpsak/*/**/*.jsx\"",
     "dev": "cross-env NODE_ENV=development node webpack/webpack.dev.server.js --config webpack/webpack.dev.js",
     "build": "cross-env NODE_ENV=production webpack --progress --colors --config webpack/webpack.prod.js",
     "postinstall": "yarn run build && yarn test && yarn run less:lint",

packages/assets/testHelpers/setup.jsx

@@ -34,3 +34,6 @@ global.HTMLElement = dom.window.HTMLElement;
 global.requestAnimationFrame = (cb) => {
   setTimeout(cb, 0);
 };
+global.cancelAnimationFrame = (cb) => {
+  setTimeout(cb, 0);
+};

packages/shared-components/ErrorMessagePanel.jsx

@@ -125,19 +125,23 @@ export const getErrorMessageList = ownProps => createSelector(
   (errorMessages, errorMessageCodeWithParams, crashMessage, showDetailedErrorMessages, asyncErrorMessages) => {
     if (ownProps.queryStrings.errorcode) {
       return [{ message: ownProps.intl.formatMessage({ id: ownProps.queryStrings.errorcode }) }];
-    } if (ownProps.queryStrings.errormessage) {
+    }
+    if (ownProps.queryStrings.errormessage) {
       return [{ message: ownProps.queryStrings.errormessage }];
-    } if (crashMessage) {
+    }
+    if (crashMessage) {
       return [{ message: crashMessage }];
-    } if (errorMessageCodeWithParams) {
+    }
+    if (errorMessageCodeWithParams) {
       return [{
         message: ownProps.intl.formatMessage({ id: errorMessageCodeWithParams.code },
           filterMessage(errorMessageCodeWithParams.params, showDetailedErrorMessages)),
         additionalInfo: errorMessageCodeWithParams.params.errorDetails
           ? JSON.parse(decodeHtmlEntity(errorMessageCodeWithParams.params.errorDetails))
           : undefined,
       }];
-    } if (errorMessages) {
+    }
+    if (errorMessages) {
       return errorMessages.map(em => ({ message: em }));
     }
     return asyncErrorMessages.map(em => ({ message: em }));

packages/shared-components/Header.jsx

@@ -8,7 +8,6 @@ import logoUrl from '@fpsak-frontend/assets/images/nav.svg';
 import navAnsattIkonUrl from '@fpsak-frontend/assets/images/nav_ansatt.svg';
 import rettskildeneIkonUrl from '@fpsak-frontend/assets/images/rettskildene.svg';
 import systemrutineIkonUrl from '@fpsak-frontend/assets/images/rutine.svg';
-
 import Image from './Image';
 import ErrorMessagePanel from './ErrorMessagePanel';
 

webpack/webpack.test.coverage.js

@@ -1,12 +1,9 @@
-
-
 const HappyPack = require('happypack');
 const path = require('path');
 const merge = require('webpack-merge');
 const common = require('./webpack.common.js');
 
-const APP_DIR = path.resolve(__dirname, '../packages/fpsak');
-
+const PACAKGES_DIR = path.join(__dirname, '../packages');
 const config = {
   mode: 'development',
   devtool: 'eval',
@@ -15,8 +12,8 @@ const config = {
     rules: [{
 	  test: /\.jsx?$/,
 	  use: ['istanbul-instrumenter-loader', 'happypack/loader'],
-	  include: APP_DIR,
-	  exclude: /node_modules/,
+	  include: PACAKGES_DIR,
+	  exclude: /(node_modules|testHelpers)/,
     }, {
 	  test: /\.(less|css|jpg|png|svg)$/,
 	  loader: 'null-loader',

webpack/webpack.test.js

@@ -1,5 +1,3 @@
-
-
 const path = require('path');
 const merge = require('webpack-merge');
 const commonTest = require('./webpack.common.test.js');
@@ -20,12 +18,12 @@ const config = {
         cache: true,
 	  },
       include: [PACAKGES_DIR],
-	  exclude: ['/node_modules/'],
+	  exclude: ['/node_modules/, /assets/'],
     }, {
 	  test: /\.jsx?$/,
 	  use: ['happypack/loader'],
       include: [PACAKGES_DIR],
-	  exclude: ['/node_modules/'],
+	  exclude: ['/node_modules/, /assets/'],
     }],
   },
 };

webpack/webpack.test.watch.js

@@ -1,9 +1,6 @@
-
-
 const path = require('path');
 const merge = require('webpack-merge');
 const commonTest = require('./webpack.common.test.js');
-
 const PACAKGES_DIR = path.join(__dirname, '../packages');
 const config = {
   mode: 'development',
@@ -20,7 +17,7 @@ const config = {
         cache: true,
 	  },
       include: [PACAKGES_DIR],
-	  exclude: ['/node_modules/'],
+	  exclude: ['/node_modules/, /assets/'],
     }, {
 	  test: /\.jsx?$/,
 	  use: ['happypack/loader'],