From dc514fd92b0047e1d2296f5a9541580272a1aba2 Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Thu, 16 Nov 2017 10:15:38 +0100
Subject: [PATCH 1/3] Fix jest config for Windows

---
 meta.js                         |  1 +
 template/package.json           |  3 ++-
 template/test/unit/jest.conf.js | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 template/test/unit/jest.conf.js

diff --git a/meta.js b/meta.js
index 6f7b0f80d8..7623234117 100644
--- a/meta.js
+++ b/meta.js
@@ -107,6 +107,7 @@ module.exports = {
     "config/test.env.js": "unit || e2e",
     "test/unit/**/*": "unit",
     "test/unit/index.js": "unit && runner === 'karma'",
+    "test/unit/jest.conf.js": "unit && runner === 'jest'",
     "test/unit/karma.conf.js": "unit && runner === 'karma'",
     "test/unit/specs/index.js": "unit && runner === 'karma'",
     "test/unit/setup.js": "unit && runner === 'jest'",
diff --git a/template/package.json b/template/package.json
index c91e06c239..0ff7e565ed 100644
--- a/template/package.json
+++ b/template/package.json
@@ -8,7 +8,7 @@
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     {{#if_eq runner "jest"}}
-    "unit": "jest test/unit/specs --coverage",
+    "unit": "jest --config test/unit/jest.conf.js --coverage",
     {{/if_eq}}
     {{#if_eq runner "karma"}}
     "unit": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
@@ -68,6 +68,7 @@
     {{#if_eq runner "jest"}}
     "babel-jest": "^21.0.2",
     "jest": "^21.2.0",
+    "jest-serializer-vue": "^0.3.0",
     "vue-jest": "^1.0.2",
     {{/if_eq}}
     {{#if_eq runner "karma"}}
diff --git a/template/test/unit/jest.conf.js b/template/test/unit/jest.conf.js
new file mode 100644
index 0000000000..2e148edbe0
--- /dev/null
+++ b/template/test/unit/jest.conf.js
@@ -0,0 +1,29 @@
+const path = require('path')
+
+module.exports = {
+  rootDir: path.resolve(__dirname, '../../'),
+  moduleFileExtensions: [
+    'js',
+    'json',
+    'vue'
+  ],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1'
+  },
+  transform: {
+    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
+    '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
+  },
+  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+  setupFiles: ['<rootDir>/test/unit/setup'],
+  mapCoverage: true,
+  coverageDirectory: '<rootDir>/test/unit/coverage',
+  collectCoverageFrom: [
+    'src/**/*.{js,vue}',
+    '!src/main.js',
+    '{{#router}}
+    "!src/router/index.js",
+    {{/router}}
+    '!**/node_modules/**'
+  ]
+}

From 0a9e5e465fd189e5bf437cbed3b7dc655c3ae58c Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Thu, 16 Nov 2017 10:19:54 +0100
Subject: [PATCH 2/3] Fix jest config file

---
 template/test/unit/jest.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/test/unit/jest.conf.js b/template/test/unit/jest.conf.js
index 2e148edbe0..f591d90240 100644
--- a/template/test/unit/jest.conf.js
+++ b/template/test/unit/jest.conf.js
@@ -21,8 +21,8 @@ module.exports = {
   collectCoverageFrom: [
     'src/**/*.{js,vue}',
     '!src/main.js',
-    '{{#router}}
-    "!src/router/index.js",
+    {{#router}}
+    '!src/router/index.js',
     {{/router}}
     '!**/node_modules/**'
   ]

From 088064f046ec2946f948799cb4119ae3bbfb7c4a Mon Sep 17 00:00:00 2001
From: Guillaume Chau <guillaume.b.chau@gmail.com>
Date: Thu, 16 Nov 2017 13:22:10 +0100
Subject: [PATCH 3/3] Removed unused Jest config

---
 template/package.json | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/template/package.json b/template/package.json
index 0ff7e565ed..7eb3d49163 100644
--- a/template/package.json
+++ b/template/package.json
@@ -113,33 +113,6 @@
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0"
   },
-  {{#if_eq runner "jest"}}
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "vue"
-    ],
-    "moduleNameMapper": {
-      "^@/(.*)$": "<rootDir>/src/$1"
-    },
-    "transform": {
-      "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-      ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
-    },
-    "setupFiles": ["<rootDir>/test/unit/setup"],
-    "mapCoverage": true,
-    "coverageDirectory": "<rootDir>/test/unit/coverage",
-    "collectCoverageFrom" : [
-      "src/**/*.{js,vue}",
-      "!src/main.js",
-      {{#router}}
-      "!src/router/index.js",
-      {{/router}}
-      "!**/node_modules/**"
-    ]
-  },
-  {{/if_eq}}
   "engines": {
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"