From 42a23f98d1bfca2bc4adf891ca7157b4a757a8bc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Mar 2018 11:26:41 +0330
Subject: [PATCH 01/55] add jest

---
 .eslintrc.js  |    7 +-
 package.json  |   15 +-
 test/.babelrc |    9 +
 yarn.lock     | 1636 +++++++++++++++++--------------------------------
 4 files changed, 567 insertions(+), 1100 deletions(-)
 create mode 100644 test/.babelrc

diff --git a/.eslintrc.js b/.eslintrc.js
index 861dfbbdd1..e1b3df62e8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -6,7 +6,8 @@ module.exports = {
   },
   env: {
     browser: true,
-    node: true
+    node: true,
+    'jest/globals': true
   },
   extends: [
     'standard',
@@ -14,9 +15,9 @@ module.exports = {
     'plugin:import/errors',
     'plugin:import/warnings'
   ],
-  // required to lint *.vue files
   plugins: [
-    'html'
+    'html',
+    'jest'
   ],
   settings: {
     'import/resolver': {
diff --git a/package.json b/package.json
index e7cd1d6bae..21924ed4dc 100644
--- a/package.json
+++ b/package.json
@@ -40,13 +40,13 @@
   "bin": {
     "nuxt": "./bin/nuxt"
   },
-  "nyc": {
-    "include": [
-      "lib"
-    ]
+  "jest": {
+    "testEnvironment": "node",
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": false
   },
   "scripts": {
-    "test": "npm run lint && nyc ava --fail-fast -v -T 60000 test/ -- && nyc report --reporter=html",
+    "test": "npm run lint && jest",
     "test-appveyor": "yarn test",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
@@ -120,23 +120,22 @@
     "webpack-stylish": "^0.1.6"
   },
   "devDependencies": {
-    "ava": "^0.25.0",
     "babel-eslint": "^8.2.1",
-    "babel-plugin-istanbul": "^4.1.5",
     "codecov": "^3.0.0",
     "eslint": "^4.18.2",
     "eslint-config-standard": "^11.0.0",
     "eslint-config-standard-jsx": "^5.0.0",
     "eslint-plugin-html": "^4.0.2",
     "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-jest": "^21.15.0",
     "eslint-plugin-node": "^6.0.0",
     "eslint-plugin-promise": "^3.7.0",
     "eslint-plugin-react": "^7.6.1",
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.16.2",
     "finalhandler": "^1.1.1",
+    "jest": "^22.4.2",
     "jsdom": "^11.6.2",
-    "nyc": "^11.6.0",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
diff --git a/test/.babelrc b/test/.babelrc
new file mode 100644
index 0000000000..3490fcb3f7
--- /dev/null
+++ b/test/.babelrc
@@ -0,0 +1,9 @@
+{
+  "env": {
+    "test": {
+      "presets": [
+        "env"
+      ]
+    }
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 9c5a322e69..6f9269b11f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,48 +2,18 @@
 # yarn lockfile v1
 
 
-"@ava/babel-plugin-throws-helper@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
-
-"@ava/babel-preset-stage-4@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz#ae60be881a0babf7d35f52aba770d1f6194f76bd"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.8.0"
-    babel-plugin-syntax-trailing-function-commas "^6.20.0"
-    babel-plugin-transform-async-to-generator "^6.16.0"
-    babel-plugin-transform-es2015-destructuring "^6.19.0"
-    babel-plugin-transform-es2015-function-name "^6.9.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.18.0"
-    babel-plugin-transform-es2015-parameters "^6.21.0"
-    babel-plugin-transform-es2015-spread "^6.8.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.8.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.11.0"
-    babel-plugin-transform-exponentiation-operator "^6.8.0"
-    package-hash "^1.2.0"
-
-"@ava/babel-preset-transform-test-files@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@ava/babel-preset-transform-test-files/-/babel-preset-transform-test-files-3.0.0.tgz#cded1196a8d8d9381a509240ab92e91a5ec069f7"
-  dependencies:
-    "@ava/babel-plugin-throws-helper" "^2.0.0"
-    babel-plugin-espower "^2.3.2"
-
-"@ava/write-file-atomic@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ava/write-file-atomic/-/write-file-atomic-2.2.0.tgz#d625046f3495f1f5e372135f473909684b429247"
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
 "@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.40":
   version "7.0.0-beta.40"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
   dependencies:
     "@babel/highlight" "7.0.0-beta.40"
 
+"@babel/code-frame@^7.0.0-beta.35":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.42.tgz#a9c83233fa7cd06b39dc77adbb908616ff4f1962"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.42"
+
 "@babel/generator@7.0.0-beta.40":
   version "7.0.0-beta.40"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.40.tgz#ab61f9556f4f71dbd1138949c795bb9a21e302ea"
@@ -76,6 +46,14 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-beta.42":
+  version "7.0.0-beta.42"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.42.tgz#a502a1c0d6f99b2b0e81d468a1b0c0e81e3f3623"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
 "@babel/template@7.0.0-beta.40":
   version "7.0.0-beta.40"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.40.tgz#034988c6424eb5c3268fe6a608626de1f4410fc8"
@@ -107,21 +85,6 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@concordance/react@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@concordance/react/-/react-1.0.0.tgz#fcf3cad020e5121bfd1c61d05bc3516aac25f734"
-  dependencies:
-    arrify "^1.0.1"
-
-"@ladjs/time-require@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@ladjs/time-require/-/time-require-0.1.4.tgz#5c615d75fd647ddd5de9cf6922649558856b21a1"
-  dependencies:
-    chalk "^0.4.0"
-    date-time "^0.1.1"
-    pretty-ms "^0.2.1"
-    text-table "^0.2.0"
-
 "@nuxtjs/friendly-errors-webpack-plugin@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@nuxtjs/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.0.0.tgz#70fb321c78362e2b4bce1d522ecdf7f87a4dacec"
@@ -240,12 +203,6 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  dependencies:
-    string-width "^2.0.0"
-
 ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -270,23 +227,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -304,10 +250,6 @@ aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-
 are-we-there-yet@~1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
@@ -335,10 +277,6 @@ arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
 
-arr-exclude@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/arr-exclude/-/arr-exclude-1.0.0.tgz#dfc7c2e552a270723ccda04cf3128c8cbfe5c631"
-
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
@@ -347,10 +285,6 @@ arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -388,7 +322,7 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
@@ -438,6 +372,10 @@ assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -450,7 +388,7 @@ async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.4.1:
+async@^2.1.4, async@^2.4.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -464,10 +402,6 @@ atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-auto-bind@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-1.2.0.tgz#8b7e318aad53d43ba8a8ecaf0066d85d5f798cd6"
-
 autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
@@ -501,104 +435,6 @@ autoprefixer@^8.1.0:
     postcss "^6.0.19"
     postcss-value-parser "^3.2.3"
 
-ava-init@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.1.tgz#75ac4c8553326290d2866e63b62fa7035684bd58"
-  dependencies:
-    arr-exclude "^1.0.0"
-    execa "^0.7.0"
-    has-yarn "^1.0.0"
-    read-pkg-up "^2.0.0"
-    write-pkg "^3.1.0"
-
-ava@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/ava/-/ava-0.25.0.tgz#8ac87780514f96a6fd42e1306eaa0752ce3a407f"
-  dependencies:
-    "@ava/babel-preset-stage-4" "^1.1.0"
-    "@ava/babel-preset-transform-test-files" "^3.0.0"
-    "@ava/write-file-atomic" "^2.2.0"
-    "@concordance/react" "^1.0.0"
-    "@ladjs/time-require" "^0.1.4"
-    ansi-escapes "^3.0.0"
-    ansi-styles "^3.1.0"
-    arr-flatten "^1.0.1"
-    array-union "^1.0.1"
-    array-uniq "^1.0.2"
-    arrify "^1.0.0"
-    auto-bind "^1.1.0"
-    ava-init "^0.2.0"
-    babel-core "^6.17.0"
-    babel-generator "^6.26.0"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-    bluebird "^3.0.0"
-    caching-transform "^1.0.0"
-    chalk "^2.0.1"
-    chokidar "^1.4.2"
-    clean-stack "^1.1.1"
-    clean-yaml-object "^0.1.0"
-    cli-cursor "^2.1.0"
-    cli-spinners "^1.0.0"
-    cli-truncate "^1.0.0"
-    co-with-promise "^4.6.0"
-    code-excerpt "^2.1.1"
-    common-path-prefix "^1.0.0"
-    concordance "^3.0.0"
-    convert-source-map "^1.5.1"
-    core-assert "^0.2.0"
-    currently-unhandled "^0.4.1"
-    debug "^3.0.1"
-    dot-prop "^4.1.0"
-    empower-core "^0.6.1"
-    equal-length "^1.0.0"
-    figures "^2.0.0"
-    find-cache-dir "^1.0.0"
-    fn-name "^2.0.0"
-    get-port "^3.0.0"
-    globby "^6.0.0"
-    has-flag "^2.0.0"
-    hullabaloo-config-manager "^1.1.0"
-    ignore-by-default "^1.0.0"
-    import-local "^0.1.1"
-    indent-string "^3.0.0"
-    is-ci "^1.0.7"
-    is-generator-fn "^1.0.0"
-    is-obj "^1.0.0"
-    is-observable "^1.0.0"
-    is-promise "^2.1.0"
-    last-line-stream "^1.0.0"
-    lodash.clonedeepwith "^4.5.0"
-    lodash.debounce "^4.0.3"
-    lodash.difference "^4.3.0"
-    lodash.flatten "^4.2.0"
-    loud-rejection "^1.2.0"
-    make-dir "^1.0.0"
-    matcher "^1.0.0"
-    md5-hex "^2.0.0"
-    meow "^3.7.0"
-    ms "^2.0.0"
-    multimatch "^2.1.0"
-    observable-to-promise "^0.5.0"
-    option-chain "^1.0.0"
-    package-hash "^2.0.0"
-    pkg-conf "^2.0.0"
-    plur "^2.0.0"
-    pretty-ms "^3.0.0"
-    require-precompiled "^0.1.0"
-    resolve-cwd "^2.0.0"
-    safe-buffer "^5.1.1"
-    semver "^5.4.1"
-    slash "^1.0.0"
-    source-map-support "^0.5.0"
-    stack-utils "^1.0.1"
-    strip-ansi "^4.0.0"
-    strip-bom-buf "^1.0.0"
-    supertap "^1.0.0"
-    supports-color "^5.0.0"
-    trim-off-newlines "^1.0.1"
-    unique-temp-dir "^1.0.0"
-    update-notifier "^2.3.0"
-
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -619,7 +455,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.17.0, babel-core@^6.26.0:
+babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
@@ -654,7 +490,7 @@ babel-eslint@^8.2.1:
     eslint-scope "~3.7.1"
     eslint-visitor-keys "^1.0.0"
 
-babel-generator@^6.1.0, babel-generator@^6.18.0, babel-generator@^6.26.0:
+babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
@@ -772,6 +608,13 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-jest@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.1.tgz#ff53ebca45957347f27ff4666a31499fbb4c4ddd"
+  dependencies:
+    babel-plugin-istanbul "^4.1.5"
+    babel-preset-jest "^22.4.1"
+
 babel-loader@^7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
@@ -786,24 +629,12 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants@^6.8.0:
+babel-plugin-check-es2015-constants@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-espower@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz#9f92c080e9adfe73f69baed7ab3e24f649009373"
-  dependencies:
-    babel-generator "^6.1.0"
-    babylon "^6.1.0"
-    call-matcher "^1.0.0"
-    core-js "^2.0.0"
-    espower-location-detector "^1.0.0"
-    espurify "^1.6.0"
-    estraverse "^4.1.1"
-
 babel-plugin-istanbul@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
@@ -812,6 +643,10 @@ babel-plugin-istanbul@^4.1.5:
     istanbul-lib-instrument "^1.7.5"
     test-exclude "^4.1.1"
 
+babel-plugin-jest-hoist@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.1.tgz#d712fe5da8b6965f3191dacddbefdbdf4fb66d63"
+
 babel-plugin-jsx-event-modifiers@^2.0.2:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz#93e6ebb5d7553bb08f9fedbf7a0bee3af09a0472"
@@ -844,11 +679,11 @@ babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
 
-babel-plugin-syntax-trailing-function-commas@^6.20.0, babel-plugin-syntax-trailing-function-commas@^6.22.0:
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
-babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.22.0:
+babel-plugin-transform-async-to-generator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
   dependencies:
@@ -899,7 +734,7 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.19.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
+babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
@@ -918,7 +753,7 @@ babel-plugin-transform-es2015-for-of@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.9.0:
+babel-plugin-transform-es2015-function-name@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   dependencies:
@@ -940,7 +775,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
@@ -972,7 +807,7 @@ babel-plugin-transform-es2015-object-super@^6.22.0:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.21.0, babel-plugin-transform-es2015-parameters@^6.23.0:
+babel-plugin-transform-es2015-parameters@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
@@ -990,13 +825,13 @@ babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.8.0:
+babel-plugin-transform-es2015-spread@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.8.0:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   dependencies:
@@ -1016,7 +851,7 @@ babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   dependencies:
@@ -1024,7 +859,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es20
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.8.0:
+babel-plugin-transform-exponentiation-operator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
   dependencies:
@@ -1107,6 +942,13 @@ babel-preset-env@^1.6.0:
     invariant "^2.2.2"
     semver "^5.3.0"
 
+babel-preset-jest@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.1.tgz#efa2e5f5334242a9457a068452d7d09735db172a"
+  dependencies:
+    babel-plugin-jest-hoist "^22.4.1"
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+
 babel-preset-vue-app@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/babel-preset-vue-app/-/babel-preset-vue-app-2.0.0.tgz#3849f42986dc6597f3c8aa21cc0bdfcc5fda4aa6"
@@ -1184,7 +1026,7 @@ babylon@7.0.0-beta.40, babylon@^7.0.0-beta.40:
   version "7.0.0-beta.40"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a"
 
-babylon@^6.1.0, babylon@^6.18.0:
+babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1244,7 +1086,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.5.1:
+bluebird@^3.1.1, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1289,18 +1131,6 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
-boxen@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1341,6 +1171,12 @@ browser-process-hrtime@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
 
+browser-resolve@^1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
@@ -1414,9 +1250,11 @@ browserslist@^3.1.1:
     caniuse-lite "^1.0.30000813"
     electron-to-chromium "^1.3.36"
 
-buf-compare@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  dependencies:
+    node-int64 "^0.4.0"
 
 buffer-xor@^1.0.3:
   version "1.0.3"
@@ -1474,27 +1312,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-caching-transform@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
-  dependencies:
-    md5-hex "^1.2.0"
-    mkdirp "^0.5.1"
-    write-file-atomic "^1.1.4"
-
-call-matcher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
-  dependencies:
-    core-js "^2.0.0"
-    deep-equal "^1.0.0"
-    espurify "^1.6.0"
-    estraverse "^4.0.0"
-
-call-signature@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/call-signature/-/call-signature-0.0.2.tgz#a84abc825a55ef4cb2b028bd74e205a65b9a4996"
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1505,6 +1322,10 @@ callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -1512,22 +1333,11 @@ camel-case@3.0.x:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
@@ -1557,10 +1367,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, can
   version "1.0.30000814"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000814.tgz#73eb6925ac2e54d495218f1ea0007da3940e488b"
 
-capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1582,14 +1388,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
@@ -1606,21 +1404,6 @@ check-types@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
 
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
 chokidar@^2.0.1, chokidar@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
@@ -1683,35 +1466,16 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
-clean-stack@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
-
-clean-yaml-object@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
-
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^1.0.0, cli-spinners@^1.1.0:
+cli-spinners@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
 
-cli-truncate@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
-  dependencies:
-    slice-ansi "^1.0.0"
-    string-width "^2.0.0"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1736,12 +1500,6 @@ clone@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
 
-co-with-promise@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co-with-promise/-/co-with-promise-4.6.0.tgz#413e7db6f5893a60b942cf492c4bec93db415ab7"
-  dependencies:
-    pinkie-promise "^1.0.0"
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -1752,12 +1510,6 @@ coa@~1.0.1:
   dependencies:
     q "^1.1.2"
 
-code-excerpt@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/code-excerpt/-/code-excerpt-2.1.1.tgz#5fe3057bfbb71a5f300f659ef2cc0a47651ba77c"
-  dependencies:
-    convert-to-spaces "^1.0.1"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1852,14 +1604,14 @@ commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
-common-path-prefix@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-1.0.0.tgz#cd52f6f0712e0baab97d6f9732874f22f47752c0"
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
+compare-versions@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1902,33 +1654,6 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concordance@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/concordance/-/concordance-3.0.0.tgz#b2286af54405fc995fc7345b0b106d8dd073cb29"
-  dependencies:
-    date-time "^2.1.0"
-    esutils "^2.0.2"
-    fast-diff "^1.1.1"
-    function-name-support "^0.2.0"
-    js-string-escape "^1.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.flattendeep "^4.4.0"
-    lodash.merge "^4.6.0"
-    md5-hex "^2.0.0"
-    semver "^5.3.0"
-    well-known-symbols "^1.0.0"
-
-configstore@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
 connect@^3.6.5:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
@@ -1974,14 +1699,10 @@ content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
-convert-to-spaces@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz#7e3e48bbe6d997b1417ddca2868204b4d3d85715"
-
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -2005,18 +1726,11 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-core-assert@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
-  dependencies:
-    buf-compare "^1.0.0"
-    is-error "^2.2.0"
-
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
@@ -2043,12 +1757,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
@@ -2069,13 +1777,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^4:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2112,10 +1813,6 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-
 css-color-function@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e"
@@ -2263,24 +1960,10 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-date-time@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/date-time/-/date-time-0.1.1.tgz#ed2f6d93d9790ce2fd66d5b5ff3edd5bbcbf3b07"
-
-date-time@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
-  dependencies:
-    time-zone "^1.0.0"
-
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
-debug-log@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2301,10 +1984,6 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
-deep-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -2404,15 +2083,15 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-diff@^3.1.0:
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+
+diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
@@ -2500,16 +2179,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  dependencies:
-    is-obj "^1.0.0"
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -2557,13 +2226,6 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-empower-core@^0.6.1:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/empower-core/-/empower-core-0.6.2.tgz#5adef566088e31fba80ba0a36df47d7094169144"
-  dependencies:
-    call-signature "0.0.2"
-    core-js "^2.0.0"
-
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -2601,17 +2263,13 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-equal-length@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
-
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -2641,10 +2299,6 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es6-error@^4.0.1, es6-error@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-
 es6-promise@^4.0.3, es6-promise@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -2659,7 +2313,7 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -2717,6 +2371,10 @@ eslint-plugin-import@^2.8.0:
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
 
+eslint-plugin-jest@^21.15.0:
+  version "21.15.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.15.0.tgz#645a3f560d3e61d99611b215adc80b4f31e6d896"
+
 eslint-plugin-node@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
@@ -2800,15 +2458,6 @@ esm@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.6.tgz#0b327fb312e287d9e1a95e728c18b79603fb6d9e"
 
-espower-location-detector@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/espower-location-detector/-/espower-location-detector-1.0.0.tgz#a17b7ecc59d30e179e2bef73fb4137704cb331b5"
-  dependencies:
-    is-url "^1.2.1"
-    path-is-absolute "^1.0.0"
-    source-map "^0.5.0"
-    xtend "^4.0.0"
-
 espree@^3.5.2:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
@@ -2828,12 +2477,6 @@ esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-espurify@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
-  dependencies:
-    core-js "^2.0.0"
-
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -2869,6 +2512,12 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
+exec-sh@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  dependencies:
+    merge "^1.1.3"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2881,6 +2530,10 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2905,6 +2558,17 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
+expect@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.0.tgz#371edf1ae15b83b5bf5ec34b42f1584660a36c16"
+  dependencies:
+    ansi-styles "^3.2.0"
+    jest-diff "^22.4.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
+
 express@^4.16.2:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
@@ -3014,10 +2678,6 @@ fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
-fast-diff@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -3030,6 +2690,12 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
+fb-watchman@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  dependencies:
+    bser "^2.0.0"
+
 fbjs@^0.8.16:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
@@ -3072,6 +2738,13 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
 filesize@^3.5.11:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
@@ -3119,14 +2792,6 @@ finalhandler@1.1.1, finalhandler@^1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
-  dependencies:
-    commondir "^1.0.1"
-    mkdirp "^0.5.1"
-    pkg-dir "^1.0.0"
-
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -3168,10 +2833,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-fn-name@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3186,13 +2847,6 @@ foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
 
-foreground-child@^1.5.3, foreground-child@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-  dependencies:
-    cross-spawn "^4"
-    signal-exit "^3.0.0"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -3255,7 +2909,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.0.0:
+fsevents@^1.0.0, fsevents@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
   dependencies:
@@ -3283,10 +2937,6 @@ function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
-function-name-support@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/function-name-support/-/function-name-support-0.2.0.tgz#55d3bfaa6eafd505a50f9bc81fdf57564a0bb071"
-
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -3308,14 +2958,6 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
-get-port@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3350,7 +2992,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3361,12 +3003,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  dependencies:
-    ini "^1.3.4"
-
 globals@^11.0.1, globals@^11.1.0:
   version "11.3.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
@@ -3386,36 +3022,14 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-got@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
+growly@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
 gzip-size@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
@@ -3461,18 +3075,10 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-color@~0.1.0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -3508,10 +3114,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has-yarn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
-
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
@@ -3703,25 +3305,6 @@ https-proxy-agent@^2.1.0:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-hullabaloo-config-manager@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz#1d9117813129ad035fd9e8477eaf066911269fe3"
-  dependencies:
-    dot-prop "^4.1.0"
-    es6-error "^4.0.2"
-    graceful-fs "^4.1.11"
-    indent-string "^3.1.0"
-    json5 "^0.5.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.clonedeepwith "^4.5.0"
-    lodash.isequal "^4.5.0"
-    lodash.merge "^4.6.0"
-    md5-hex "^2.0.0"
-    package-hash "^2.0.0"
-    pkg-dir "^2.0.0"
-    resolve-from "^3.0.0"
-    safe-buffer "^5.0.1"
-
 iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -3744,21 +3327,13 @@ iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
 
-ignore-by-default@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
-
 ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-
-import-local@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
@@ -3767,16 +3342,6 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
-indent-string@^3.0.0, indent-string@^3.1.0, indent-string@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -3800,7 +3365,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.4, ini@~1.3.0:
+ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -3903,7 +3468,7 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
-is-ci@^1.0.7:
+is-ci@^1.0.10:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
@@ -3955,10 +3520,6 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-error@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4015,17 +3576,6 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
-is-npm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -4042,22 +3592,6 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
-is-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
-  dependencies:
-    symbol-observable "^0.2.2"
-
-is-observable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-odd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
@@ -4102,10 +3636,6 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -4116,11 +3646,7 @@ is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
@@ -4138,11 +3664,7 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-url@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.2.tgz#498905a593bf47cc2d9e7f738372bbf7696c7f26"
-
-is-utf8@^0.2.0, is-utf8@^0.2.1:
+is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
@@ -4187,17 +3709,34 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
+istanbul-api@^1.1.14:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
+  dependencies:
+    async "^2.1.4"
+    compare-versions "^3.1.0"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-hook "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-report "^1.1.4"
+    istanbul-lib-source-maps "^1.2.4"
+    istanbul-reports "^1.3.0"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
 
-istanbul-lib-hook@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
+istanbul-lib-hook@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.10.0, istanbul-lib-instrument@^1.7.5:
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
   dependencies:
@@ -4209,16 +3748,16 @@ istanbul-lib-instrument@^1.10.0, istanbul-lib-instrument@^1.7.5:
     istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259"
+istanbul-lib-report@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
   dependencies:
-    istanbul-lib-coverage "^1.1.2"
+    istanbul-lib-coverage "^1.2.0"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.2.3:
+istanbul-lib-source-maps@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
   dependencies:
@@ -4228,25 +3767,290 @@ istanbul-lib-source-maps@^1.2.3:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.4:
+istanbul-lib-source-maps@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
   dependencies:
     handlebars "^4.0.3"
 
+jest-changed-files@^22.2.0:
+  version "22.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.2.0.tgz#517610c4a8ca0925bdc88b0ca53bd678aa8d019e"
+  dependencies:
+    throat "^4.0.0"
+
+jest-cli@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.2.tgz#e6546dc651e13d164481aa3e76e53ac4f4edab06"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    import-local "^1.0.0"
+    is-ci "^1.0.10"
+    istanbul-api "^1.1.14"
+    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-instrument "^1.8.0"
+    istanbul-lib-source-maps "^1.2.1"
+    jest-changed-files "^22.2.0"
+    jest-config "^22.4.2"
+    jest-environment-jsdom "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^22.4.2"
+    jest-message-util "^22.4.0"
+    jest-regex-util "^22.1.0"
+    jest-resolve-dependencies "^22.1.0"
+    jest-runner "^22.4.2"
+    jest-runtime "^22.4.2"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
+    jest-worker "^22.2.2"
+    micromatch "^2.3.11"
+    node-notifier "^5.2.1"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
+    slash "^1.0.0"
+    string-length "^2.0.0"
+    strip-ansi "^4.0.0"
+    which "^1.2.12"
+    yargs "^10.0.3"
+
+jest-config@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.2.tgz#580ba5819bf81a5e48f4fd470e8b81834f45c855"
+  dependencies:
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^22.4.1"
+    jest-environment-node "^22.4.1"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
+    pretty-format "^22.4.0"
+
+jest-diff@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.0.tgz#384c2b78519ca44ca126382df53f134289232525"
+  dependencies:
+    chalk "^2.0.1"
+    diff "^3.2.0"
+    jest-get-type "^22.1.0"
+    pretty-format "^22.4.0"
+
+jest-docblock@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.0.tgz#dbf1877e2550070cfc4d9b07a55775a0483159b8"
+  dependencies:
+    detect-newline "^2.1.0"
+
+jest-environment-jsdom@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.1.tgz#754f408872441740100d3917e5ec40c74de6447f"
+  dependencies:
+    jest-mock "^22.2.0"
+    jest-util "^22.4.1"
+    jsdom "^11.5.1"
+
+jest-environment-node@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.1.tgz#418850eb654596b8d6e36c2021cbedbc23df8e16"
+  dependencies:
+    jest-mock "^22.2.0"
+    jest-util "^22.4.1"
+
+jest-get-type@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
+
+jest-haste-map@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.2.tgz#a90178e66146d4378bb076345a949071f3b015b4"
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.11"
+    jest-docblock "^22.4.0"
+    jest-serializer "^22.4.0"
+    jest-worker "^22.2.2"
+    micromatch "^2.3.11"
+    sane "^2.0.0"
+
+jest-jasmine2@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.2.tgz#dfd3d259579ed6f52510d8f1ab692808f0d40691"
+  dependencies:
+    chalk "^2.0.1"
+    co "^4.6.0"
+    expect "^22.4.0"
+    graceful-fs "^4.1.11"
+    is-generator-fn "^1.0.0"
+    jest-diff "^22.4.0"
+    jest-matcher-utils "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-snapshot "^22.4.0"
+    jest-util "^22.4.1"
+    source-map-support "^0.5.0"
+
+jest-leak-detector@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.0.tgz#64da77f05b001c96d2062226e079f89989c4aa2f"
+  dependencies:
+    pretty-format "^22.4.0"
+
+jest-matcher-utils@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.0.tgz#d55f5faf2270462736bdf7c7485ee931c9d4b6a1"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^22.4.0"
+
+jest-message-util@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.0.tgz#e3d861df16d2fee60cb2bc8feac2188a42579642"
+  dependencies:
+    "@babel/code-frame" "^7.0.0-beta.35"
+    chalk "^2.0.1"
+    micromatch "^2.3.11"
+    slash "^1.0.0"
+    stack-utils "^1.0.1"
+
+jest-mock@^22.2.0:
+  version "22.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.2.0.tgz#444b3f9488a7473adae09bc8a77294afded397a7"
+
+jest-regex-util@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.1.0.tgz#5daf2fe270074b6da63e5d85f1c9acc866768f53"
+
+jest-resolve-dependencies@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.1.0.tgz#340e4139fb13315cd43abc054e6c06136be51e31"
+  dependencies:
+    jest-regex-util "^22.1.0"
+
+jest-resolve@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.2.tgz#25d88aa4147462c9c1c6a1ba16250d3794c24d00"
+  dependencies:
+    browser-resolve "^1.11.2"
+    chalk "^2.0.1"
+
+jest-runner@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.2.tgz#19390ea9d99f768973e16f95a1efa351c0017e87"
+  dependencies:
+    exit "^0.1.2"
+    jest-config "^22.4.2"
+    jest-docblock "^22.4.0"
+    jest-haste-map "^22.4.2"
+    jest-jasmine2 "^22.4.2"
+    jest-leak-detector "^22.4.0"
+    jest-message-util "^22.4.0"
+    jest-runtime "^22.4.2"
+    jest-util "^22.4.1"
+    jest-worker "^22.2.2"
+    throat "^4.0.0"
+
+jest-runtime@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.2.tgz#0de0444f65ce15ee4f2e0055133fc7c17b9168f3"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^22.4.1"
+    babel-plugin-istanbul "^4.1.5"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    graceful-fs "^4.1.11"
+    jest-config "^22.4.2"
+    jest-haste-map "^22.4.2"
+    jest-regex-util "^22.1.0"
+    jest-resolve "^22.4.2"
+    jest-util "^22.4.1"
+    jest-validate "^22.4.2"
+    json-stable-stringify "^1.0.1"
+    micromatch "^2.3.11"
+    realpath-native "^1.0.0"
+    slash "^1.0.0"
+    strip-bom "3.0.0"
+    write-file-atomic "^2.1.0"
+    yargs "^10.0.3"
+
+jest-serializer@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.0.tgz#b5d145b98c4b0d2c20ab686609adbb81fe23b566"
+
+jest-snapshot@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.0.tgz#03d3ce63f8fa7352388afc6a3c8b5ccc3a180ed7"
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^22.4.0"
+    jest-matcher-utils "^22.4.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^22.4.0"
+
+jest-util@^22.4.1:
+  version "22.4.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.1.tgz#dd17c3bdb067f8e90591563ec0c42bf847dc249f"
+  dependencies:
+    callsites "^2.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.11"
+    is-ci "^1.0.10"
+    jest-message-util "^22.4.0"
+    mkdirp "^0.5.1"
+    source-map "^0.6.0"
+
+jest-validate@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.2.tgz#e789a4e056173bf97fe797a2df2d52105c57d4f4"
+  dependencies:
+    chalk "^2.0.1"
+    jest-config "^22.4.2"
+    jest-get-type "^22.1.0"
+    leven "^2.1.0"
+    pretty-format "^22.4.0"
+
+jest-worker@^22.2.2:
+  version "22.2.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.2.2.tgz#c1f5dc39976884b81f68ec50cb8532b2cbab3390"
+  dependencies:
+    merge-stream "^1.0.1"
+
+jest@^22.4.2:
+  version "22.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.2.tgz#34012834a49bf1bdd3bc783850ab44e4499afc20"
+  dependencies:
+    import-local "^1.0.0"
+    jest-cli "^22.4.2"
+
 js-base64@^2.1.9:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
 
-js-string-escape@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.10.0, js-yaml@^3.4.3, js-yaml@^3.9.1:
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
@@ -4264,7 +4068,7 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^11.6.2:
+jsdom@^11.5.1, jsdom@^11.6.2:
   version "11.6.2"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.6.2.tgz#25d1ef332d48adf77fc5221fe2619967923f16bb"
   dependencies:
@@ -4307,10 +4111,6 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
-
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -4386,18 +4186,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
-last-line-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/last-line-stream/-/last-line-stream-1.0.0.tgz#d1b64d69f86ff24af2d04883a2ceee14520a5600"
-  dependencies:
-    through2 "^2.0.0"
-
-latest-version@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  dependencies:
-    package-json "^4.0.0"
-
 launch-editor-middleware@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157"
@@ -4425,6 +4213,10 @@ left-pad@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
 
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4451,15 +4243,6 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
@@ -4496,38 +4279,10 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
-lodash.clonedeepwith@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4"
-
-lodash.debounce@^4.0.3:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
-lodash.difference@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
-
-lodash.flatten@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
 
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -4536,10 +4291,6 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
-lodash.merge@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -4589,7 +4340,7 @@ loose-envify@^1.0.0, loose-envify@^1.3.1:
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0, loud-rejection@^1.2.0, loud-rejection@^1.6.0:
+loud-rejection@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
@@ -4600,10 +4351,6 @@ lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-
 lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
@@ -4621,46 +4368,26 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  dependencies:
+    tmpl "1.0.x"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
   dependencies:
     object-visit "^1.0.0"
 
-matcher@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.0.tgz#4ad3a9cb6585186dc95cb8a08c7de936caed17ee"
-  dependencies:
-    escape-string-regexp "^1.0.4"
-
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
-md5-hex@^1.2.0, md5-hex@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
-  dependencies:
-    md5-o-matic "^0.1.1"
-
-md5-hex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
-  dependencies:
-    md5-o-matic "^0.1.1"
-
-md5-o-matic@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
-
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -4685,36 +4412,25 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
-merge-source-map@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
   dependencies:
-    source-map "^0.6.1"
+    readable-stream "^2.0.1"
+
+merge@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -4801,7 +4517,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -4858,19 +4574,6 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ms@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-
-multimatch@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
 mustache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
@@ -4948,6 +4651,10 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
@@ -4976,6 +4683,15 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
+node-notifier@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  dependencies:
+    growly "^1.3.0"
+    semver "^5.4.1"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
 node-pre-gyp@^0.6.39:
   version "0.6.39"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
@@ -4999,7 +4715,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5008,7 +4724,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -5060,38 +4776,6 @@ nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
-nyc@^11.6.0:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.6.0.tgz#d9c7b51ffceb6bba099a4683a6adc1b331b98853"
-  dependencies:
-    archy "^1.0.0"
-    arrify "^1.0.1"
-    caching-transform "^1.0.0"
-    convert-source-map "^1.5.1"
-    debug-log "^1.0.1"
-    default-require-extensions "^1.0.0"
-    find-cache-dir "^0.1.1"
-    find-up "^2.1.0"
-    foreground-child "^1.5.3"
-    glob "^7.0.6"
-    istanbul-lib-coverage "^1.1.2"
-    istanbul-lib-hook "^1.1.0"
-    istanbul-lib-instrument "^1.10.0"
-    istanbul-lib-report "^1.1.3"
-    istanbul-lib-source-maps "^1.2.3"
-    istanbul-reports "^1.1.4"
-    md5-hex "^1.2.0"
-    merge-source-map "^1.0.2"
-    micromatch "^2.3.11"
-    mkdirp "^0.5.0"
-    resolve-from "^2.0.0"
-    rimraf "^2.5.4"
-    signal-exit "^3.0.1"
-    spawn-wrap "^1.4.2"
-    test-exclude "^4.2.0"
-    yargs "11.1.0"
-    yargs-parser "^8.0.0"
-
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -5138,13 +4822,6 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-observable-to-promise@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f"
-  dependencies:
-    is-observable "^0.2.0"
-    symbol-observable "^1.0.4"
-
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -5200,10 +4877,6 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-option-chain@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/option-chain/-/option-chain-1.0.0.tgz#938d73bd4e1783f948d34023644ada23669e30f2"
-
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -5273,30 +4946,6 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
-  dependencies:
-    md5-hex "^1.3.0"
-
-package-hash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d"
-  dependencies:
-    graceful-fs "^4.1.11"
-    lodash.flattendeep "^4.4.0"
-    md5-hex "^2.0.0"
-    release-zalgo "^1.0.0"
-
-package-json@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
-
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -5340,21 +4989,6 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-ms@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
-
-parse-ms@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -5455,22 +5089,12 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
-pinkie-promise@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
-  dependencies:
-    pinkie "^1.0.0"
-
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
-pinkie@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
-
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
@@ -5483,13 +5107,6 @@ pixrem@^4.0.0:
     postcss "^6.0.0"
     reduce-css-calc "^1.2.7"
 
-pkg-conf@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
-  dependencies:
-    find-up "^2.0.0"
-    load-json-file "^4.0.0"
-
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -5509,7 +5126,7 @@ pleeease-filters@^4.0.0:
     onecolor "^3.0.4"
     postcss "^6.0.1"
 
-plur@^2.0.0, plur@^2.1.2:
+plur@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
   dependencies:
@@ -6054,7 +5671,7 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
@@ -6077,18 +5694,12 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-ms@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-0.2.2.tgz#da879a682ff33a37011046f13d627f67c73b84f6"
+pretty-format@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.0.tgz#237b1f7e1c50ed03bc65c03ccc29d7c8bb7beb94"
   dependencies:
-    parse-ms "^0.1.0"
-
-pretty-ms@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"
-  dependencies:
-    parse-ms "^1.0.0"
-    plur "^2.1.2"
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
 
 private@^0.1.6, private@^0.1.7:
   version "0.1.8"
@@ -6253,7 +5864,7 @@ raw-body@2.3.2:
     iconv-lite "0.4.19"
     unpipe "1.0.0"
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+rc@^1.1.7:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
   dependencies:
@@ -6328,12 +5939,11 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-redent@^1.0.0:
+realpath-native@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0"
   dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
+    util.promisify "^1.0.0"
 
 reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7:
   version "1.3.0"
@@ -6405,19 +6015,6 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  dependencies:
-    rc "^1.0.1"
-
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
@@ -6432,12 +6029,6 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
-release-zalgo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  dependencies:
-    es6-error "^4.0.1"
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -6546,10 +6137,6 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-precompiled@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/require-precompiled/-/require-precompiled-0.1.0.tgz#5a1b52eb70ebed43eb982e974c85ab59571e56fa"
-
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -6567,10 +6154,6 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve-from@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -6579,6 +6162,10 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
 resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
@@ -6663,6 +6250,20 @@ samsam@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
+sane@^2.0.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.0.tgz#6359cd676f5efd9988b264d8ce3b827dd6b27bec"
+  dependencies:
+    anymatch "^2.0.0"
+    exec-sh "^0.2.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.18.0"
+  optionalDependencies:
+    fsevents "^1.1.1"
+
 sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -6674,13 +6275,7 @@ schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  dependencies:
-    semver "^5.0.3"
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -6702,10 +6297,6 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-serialize-error@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
-
 serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
@@ -6787,7 +6378,11 @@ shell-quote@^1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
+shellwords@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
@@ -6813,16 +6408,12 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
-slice-ansi@1.0.0, slice-ansi@^1.0.0:
+slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
-slide@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -6868,12 +6459,6 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -6926,17 +6511,6 @@ source-map@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.2.tgz#115c3e891aaa9a484869fd2b89391a225feba344"
 
-spawn-wrap@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
-  dependencies:
-    foreground-child "^1.5.6"
-    mkdirp "^0.5.0"
-    os-homedir "^1.0.1"
-    rimraf "^2.6.2"
-    signal-exit "^3.0.2"
-    which "^1.3.0"
-
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
@@ -7052,6 +6626,13 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string-length@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  dependencies:
+    astral-regex "^1.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -7099,15 +6680,9 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-
-strip-bom-buf@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
-  dependencies:
-    is-utf8 "^0.2.1"
+strip-bom@3.0.0, strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -7115,20 +6690,10 @@ strip-bom@^2.0.0:
   dependencies:
     is-utf8 "^0.2.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7140,16 +6705,6 @@ style-resources-loader@^1.1.0:
     glob "^7.1.2"
     loader-utils "^1.1.0"
 
-supertap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supertap/-/supertap-1.0.0.tgz#bd9751c7fafd68c68cf8222a29892206a119fa9e"
-  dependencies:
-    arrify "^1.0.1"
-    indent-string "^3.2.0"
-    js-yaml "^3.10.0"
-    serialize-error "^2.1.0"
-    strip-ansi "^4.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -7160,7 +6715,7 @@ supports-color@^3.1.2, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.0.0, supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0:
+supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
   dependencies:
@@ -7182,14 +6737,6 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
-symbol-observable@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
-
-symbol-observable@^1.0.4, symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
@@ -7234,13 +6781,7 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  dependencies:
-    execa "^0.7.0"
-
-test-exclude@^4.1.1, test-exclude@^4.2.0:
+test-exclude@^4.1.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
   dependencies:
@@ -7258,6 +6799,10 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+throat@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -7273,14 +6818,6 @@ time-fix-plugin@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-fix-plugin/-/time-fix-plugin-2.0.0.tgz#d112f1e415b6ed269e008a42990ddbf8053fc315"
 
-time-zone@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
-
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-
 timers-browserify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
@@ -7293,6 +6830,10 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -7343,14 +6884,6 @@ tr46@^1.0.0:
   dependencies:
     punycode "^2.1.0"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
-trim-off-newlines@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -7442,10 +6975,6 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-uid2@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -7485,20 +7014,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  dependencies:
-    crypto-random-string "^1.0.0"
-
-unique-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385"
-  dependencies:
-    mkdirp "^0.5.1"
-    os-tmpdir "^1.0.1"
-    uid2 "0.0.3"
-
 units-css@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/units-css/-/units-css-0.4.0.tgz#d6228653a51983d7c16ff28f8b9dc3b1ffed3a07"
@@ -7521,28 +7036,10 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
 upath@^1.0.0, upath@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
 
-update-notifier@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
-  dependencies:
-    boxen "^1.2.1"
-    chalk "^2.0.1"
-    configstore "^3.0.0"
-    import-lazy "^2.1.0"
-    is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
-
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -7563,12 +7060,6 @@ url-loader@^1.0.1:
     mime "^2.0.3"
     schema-utils "^0.4.3"
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  dependencies:
-    prepend-http "^1.0.1"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -7590,7 +7081,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util.promisify@1.0.0:
+util.promisify@1.0.0, util.promisify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
   dependencies:
@@ -7731,6 +7222,19 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  dependencies:
+    makeerror "1.0.x"
+
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
 watchpack@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed"
@@ -7843,10 +7347,6 @@ webpack@^4.1.1:
     watchpack "^1.5.0"
     webpack-sources "^1.0.1"
 
-well-known-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-1.0.0.tgz#73c78ae81a7726a8fa598e2880801c8b16225518"
-
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
@@ -7873,7 +7373,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.9, which@^1.3.0:
+which@^1.2.12, which@^1.2.9, which@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -7885,12 +7385,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
-  dependencies:
-    string-width "^2.1.1"
-
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
@@ -7924,15 +7418,7 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^1.1.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
-write-file-atomic@^2.0.0:
+write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
   dependencies:
@@ -7940,24 +7426,6 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-json-file@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
-  dependencies:
-    detect-indent "^5.0.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    pify "^3.0.0"
-    sort-keys "^2.0.0"
-    write-file-atomic "^2.0.0"
-
-write-pkg@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
-  dependencies:
-    sort-keys "^2.0.0"
-    write-json-file "^2.2.0"
-
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -7979,10 +7447,6 @@ ws@^4.0.0:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-
 xml-char-classes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
@@ -8013,21 +7477,15 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
-yargs-parser@^8.0.0:
+yargs-parser@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+yargs@^10.0.3:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
@@ -8040,7 +7498,7 @@ yargs@11.1.0:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^9.0.2"
+    yargs-parser "^8.1.0"
 
 yargs@~3.10.0:
   version "3.10.0"

From 1ee08ad101ca3778d04692d8a1980e0d2b119bf1 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Mar 2018 12:21:56 +0330
Subject: [PATCH 02/55] hide fancy errors during test

---
 lib/builder/builder.mjs               |  1 +
 lib/builder/generator.mjs             |  1 +
 lib/builder/webpack/base.config.mjs   | 18 ++++++++++--------
 lib/builder/webpack/client.config.mjs | 10 ++++++----
 lib/common/nuxt.config.js             |  1 +
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/builder/builder.mjs b/lib/builder/builder.mjs
index 02060e9af7..091a05857a 100644
--- a/lib/builder/builder.mjs
+++ b/lib/builder/builder.mjs
@@ -40,6 +40,7 @@ export default class Builder {
     this.filesWatcher = null
     this.customFilesWatcher = null
     this.spinner = createSpinner()
+    this.spinner.enabled = !this.options.test
 
     // Mute stats on dev
     this.webpackStats = this.options.dev ? false : this.options.build.stats
diff --git a/lib/builder/generator.mjs b/lib/builder/generator.mjs
index 7e129cb750..3e3176f8c9 100644
--- a/lib/builder/generator.mjs
+++ b/lib/builder/generator.mjs
@@ -21,6 +21,7 @@ export default class Generator {
     )
 
     this.spinner = createSpinner()
+    this.spinner.enabled = !this.options.test
   }
 
   async generate({ build = true, init = true } = {}) {
diff --git a/lib/builder/webpack/base.config.mjs b/lib/builder/webpack/base.config.mjs
index 77b3eee894..dcc91f189d 100644
--- a/lib/builder/webpack/base.config.mjs
+++ b/lib/builder/webpack/base.config.mjs
@@ -126,14 +126,16 @@ export default function webpackBaseConfig({ name, isServer }) {
   }
 
   // Build progress indicator
-  if (this.options.build.profile) {
-    config.plugins.push(new webpack.ProgressPlugin({ profile: true }))
-  } else {
-    config.plugins.push(new ProgressPlugin({
-      spinner: this.spinner,
-      name: isServer ? 'server' : 'client',
-      color: isServer ? 'green' : 'darkgreen'
-    }))
+  if (!this.options.test) {
+    if (this.options.build.profile) {
+      config.plugins.push(new webpack.ProgressPlugin({ profile: true }))
+    } else {
+      config.plugins.push(new ProgressPlugin({
+        spinner: this.spinner,
+        name: isServer ? 'server' : 'client',
+        color: isServer ? 'green' : 'darkgreen'
+      }))
+    }
   }
 
   // Add timefix-plugin before others plugins
diff --git a/lib/builder/webpack/client.config.mjs b/lib/builder/webpack/client.config.mjs
index 1d7a8077e1..75f546b356 100644
--- a/lib/builder/webpack/client.config.mjs
+++ b/lib/builder/webpack/client.config.mjs
@@ -86,9 +86,11 @@ export default function webpackClientConfig() {
     this.options.build.stats !== 'errors-only'
 
   // Add friendly error plugin
-  config.plugins.push(
-    new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole })
-  )
+  if (!this.options.test) {
+    config.plugins.push(
+      new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole })
+    )
+  }
 
   // Optimization
   config.optimization.splitChunks = {
@@ -182,7 +184,7 @@ export default function webpackClientConfig() {
     }
 
     // https://github.com/webpack-contrib/webpack-stylish
-    if (!this.options.dev) {
+    if (!this.options.dev && !this.options.test) {
       config.plugins.push(new StylishPlugin())
     }
 
diff --git a/lib/common/nuxt.config.js b/lib/common/nuxt.config.js
index db90aad66c..66fb24f63b 100644
--- a/lib/common/nuxt.config.js
+++ b/lib/common/nuxt.config.js
@@ -4,6 +4,7 @@ export default {
   mode: 'universal',
   dev: process.env.NODE_ENV !== 'production',
   debug: undefined, // Will be equal to dev if not provided
+  test: process.env.NODE_ENV === 'test',
   buildDir: '.nuxt',
   cacheDir: '.cache',
   nuxtDir: path.resolve(__dirname, '../..'),

From 6f718ec24becc5ae983313eba651e03cde89a938 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Mar 2018 12:23:06 +0330
Subject: [PATCH 03/55] hide OPEN message on test

---
 lib/core/nuxt.mjs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/core/nuxt.mjs b/lib/core/nuxt.mjs
index 15b3a5a1a9..870273f2a5 100644
--- a/lib/core/nuxt.mjs
+++ b/lib/core/nuxt.mjs
@@ -127,12 +127,14 @@ export default class Nuxt {
           }
 
           const _host = host === '0.0.0.0' ? 'localhost' : host
-          // eslint-disable-next-line no-console
-          console.log(
-            '\n' +
+          if (!this.options.test) {
+            // eslint-disable-next-line no-console
+            console.log(
+              '\n' +
               chalk.bgGreen.black(' OPEN ') +
               chalk.green(` http://${_host}:${port}\n`)
-          )
+            )
+          }
 
           // Close server on nuxt close
           this.hook(

From ed22e78a756ba8ee492bb0630ef021d475de04ac Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Mar 2018 23:01:32 +0330
Subject: [PATCH 04/55] basic migration to jest

---
 examples/with-ava/test/index.test.js      |   6 +-
 package.json                              |   3 +-
 test/basic.config.defaults.test.js        |  18 +-
 test/basic.csr.test.js                    | 447 +++++++++----------
 test/basic.dev.test.js                    |  95 ++--
 test/basic.fail.generate.test.js          |  38 +-
 test/basic.generate.test.js               | 325 +++++++-------
 test/basic.ssr.csp.test.js                | 185 ++++----
 test/basic.ssr.test.js                    | 505 ++++++++++------------
 test/children.patch.test.js               | 248 ++++++-----
 test/children.test.js                     |  93 ++--
 test/cli.test.js                          | 149 +++----
 test/custom-dirs.test.js                  |  73 ++--
 test/debug.test.js                        | 169 ++++----
 test/deprecate.test.js                    |  37 +-
 test/dynamic-routes.test.js               | 207 +++++----
 test/error.test.js                        | 127 +++---
 test/express.test.js                      |  55 ++-
 test/fallback.generate.test.js            | 145 +++----
 test/fixtures/basic/nuxt.config.js        |   5 +
 test/generator.test.js                    | 119 ++---
 test/helpers/{console.js => console.d.js} |   0
 test/helpers/setup.js                     |   4 +
 test/index.test.js                        |  45 --
 test/module.test.js                       |  65 ++-
 test/nuxt.test.js                         |  44 ++
 test/spa.test.js                          | 122 +++---
 test/ssr.test.js                          | 165 ++++---
 test/utils.test.js                        | 386 ++++++++---------
 test/with-config.test.js                  | 383 ++++++++--------
 30 files changed, 2080 insertions(+), 2183 deletions(-)
 rename test/helpers/{console.js => console.d.js} (100%)
 create mode 100644 test/helpers/setup.js
 delete mode 100644 test/index.test.js
 create mode 100644 test/nuxt.test.js

diff --git a/examples/with-ava/test/index.test.js b/examples/with-ava/test/index.test.js
index 431f98f41f..971bccde38 100755
--- a/examples/with-ava/test/index.test.js
+++ b/examples/with-ava/test/index.test.js
@@ -8,16 +8,16 @@ import { Nuxt, Builder } from 'nuxt'
 let nuxt = null
 
 // Init Nuxt.js and create a server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
+beforeAll(async () => {
   const rootDir = resolve(__dirname, '..')
   let config = {}
   try { config = require(resolve(rootDir, 'nuxt.config.js')) } catch (e) {}
   config.rootDir = rootDir // project folder
   config.dev = false // production build
   nuxt = new Nuxt(config)
-  await new Builder(nuxt).build()
+  new Builder(nuxt).build()
   await nuxt.listen(4000, 'localhost')
-})
+}, 30000)
 
 // Example of testing only generated html
 test('Route / exits and render HTML', async t => {
diff --git a/package.json b/package.json
index 21924ed4dc..a1759ca58d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
   "jest": {
     "testEnvironment": "node",
     "coverageDirectory": "./coverage/",
-    "collectCoverage": false
+    "collectCoverage": false,
+    "setupTestFrameworkScriptFile": "./test/helpers/setup"
   },
   "scripts": {
     "test": "npm run lint && jest",
diff --git a/test/basic.config.defaults.test.js b/test/basic.config.defaults.test.js
index efdb391a6f..46f9f7d4aa 100644
--- a/test/basic.config.defaults.test.js
+++ b/test/basic.config.defaults.test.js
@@ -1,16 +1,16 @@
 import { resolve } from 'path'
 
-import test from 'ava'
-
 import { Nuxt, Options } from '..'
 import { version } from '../package.json'
 
-test('Nuxt.version is same as package', t => {
-  t.is(Nuxt.version, version)
-})
+describe('basic config defaults', () => {
+  test('Nuxt.version is same as package', () => {
+    expect(Nuxt.version).toBe(version)
+  })
 
-test('modulesDir uses /node_modules as default if not set', async t => {
-  const options = Options.from({})
-  const currentNodeModulesDir = resolve(__dirname, '..', 'node_modules')
-  t.true(options.modulesDir.includes(currentNodeModulesDir))
+  test('modulesDir uses /node_modules as default if not set', async () => {
+    const options = Options.from({})
+    const currentNodeModulesDir = resolve(__dirname, '..', 'node_modules')
+    expect(options.modulesDir.includes(currentNodeModulesDir)).toBe(true)
+  })
 })
diff --git a/test/basic.csr.test.js b/test/basic.csr.test.js
index 07363c0cf1..9eff2fdc3b 100644
--- a/test/basic.csr.test.js
+++ b/test/basic.csr.test.js
@@ -1,11 +1,8 @@
 import { resolve } from 'path'
 
-import test from 'ava'
-
 import { Nuxt, Builder } from '..'
 
 import * as browser from './helpers/browser'
-import { interceptLog } from './helpers/console'
 
 const port = 4003
 const url = route => 'http://localhost:' + port + route
@@ -15,241 +12,229 @@ let page = null
 
 const waitFor = ms => new Promise(resolve => setTimeout(resolve, ms || 0))
 
-// Init nuxt.js and create server listening on localhost:4003
-test.serial('Init Nuxt.js', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    buildDir: '.nuxt-csr',
-    dev: true,
-    head: {
-      titleTemplate(titleChunk) {
-        return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
+describe('basic csr', () => {
+  // Init nuxt.js and create server listening on localhost:4003
+  beforeAll(async () => {
+    const options = {
+      rootDir: resolve(__dirname, 'fixtures/basic'),
+      buildDir: '.nuxt-csr',
+      dev: true,
+      build: {
+        stats: false
       }
-    },
-    build: {
-      stats: false
     }
-  }
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(options)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('Start browser', async () => {
+    expect.assertions(0) // suppress 'no assertions' warning
+    await browser.start({
+      // slowMo: 50,
+      // headless: false
+    })
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('Open /', async () => {
+    page = await browser.page(url('/'))
+    await waitFor(1000)
 
-test.serial('Start browser', async t => {
-  t.plan(0) // suppress 'no assertions' warning
-  await browser.start({
-    // slowMo: 50,
-    // headless: false
+    expect(await page.$text('h1')).toBe('Index page')
+  })
+
+  test('/stateless', async () => {
+    const { hook } = await page.nuxt.navigate('/stateless', false)
+    const loading = await page.nuxt.loadingData()
+    await waitFor(1000)
+
+    expect(loading.show).toBe(true)
+    await hook
+    expect(await page.$text('h1')).toBe('My component!')
+  })
+
+  test('/css', async () => {
+    await page.nuxt.navigate('/css')
+    await waitFor(1000)
+
+    expect(await page.$text('.red')).toBe('This is red')
+    expect(await page.$eval('.red', red => window.getComputedStyle(red).color)).toBe('rgb(255, 0, 0)')
+  })
+
+  test('/stateful', async () => {
+    await page.nuxt.navigate('/stateful')
+    await waitFor(1000)
+
+    expect(await page.$text('p')).toBe('The answer is 42')
+  })
+
+  test('/store', async () => {
+    await page.nuxt.navigate('/store')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('Vuex Nested Modules')
+    expect(await page.$text('p')).toBe('1')
+  })
+
+  test('/head', async () => {
+    const msg = new Promise(resolve =>
+      page.on('console', msg => resolve(msg.text()))
+    )
+    await page.nuxt.navigate('/head')
+    const metas = await page.$$attr('meta', 'content')
+    await waitFor(1000)
+
+    expect(await msg).toBe('Body script!')
+    expect(await page.title()).toBe('My title - Nuxt.js')
+    expect(await page.$text('h1')).toBe('I can haz meta tags')
+    expect(metas[0]).toBe('my meta')
+  })
+
+  test('/async-data', async () => {
+    await page.nuxt.navigate('/async-data')
+    await waitFor(1000)
+
+    expect(await page.$text('p')).toBe('Nuxt.js')
+  })
+
+  test('/await-async-data', async () => {
+    await page.nuxt.navigate('/await-async-data')
+    await waitFor(1000)
+
+    expect(await page.$text('p')).toBe('Await Nuxt.js')
+  })
+
+  test('/callback-async-data', async () => {
+    await page.nuxt.navigate('/callback-async-data')
+    await waitFor(1000)
+
+    expect(await page.$text('p')).toBe('Callback Nuxt.js')
+  })
+
+  test('/users/1', async () => {
+    await page.nuxt.navigate('/users/1')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('User: 1')
+  })
+
+  test('/validate should display a 404', async () => {
+    await page.nuxt.navigate('/validate')
+    await waitFor(1000)
+
+    const error = await page.nuxt.errorData()
+
+    expect(error.statusCode).toBe(404)
+    expect(error.message).toBe('This page could not be found')
+  })
+
+  test('/validate?valid=true', async () => {
+    await page.nuxt.navigate('/validate?valid=true')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('I am valid')
+  })
+
+  test('/redirect', async () => {
+    await page.nuxt.navigate('/redirect')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('Index page')
+  })
+
+  test('/error', async () => {
+    await page.nuxt.navigate('/error')
+    await waitFor(1000)
+
+    expect(await page.nuxt.errorData()).toEqual({ statusCode: 500 })
+    expect(await page.$text('.title')).toBe('Error mouahahah')
+  })
+
+  test('/error2', async () => {
+    await page.nuxt.navigate('/error2')
+    await waitFor(1000)
+
+    expect(await page.$text('.title')).toBe('Custom error')
+    expect(await page.nuxt.errorData()).toEqual({ message: 'Custom error' })
+  })
+
+  test('/redirect-middleware', async () => {
+    await page.nuxt.navigate('/redirect-middleware')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('Index page')
+  })
+
+  test('/redirect-external', async () => {
+    // New page for redirecting to external link.
+    const page = await browser.page(url('/'))
+
+    await page.nuxt.navigate('/redirect-external', false)
+    await waitFor(1000)
+
+    await page.waitForFunction(
+      () => window.location.href === 'https://nuxtjs.org/'
+    )
+    page.close()
+  })
+
+  test('/redirect-name', async () => {
+    await page.nuxt.navigate('/redirect-name')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('My component!')
+  })
+
+  test('/no-ssr', async () => {
+    await page.nuxt.navigate('/no-ssr')
+    await waitFor(1000)
+
+    expect(await page.$text('h1')).toBe('Displayed only on client-side')
+  })
+
+  test('/meta', async () => {
+    await page.nuxt.navigate('/meta')
+    await waitFor(1000)
+
+    const state = await page.nuxt.storeState()
+    expect(state.meta).toEqual([{ works: true }])
+  })
+
+  test('/fn-midd', async () => {
+    await page.nuxt.navigate('/fn-midd')
+    await waitFor(1000)
+
+    expect(await page.$text('.title')).toBe('You need to ask the permission')
+    expect(await page.nuxt.errorData()).toEqual({
+      message: 'You need to ask the permission',
+      statusCode: 403
+    })
+  })
+
+  test('/fn-midd?please=true', async () => {
+    await page.nuxt.navigate('/fn-midd?please=true')
+    await waitFor(1000)
+
+    const h1 = await page.$text('h1')
+    expect(h1.includes('Date:')).toBe(true)
+  })
+
+  test('/router-guard', async () => {
+    await page.nuxt.navigate('/router-guard')
+    await waitFor(1000)
+
+    const p = await page.$text('p')
+    expect(p).toBe('Nuxt.js')
+  })
+
+  test('Stop browser', async () => {
+    process.on('unhandledRejection', () => { })
+    await browser.stop()
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
   })
 })
-
-test.serial('Open /', async t => {
-  page = await browser.page(url('/'))
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'Index page')
-})
-
-test.serial('/stateless', async t => {
-  const { hook } = await page.nuxt.navigate('/stateless', false)
-  const loading = await page.nuxt.loadingData()
-  await waitFor(1000)
-
-  t.is(loading.show, true)
-  await hook
-  t.is(await page.$text('h1'), 'My component!')
-})
-
-test.serial('/css', async t => {
-  await page.nuxt.navigate('/css')
-  await waitFor(1000)
-
-  t.is(await page.$text('.red'), 'This is red')
-  t.is(
-    await page.$eval('.red', red => window.getComputedStyle(red).color),
-    'rgb(255, 0, 0)'
-  )
-})
-
-test.serial('/stateful', async t => {
-  await page.nuxt.navigate('/stateful')
-  await waitFor(1000)
-
-  t.is(await page.$text('p'), 'The answer is 42')
-})
-
-test.serial('/store', async t => {
-  await page.nuxt.navigate('/store')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'Vuex Nested Modules')
-  t.is(await page.$text('p'), '1')
-})
-
-test.serial('/head', async t => {
-  const msg = new Promise(resolve =>
-    page.on('console', msg => resolve(msg.text()))
-  )
-  await page.nuxt.navigate('/head')
-  const metas = await page.$$attr('meta', 'content')
-  await waitFor(1000)
-
-  t.is(await msg, 'Body script!')
-  t.is(await page.title(), 'My title - Nuxt.js')
-  t.is(await page.$text('h1'), 'I can haz meta tags')
-  t.is(metas[0], 'my meta')
-})
-
-test.serial('/async-data', async t => {
-  await page.nuxt.navigate('/async-data')
-  await waitFor(1000)
-
-  t.is(await page.$text('p'), 'Nuxt.js')
-})
-
-test.serial('/await-async-data', async t => {
-  await page.nuxt.navigate('/await-async-data')
-  await waitFor(1000)
-
-  t.is(await page.$text('p'), 'Await Nuxt.js')
-})
-
-test.serial('/callback-async-data', async t => {
-  await page.nuxt.navigate('/callback-async-data')
-  await waitFor(1000)
-
-  t.is(await page.$text('p'), 'Callback Nuxt.js')
-})
-
-test.serial('/users/1', async t => {
-  await page.nuxt.navigate('/users/1')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'User: 1')
-})
-
-test.serial('/validate should display a 404', async t => {
-  await page.nuxt.navigate('/validate')
-  await waitFor(1000)
-
-  const error = await page.nuxt.errorData()
-
-  t.is(error.statusCode, 404)
-  t.is(error.message, 'This page could not be found')
-})
-
-test.serial('/validate?valid=true', async t => {
-  await page.nuxt.navigate('/validate?valid=true')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'I am valid')
-})
-
-test.serial('/redirect', async t => {
-  await page.nuxt.navigate('/redirect')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'Index page')
-})
-
-test.serial('/error', async t => {
-  await page.nuxt.navigate('/error')
-  await waitFor(1000)
-
-  t.deepEqual(await page.nuxt.errorData(), { statusCode: 500 })
-  t.is(await page.$text('.title'), 'Error mouahahah')
-})
-
-test.serial('/error2', async t => {
-  await page.nuxt.navigate('/error2')
-  await waitFor(1000)
-
-  t.is(await page.$text('.title'), 'Custom error')
-  t.deepEqual(await page.nuxt.errorData(), { message: 'Custom error' })
-})
-
-test.serial('/redirect-middleware', async t => {
-  await page.nuxt.navigate('/redirect-middleware')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'Index page')
-})
-
-test.serial('/redirect-external', async t => {
-  // New page for redirecting to external link.
-  const page = await browser.page(url('/'))
-
-  await page.nuxt.navigate('/redirect-external', false)
-  await waitFor(1000)
-
-  await page.waitForFunction(
-    () => window.location.href === 'https://nuxtjs.org/'
-  )
-  page.close()
-  t.pass()
-})
-
-test.serial('/redirect-name', async t => {
-  await page.nuxt.navigate('/redirect-name')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'My component!')
-})
-
-test.serial('/no-ssr', async t => {
-  await page.nuxt.navigate('/no-ssr')
-  await waitFor(1000)
-
-  t.is(await page.$text('h1'), 'Displayed only on client-side')
-})
-
-test.serial('/meta', async t => {
-  await page.nuxt.navigate('/meta')
-  await waitFor(1000)
-
-  const state = await page.nuxt.storeState()
-  t.deepEqual(state.meta, [{ works: true }])
-})
-
-test.serial('/fn-midd', async t => {
-  await page.nuxt.navigate('/fn-midd')
-  await waitFor(1000)
-
-  t.is(await page.$text('.title'), 'You need to ask the permission')
-  t.deepEqual(await page.nuxt.errorData(), {
-    message: 'You need to ask the permission',
-    statusCode: 403
-  })
-})
-
-test.serial('/fn-midd?please=true', async t => {
-  await page.nuxt.navigate('/fn-midd?please=true')
-  await waitFor(1000)
-
-  const h1 = await page.$text('h1')
-  t.true(h1.includes('Date:'))
-})
-
-test.serial('/router-guard', async t => {
-  await page.nuxt.navigate('/router-guard')
-  await waitFor(1000)
-
-  const p = await page.$text('p')
-  t.is(p, 'Nuxt.js')
-})
-
-test.after.always('Stop browser', async () => {
-  process.on('unhandledRejection', () => {})
-  await browser.stop()
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async () => {
-  await nuxt.close()
-})
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index 5ebbdbd96c..ff73006735 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,6 +1,4 @@
-import test from 'ava'
 import { resolve } from 'path'
-import { intercept, release } from './helpers/console'
 import { Nuxt, Builder } from '..'
 
 const port = 4001
@@ -9,59 +7,56 @@ const rootDir = resolve(__dirname, 'fixtures/basic')
 
 let nuxt = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const options = {
-    rootDir,
-    buildDir: '.nuxt-dev',
-    dev: true,
-    build: {
-      stats: false,
-      profile: true,
-      extractCSS: {
-        allChunks: true
+describe('basic dev', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const options = {
+      rootDir,
+      buildDir: '.nuxt-dev',
+      dev: true,
+      build: {
+        stats: false,
+        profile: true,
+        extractCSS: {
+          allChunks: true
+        }
       }
     }
-  }
 
-  const spies = await intercept({ log: true, stderr: true }, async () => {
     nuxt = new Nuxt(options)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  // TODO: enable test when style-loader.js:60 was resolved
+  // test.serial('/extractCSS', async t => {
+  //   const window = await nuxt.renderAndGetWindow(url('/extractCSS'))
+  //   const html = window.document.head.innerHTML
+  //   t.true(html.includes('vendor.css'))
+  //   t.true(!html.includes('30px'))
+  //   t.is(window.getComputedStyle(window.document.body).getPropertyValue('font-size'), '30px')
+  // })
+
+  test('/stateless', async () => {
+    // const spies = await intercept()
+    const window = await nuxt.renderAndGetWindow(url('/stateless'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>My component!</h1>')).toBe(true)
+    // expect(spies.info.calledWithMatch('You are running Vue in development mode.')).toBe(true)
+    // release()
   })
 
-  t.true(spies.log.calledWithMatch('DONE'))
-  t.true(spies.log.calledWithMatch('OPEN'))
-})
-
-// TODO: enable test when style-loader.js:60 was resolved
-// test.serial('/extractCSS', async t => {
-//   const window = await nuxt.renderAndGetWindow(url('/extractCSS'))
-//   const html = window.document.head.innerHTML
-//   t.true(html.includes('vendor.css'))
-//   t.true(!html.includes('30px'))
-//   t.is(window.getComputedStyle(window.document.body).getPropertyValue('font-size'), '30px')
-// })
-
-test.serial('/stateless', async t => {
-  const spies = await intercept()
-  const window = await nuxt.renderAndGetWindow(url('/stateless'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>My component!</h1>'))
-  t.true(spies.info.calledWithMatch('You are running Vue in development mode.'))
-  release()
-})
-
-// test('/_nuxt/test.hot-update.json should returns empty html', async t => {
-//   try {
-//     await rp(url('/_nuxt/test.hot-update.json'))
-//   } catch (err) {
-//     t.is(err.statusCode, 404)
-//     t.is(err.response.body, '')
-//   }
-// })
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  // test('/_nuxt/test.hot-update.json should returns empty html', async t => {
+  //   try {
+  //     await rp(url('/_nuxt/test.hot-update.json'))
+  //   } catch (err) {
+  //     t.is(err.statusCode, 404)
+  //     t.is(err.response.body, '')
+  //   }
+  // })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index 606e2dbd9c..7544a46c65 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -1,34 +1,28 @@
 import { resolve } from 'path'
 
-import test from 'ava'
-
 import { Nuxt, Builder, Generator } from '..'
 
-import { intercept } from './helpers/console'
-
-test('Fail with routes() which throw an error', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    buildDir: '.nuxt-fail',
-    dev: false,
-    build: {
-      stats: false
-    },
-    generate: {
-      async routes() {
-        throw new Error('Not today!')
+describe('basic fail generate', () => {
+  test('Fail with routes() which throw an error', async () => {
+    const options = {
+      rootDir: resolve(__dirname, 'fixtures/basic'),
+      buildDir: '.nuxt-fail',
+      dev: false,
+      build: {
+        stats: false
+      },
+      generate: {
+        async routes() {
+          throw new Error('Not today!')
+        }
       }
     }
-  }
-  const spies = await intercept(async () => {
     const nuxt = new Nuxt(options)
     const builder = new Builder(nuxt)
     const generator = new Generator(nuxt, builder)
 
-    return generator.generate().catch(e => {
-      t.true(e.message === 'Not today!')
+    await generator.generate().catch(e => {
+      expect(e.message === 'Not today!').toBe(true)
     })
-  })
-  t.true(spies.log.calledWithMatch('DONE'))
-  t.true(spies.error.withArgs('Could not resolve routes').calledOnce)
+  }, 30000)
 })
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index cd2a4cc494..0614ef0a31 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -2,7 +2,6 @@ import { existsSync } from 'fs'
 import http from 'http'
 import { resolve } from 'path'
 
-import test from 'ava'
 import { remove } from 'fs-extra'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
@@ -10,7 +9,6 @@ import rp from 'request-promise-native'
 
 import { Nuxt, Builder, Generator } from '..'
 
-import { interceptLog, release } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4002
@@ -21,170 +19,181 @@ let nuxt = null
 let server = null
 let generator = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const config = loadConfig('basic', {
-    buildDir: '.nuxt-generate',
-    dev: false
-  })
+describe('basic generate', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('basic', {
+      buildDir: '.nuxt-generate',
+      dev: false
+    })
 
-  config.build.stats = false
+    config.build.stats = false
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
     const builder = new Builder(nuxt)
     generator = new Generator(nuxt, builder)
 
     await generator.generate()
+
+    const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
+    server = http.createServer((req, res) => {
+      serve(req, res, finalhandler(req, res))
+    })
+    server.listen(port)
+  }, 30000)
+
+  test('Check ready hook called', async () => {
+    expect(nuxt.__hook_called__).toBe(true)
   })
-  t.true(logSpy.calledWithMatch('DONE'))
 
-  const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
-  server = http.createServer((req, res) => {
-    serve(req, res, finalhandler(req, res))
+  test('/stateless', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/stateless'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>My component!</h1>')).toBe(true)
+  })
+
+  test('/css', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/css'))
+
+    const headHtml = window.document.head.innerHTML
+    expect(headHtml.includes('.red{color:red}')).toBe(true)
+
+    const element = window.document.querySelector('.red')
+    expect(element).not.toBe(null)
+    expect(element.textContent).toBe('This is red')
+    expect(element.className).toBe('red')
+    // t.is(window.getComputedStyle(element), 'red')
+  })
+
+  test('/stateful', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/stateful'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<div><p>The answer is 42</p></div>')).toBe(true)
+  })
+
+  test('/head', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/head'))
+    const html = window.document.body.innerHTML
+    const metas = window.document.getElementsByTagName('meta')
+    expect(window.document.title).toBe('My title')
+    expect(metas[0].getAttribute('content')).toBe('my meta')
+    expect(html.includes('<div><h1>I can haz meta tags</h1></div>')).toBe(true)
+    // release()
+    // expect(logSpy.getCall(0).args[0]).toBe('Body script!')
+  })
+
+  test('/async-data', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/async-data'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<p>Nuxt.js</p>')).toBe(true)
+  })
+
+  test('/users/1/index.html', async () => {
+    const html = await rp(url('/users/1/index.html'))
+    expect(html.includes('<h1>User: 1</h1>')).toBe(true)
+    expect(
+      existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
+    ).toBe(true)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html'))).toBe(false)
+  })
+
+  test('/users/2', async () => {
+    const html = await rp(url('/users/2'))
+    expect(html.includes('<h1>User: 2</h1>')).toBe(true)
+  })
+
+  test('/users/3 (payload given)', async () => {
+    const html = await rp(url('/users/3'))
+    expect(html.includes('<h1>User: 3000</h1>')).toBe(true)
+  })
+
+  test('/users/4 -> Not found', async () => {
+    await expect(rp(url('/users/4'))).rejects.toMatchObject({
+      statusCode: 404,
+      response: {
+        body: expect.stringContaining('Cannot GET /users/4')
+      }
+    })
+  })
+
+  test('/validate should not be server-rendered', async () => {
+    const html = await rp(url('/validate'))
+    expect(html.includes('<div id="__nuxt"></div>')).toBe(true)
+    expect(html.includes('serverRendered:!1')).toBe(true)
+  })
+
+  test('/validate -> should display a 404', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/validate'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('This page could not be found')).toBe(true)
+  })
+
+  test('/validate?valid=true', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/validate?valid=true'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('I am valid</h1>')).toBe(true)
+  })
+
+  test('/redirect should not be server-rendered', async () => {
+    const html = await rp(url('/redirect'))
+    expect(html.includes('<div id="__nuxt"></div>')).toBe(true)
+    expect(html.includes('serverRendered:!1')).toBe(true)
+  })
+
+  test('/redirect -> check redirected source', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/redirect'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>Index page</h1>')).toBe(true)
+  })
+
+  test('/users/1 not found', async () => {
+    await remove(resolve(rootDir, 'dist/users'))
+    await expect(rp(url('/users/1'))).rejects.toMatchObject({
+      statusCode: 404,
+      response: {
+        body: expect.stringContaining('Cannot GET /users/1')
+      }
+    })
+  })
+
+  test('nuxt re-generating with no subfolders', async () => {
+    // const logSpy = await interceptLog()
+    nuxt.options.generate.subFolders = false
+    await generator.generate()
+    // release()
+    // expect(logSpy.calledWithMatch('DONE')).toBe(true)
+  })
+
+  test('/users/1.html', async () => {
+    const html = await rp(url('/users/1.html'))
+    expect(html.includes('<h1>User: 1</h1>')).toBe(true)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html'))).toBe(true)
+    expect(
+      existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
+    ).toBe(false)
+  })
+
+  test('/-ignored', async () => {
+    await expect(rp(url('/-ignored'))).rejects.toMatchObject({
+      statusCode: 404,
+      response: {
+        body: expect.stringContaining('Cannot GET /-ignored')
+      }
+    })
+  })
+
+  test('/ignored.test', async () => {
+    await expect(rp(url('/ignored.test'))).rejects.toMatchObject({
+      statusCode: 404,
+      response: {
+        body: expect.stringContaining('Cannot GET /ignored.test')
+      }
+    })
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server', async () => {
+    await server.close()
   })
-  server.listen(port)
-})
-
-test.serial('Check ready hook called', async t => {
-  t.true(nuxt.__hook_called__)
-})
-
-test.serial('/stateless', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/stateless'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>My component!</h1>'))
-})
-
-test.serial('/css', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/css'))
-
-  const headHtml = window.document.head.innerHTML
-  t.true(headHtml.includes('.red{color:red}'))
-
-  const element = window.document.querySelector('.red')
-  t.not(element, null)
-  t.is(element.textContent, 'This is red')
-  t.is(element.className, 'red')
-  // t.is(window.getComputedStyle(element), 'red')
-})
-
-test.serial('/stateful', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/stateful'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<div><p>The answer is 42</p></div>'))
-})
-
-test.serial('/head', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/head'))
-  const html = window.document.body.innerHTML
-  const metas = window.document.getElementsByTagName('meta')
-  t.is(window.document.title, 'My title')
-  t.is(metas[0].getAttribute('content'), 'my meta')
-  t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
-  release()
-  t.is(logSpy.getCall(0).args[0], 'Body script!')
-})
-
-test.serial('/async-data', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/async-data'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<p>Nuxt.js</p>'))
-})
-
-test.serial('/users/1/index.html', async t => {
-  const html = await rp(url('/users/1/index.html'))
-  t.true(html.includes('<h1>User: 1</h1>'))
-  t.true(
-    existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
-  )
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html')))
-})
-
-test.serial('/users/2', async t => {
-  const html = await rp(url('/users/2'))
-  t.true(html.includes('<h1>User: 2</h1>'))
-})
-
-test.serial('/users/3 (payload given)', async t => {
-  const html = await rp(url('/users/3'))
-  t.true(html.includes('<h1>User: 3000</h1>'))
-})
-
-test.serial('/users/4 -> Not found', async t => {
-  const error = await t.throws(rp(url('/users/4')))
-  t.true(error.statusCode === 404)
-  t.true(error.response.body.includes('Cannot GET /users/4'))
-})
-
-test.serial('/validate should not be server-rendered', async t => {
-  const html = await rp(url('/validate'))
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(html.includes('serverRendered:!1'))
-})
-
-test.serial('/validate -> should display a 404', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/validate'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('This page could not be found'))
-})
-
-test.serial('/validate?valid=true', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/validate?valid=true'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('I am valid</h1>'))
-})
-
-test.serial('/redirect should not be server-rendered', async t => {
-  const html = await rp(url('/redirect'))
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(html.includes('serverRendered:!1'))
-})
-
-test.serial('/redirect -> check redirected source', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/redirect'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Index page</h1>'))
-})
-
-test.serial('/users/1 not found', async t => {
-  await remove(resolve(rootDir, 'dist/users'))
-  const error = await t.throws(rp(url('/users/1')))
-  t.true(error.statusCode === 404)
-  t.true(error.response.body.includes('Cannot GET /users/1'))
-})
-
-test.serial('nuxt re-generating with no subfolders', async t => {
-  const logSpy = await interceptLog()
-  nuxt.options.generate.subFolders = false
-  await generator.generate()
-  release()
-  t.true(logSpy.calledWithMatch('DONE'))
-})
-
-test.serial('/users/1.html', async t => {
-  const html = await rp(url('/users/1.html'))
-  t.true(html.includes('<h1>User: 1</h1>'))
-  t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html')))
-  t.false(
-    existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
-  )
-})
-
-test.serial('/-ignored', async t => {
-  const error = await t.throws(rp(url('/-ignored')))
-  t.true(error.statusCode === 404)
-  t.true(error.response.body.includes('Cannot GET /-ignored'))
-})
-
-test.serial('/ignored.test', async t => {
-  const error = await t.throws(rp(url('/ignored.test')))
-  t.true(error.statusCode === 404)
-  t.true(error.response.body.includes('Cannot GET /ignored.test'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server', async t => {
-  await server.close()
 })
diff --git a/test/basic.ssr.csp.test.js b/test/basic.ssr.csp.test.js
index 471e46a258..4a7bc3310a 100644
--- a/test/basic.ssr.csp.test.js
+++ b/test/basic.ssr.csp.test.js
@@ -1,125 +1,128 @@
 import { resolve } from 'path'
 
-import test from 'ava'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder } from '..'
 
-import { interceptLog } from './helpers/console'
-
 const port = 4005
 const url = route => 'http://localhost:' + port + route
 
-// Init nuxt.js and create server listening on localhost:4005
-const startCSPTestServer = async (t, csp) => {
+const startCSPTestServer = async (csp) => {
   const options = {
     rootDir: resolve(__dirname, 'fixtures/basic'),
     buildDir: '.nuxt-ssr-csp',
     dev: false,
-    head: {
-      titleTemplate(titleChunk) {
-        return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
-      }
-    },
     build: { stats: false },
     render: { csp }
   }
 
   let nuxt = null
-  const logSpy = await interceptLog(async () => {
-    nuxt = new Nuxt(options)
-    const builder = await new Builder(nuxt)
-    await builder.build()
-    await nuxt.listen(port, '0.0.0.0')
-  })
-
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
+  nuxt = new Nuxt(options)
+  const builder = new Builder(nuxt)
+  await builder.build()
+  await nuxt.listen(port, '0.0.0.0')
 
   return nuxt
 }
 
-test.serial('Not contain Content-Security-Policy header, when csp.enabled is not set', async t => {
-  const nuxt = await startCSPTestServer(t, {})
-  const { headers } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
-  })
+describe('basic ssr csp', () => {
+  test(
+    'Not contain Content-Security-Policy header, when csp.enabled is not set',
+    async () => {
+      const nuxt = await startCSPTestServer({})
+      const { headers } = await rp(url('/stateless'), {
+        resolveWithFullResponse: true
+      })
 
-  t.is(headers['content-security-policy'], undefined)
+      expect(headers['content-security-policy']).toBe(undefined)
 
-  await nuxt.close()
-})
-
-test.serial('Contain Content-Security-Policy header, when csp.enabled is only set', async t => {
-  const cspOption = {
-    enabled: true
-  }
-
-  const nuxt = await startCSPTestServer(t, cspOption)
-  const { headers } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
-  })
-
-  t.regex(headers['content-security-policy'], /^script-src 'self' 'sha256-.*'$/)
-
-  await nuxt.close()
-})
-
-test.serial('Contain Content-Security-Policy header, when csp.allowedSources set', async t => {
-  const cspOption = {
-    enabled: true,
-    allowedSources: ['https://example.com', 'https://example.io']
-  }
-
-  const nuxt = await startCSPTestServer(t, cspOption)
-  const { headers } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
-  })
-
-  t.regex(headers['content-security-policy'], /^script-src 'self' 'sha256-.*'/)
-  t.true(headers['content-security-policy'].includes('https://example.com'))
-  t.true(headers['content-security-policy'].includes('https://example.io'))
-
-  await nuxt.close()
-})
-
-test.serial('Contain Content-Security-Policy header, when csp.policies set', async t => {
-  const cspOption = {
-    enabled: true,
-    policies: {
-      'default-src': [`'none'`],
-      'script-src': ['https://example.com', 'https://example.io']
+      await nuxt.close()
     }
-  }
+  )
 
-  const nuxt = await startCSPTestServer(t, cspOption)
-  const { headers } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
-  })
+  test(
+    'Contain Content-Security-Policy header, when csp.enabled is only set',
+    async () => {
+      const cspOption = {
+        enabled: true
+      }
 
-  t.regex(headers['content-security-policy'], /default-src 'none'/)
-  t.regex(headers['content-security-policy'], /script-src 'self' 'sha256-.*'/)
-  t.true(headers['content-security-policy'].includes('https://example.com'))
-  t.true(headers['content-security-policy'].includes('https://example.io'))
+      const nuxt = await startCSPTestServer(cspOption)
+      const { headers } = await rp(url('/stateless'), {
+        resolveWithFullResponse: true
+      })
 
-  await nuxt.close()
-})
+      expect(headers['content-security-policy']).toMatch(/^script-src 'self' 'sha256-.*'$/)
 
-test.serial('Contain Content-Security-Policy header, when csp.policies.script-src is not set', async t => {
-  const cspOption = {
-    enabled: true,
-    policies: {
-      'default-src': [`'none'`]
+      await nuxt.close()
     }
-  }
+  )
 
-  const nuxt = await startCSPTestServer(t, cspOption)
-  const { headers } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
-  })
+  test(
+    'Contain Content-Security-Policy header, when csp.allowedSources set',
+    async () => {
+      const cspOption = {
+        enabled: true,
+        allowedSources: ['https://example.com', 'https://example.io']
+      }
 
-  t.regex(headers['content-security-policy'], /default-src 'none'/)
-  t.regex(headers['content-security-policy'], /script-src 'self' 'sha256-.*'/)
+      const nuxt = await startCSPTestServer(cspOption)
+      const { headers } = await rp(url('/stateless'), {
+        resolveWithFullResponse: true
+      })
 
-  await nuxt.close()
+      expect(headers['content-security-policy']).toMatch(/^script-src 'self' 'sha256-.*'/)
+      expect(headers['content-security-policy'].includes('https://example.com')).toBe(true)
+      expect(headers['content-security-policy'].includes('https://example.io')).toBe(true)
+
+      await nuxt.close()
+    }
+  )
+
+  test(
+    'Contain Content-Security-Policy header, when csp.policies set',
+    async () => {
+      const cspOption = {
+        enabled: true,
+        policies: {
+          'default-src': [`'none'`],
+          'script-src': ['https://example.com', 'https://example.io']
+        }
+      }
+
+      const nuxt = await startCSPTestServer(cspOption)
+      const { headers } = await rp(url('/stateless'), {
+        resolveWithFullResponse: true
+      })
+
+      expect(headers['content-security-policy']).toMatch(/default-src 'none'/)
+      expect(headers['content-security-policy']).toMatch(/script-src 'self' 'sha256-.*'/)
+      expect(headers['content-security-policy'].includes('https://example.com')).toBe(true)
+      expect(headers['content-security-policy'].includes('https://example.io')).toBe(true)
+
+      await nuxt.close()
+    }
+  )
+
+  test(
+    'Contain Content-Security-Policy header, when csp.policies.script-src is not set',
+    async () => {
+      const cspOption = {
+        enabled: true,
+        policies: {
+          'default-src': [`'none'`]
+        }
+      }
+
+      const nuxt = await startCSPTestServer(cspOption)
+      const { headers } = await rp(url('/stateless'), {
+        resolveWithFullResponse: true
+      })
+
+      expect(headers['content-security-policy']).toMatch(/default-src 'none'/)
+      expect(headers['content-security-policy']).toMatch(/script-src 'self' 'sha256-.*'/)
+
+      await nuxt.close()
+    }
+  )
 })
diff --git a/test/basic.ssr.test.js b/test/basic.ssr.test.js
index 1d4415e73c..16c775339c 100644
--- a/test/basic.ssr.test.js
+++ b/test/basic.ssr.test.js
@@ -1,312 +1,285 @@
-import { resolve } from 'path'
-
-import test from 'ava'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder } from '..'
 
-import { interceptLog, interceptError, release } from './helpers/console'
+import { loadConfig } from './helpers/config'
 
 const port = 4004
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 
-// Init nuxt.js and create server listening on localhost:4004
-test.serial('Init Nuxt.js', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    buildDir: '.nuxt-ssr',
-    dev: false,
-    head: {
-      titleTemplate(titleChunk) {
-        return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
+describe('basic ssr', () => {
+  // Init nuxt.js and create server listening on localhost:4004
+  beforeAll(async () => {
+    const options = loadConfig('basic', {
+      buildDir: '.nuxt-ssr',
+      dev: false,
+      build: {
+        stats: false
       }
-    },
-    build: {
-      stats: false
-    }
-  }
+    })
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(options)
-    const builder = await new Builder(nuxt)
+    const builder = new Builder(nuxt)
     await builder.build()
     await nuxt.listen(port, '0.0.0.0')
+  }, 30000)
+
+  test('/stateless', async () => {
+    const { html } = await nuxt.renderRoute('/stateless')
+    expect(html.includes('<h1>My component!</h1>')).toBe(true)
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  /*
+  ** Example of testing via dom checking
+  */
+  test('/css', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/css'))
 
-test('/stateless', async t => {
-  const { html } = await nuxt.renderRoute('/stateless')
-  t.true(html.includes('<h1>My component!</h1>'))
-})
+    const headHtml = window.document.head.innerHTML
+    expect(headHtml.includes('color:red')).toBe(true)
 
-/*
-** Example of testing via dom checking
-*/
-test('/css', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/css'))
-
-  const headHtml = window.document.head.innerHTML
-  t.true(headHtml.includes('color:red'))
-
-  const element = window.document.querySelector('.red')
-  t.not(element, null)
-  t.is(element.textContent, 'This is red')
-  t.is(element.className, 'red')
-  // t.is(window.getComputedStyle(element).color, 'red')
-})
-
-test('/postcss', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/css'))
-
-  const headHtml = window.document.head.innerHTML
-  t.true(headHtml.includes('background-color:blue'))
-
-  // const element = window.document.querySelector('div.red')
-  // t.is(window.getComputedStyle(element)['background-color'], 'blue')
-})
-
-test('/stateful', async t => {
-  const { html } = await nuxt.renderRoute('/stateful')
-  t.true(html.includes('<div><p>The answer is 42</p></div>'))
-})
-
-test('/store', async t => {
-  const { html } = await nuxt.renderRoute('/store')
-  t.true(html.includes('<h1>Vuex Nested Modules</h1>'))
-  t.true(html.includes('<p>1</p>'))
-})
-
-test.serial('/head', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/head'), {
-    virtualConsole: false
+    const element = window.document.querySelector('.red')
+    expect(element).not.toBe(null)
+    expect(element.textContent).toBe('This is red')
+    expect(element.className).toBe('red')
+    // t.is(window.getComputedStyle(element).color, 'red')
   })
-  t.is(window.document.title, 'My title - Nuxt.js')
 
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<div><h1>I can haz meta tags</h1></div>'))
-  t.true(
-    html.includes('<script data-n-head="true" src="/body.js" data-body="true">')
-  )
+  test('/postcss', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/css'))
 
-  const metas = window.document.getElementsByTagName('meta')
-  t.is(metas[0].getAttribute('content'), 'my meta')
-  release()
+    const headHtml = window.document.head.innerHTML
+    expect(headHtml.includes('background-color:blue')).toBe(true)
 
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Body script!')
-})
-
-test('/async-data', async t => {
-  const { html } = await nuxt.renderRoute('/async-data')
-  t.true(html.includes('<p>Nuxt.js</p>'))
-})
-
-test('/await-async-data', async t => {
-  const { html } = await nuxt.renderRoute('/await-async-data')
-  t.true(html.includes('<p>Await Nuxt.js</p>'))
-})
-
-test('/callback-async-data', async t => {
-  const { html } = await nuxt.renderRoute('/callback-async-data')
-  t.true(html.includes('<p>Callback Nuxt.js</p>'))
-})
-
-test('/users/1', async t => {
-  const { html } = await nuxt.renderRoute('/users/1')
-  t.true(html.includes('<h1>User: 1</h1>'))
-})
-
-test('/validate should display a 404', async t => {
-  const { html } = await nuxt.renderRoute('/validate')
-  t.true(html.includes('This page could not be found'))
-})
-
-test('/validate?valid=true', async t => {
-  const { html } = await nuxt.renderRoute('/validate?valid=true')
-  t.true(html.includes('<h1>I am valid</h1>'))
-})
-
-test('/redirect', async t => {
-  const { html, redirected } = await nuxt.renderRoute('/redirect')
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(redirected.path === '/')
-  t.true(redirected.status === 302)
-})
-
-test('/redirect -> check redirected source', async t => {
-  // there are no transition properties in jsdom, ignore the error log
-  await interceptError()
-  const window = await nuxt.renderAndGetWindow(url('/redirect'))
-  release()
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Index page</h1>'))
-})
-
-test('/redirect -> external link', async t => {
-  let _headers, _status
-  const { html } = await nuxt.renderRoute('/redirect-external', {
-    res: {
-      writeHead(status, headers) {
-        _status = status
-        _headers = headers
-      },
-      end() {}
-    }
+    // const element = window.document.querySelector('div.red')
+    // t.is(window.getComputedStyle(element)['background-color'], 'blue')
   })
-  t.is(_status, 302)
-  t.is(_headers.Location, 'https://nuxtjs.org')
-  t.true(html.includes('<div data-server-rendered="true"></div>'))
-})
 
-test('/special-state -> check window.__NUXT__.test = true', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/special-state'))
-  t.is(window.document.title, 'Nuxt.js')
-  t.is(window.__NUXT__.test, true)
-})
+  test('/stateful', async () => {
+    const { html } = await nuxt.renderRoute('/stateful')
+    expect(html.includes('<div><p>The answer is 42</p></div>')).toBe(true)
+  })
 
-test('/error', async t => {
-  const err = await t.throws(nuxt.renderRoute('/error', { req: {}, res: {} }))
-  t.true(err.message.includes('Error mouahahah'))
-})
+  test('/store', async () => {
+    const { html } = await nuxt.renderRoute('/store')
+    expect(html.includes('<h1>Vuex Nested Modules</h1>')).toBe(true)
+    expect(html.includes('<p>1</p>')).toBe(true)
+  })
 
-test.serial('/error status code', async t => {
-  const errorSpy = await interceptError()
-  const err = await t.throws(rp(url('/error')))
-  t.true(err.statusCode === 500)
-  t.true(
-    err.response.body.includes(
-      'An error occurred in the application and your page could not be served'
-    )
-  )
-  release()
-  t.true(errorSpy.calledOnce)
-  t.true(errorSpy.args[0][0].message.includes('Error mouahahah'))
-})
+  test('/head', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/head'), {
+      virtualConsole: false
+    })
+    expect(window.document.title).toBe('My title - Nuxt.js')
 
-test('/error2', async t => {
-  const { html, error } = await nuxt.renderRoute('/error2')
-  t.true(html.includes('Custom error'))
-  t.true(error.message.includes('Custom error'))
-  t.true(error.statusCode === undefined)
-})
+    const html = window.document.body.innerHTML
+    expect(html.includes('<div><h1>I can haz meta tags</h1></div>')).toBe(true)
+    expect(
+      html.includes('<script data-n-head="true" src="/body.js" data-body="true">')
+    ).toBe(true)
 
-test('/error2 status code', async t => {
-  const error = await t.throws(rp(url('/error2')))
-  t.is(error.statusCode, 500)
-  t.true(error.response.body.includes('Custom error'))
-})
+    const metas = window.document.getElementsByTagName('meta')
+    expect(metas[0].getAttribute('content')).toBe('my meta')
+    // release()
 
-test.serial('/error-midd', async t => {
-  const errorSpy = await interceptError()
-  const err = await t.throws(rp(url('/error-midd')))
-  t.is(err.statusCode, 505)
-  t.true(err.response.body.includes('Middleware Error'))
-  release()
-  // Don't display error since redirect returns a noopApp
-  t.true(errorSpy.notCalled)
-})
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Body script!')
+  })
 
-test.serial('/redirect-middleware', async t => {
-  const errorSpy = await interceptError()
-  await rp(url('/redirect-middleware')) // Should not console.error
-  release()
-  // Don't display error since redirect returns a noopApp
-  t.true(errorSpy.notCalled)
-})
+  test('/async-data', async () => {
+    const { html } = await nuxt.renderRoute('/async-data')
+    expect(html.includes('<p>Nuxt.js</p>')).toBe(true)
+  })
 
-test('/redirect-name', async t => {
-  const { html, redirected } = await nuxt.renderRoute('/redirect-name')
-  t.true(html.includes('<div id="__nuxt"></div>'))
-  t.true(redirected.path === '/stateless')
-  t.true(redirected.status === 302)
-})
+  test('/await-async-data', async () => {
+    const { html } = await nuxt.renderRoute('/await-async-data')
+    expect(html.includes('<p>Await Nuxt.js</p>')).toBe(true)
+  })
 
-test('/no-ssr', async t => {
-  const { html } = await nuxt.renderRoute('/no-ssr')
-  t.true(
-    html.includes(
+  test('/callback-async-data', async () => {
+    const { html } = await nuxt.renderRoute('/callback-async-data')
+    expect(html.includes('<p>Callback Nuxt.js</p>')).toBe(true)
+  })
+
+  test('/users/1', async () => {
+    const { html } = await nuxt.renderRoute('/users/1')
+    expect(html.includes('<h1>User: 1</h1>')).toBe(true)
+  })
+
+  test('/validate should display a 404', async () => {
+    const { html } = await nuxt.renderRoute('/validate')
+    expect(html.includes('This page could not be found')).toBe(true)
+  })
+
+  test('/validate?valid=true', async () => {
+    const { html } = await nuxt.renderRoute('/validate?valid=true')
+    expect(html.includes('<h1>I am valid</h1>')).toBe(true)
+  })
+
+  test('/redirect', async () => {
+    const { html, redirected } = await nuxt.renderRoute('/redirect')
+    expect(html.includes('<div id="__nuxt"></div>')).toBe(true)
+    expect(redirected.path === '/').toBe(true)
+    expect(redirected.status === 302).toBe(true)
+  })
+
+  test('/redirect -> check redirected source', async () => {
+    // there are no transition properties in jsdom, ignore the error log
+    // await interceptError()
+    const window = await nuxt.renderAndGetWindow(url('/redirect'))
+    // release()
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>Index page</h1>')).toBe(true)
+  })
+
+  test('/redirect -> external link', async () => {
+    let _headers, _status
+    const { html } = await nuxt.renderRoute('/redirect-external', {
+      res: {
+        writeHead(status, headers) {
+          _status = status
+          _headers = headers
+        },
+        end() { }
+      }
+    })
+    expect(_status).toBe(302)
+    expect(_headers.Location).toBe('https://nuxtjs.org')
+    expect(html.includes('<div data-server-rendered="true"></div>')).toBe(true)
+  })
+
+  test('/special-state -> check window.__NUXT__.test = true', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/special-state'))
+    expect(window.document.title).toBe('Nuxt.js')
+    expect(window.__NUXT__.test).toBe(true)
+  })
+
+  test('/error', async () => {
+    await expect(nuxt.renderRoute('/error', { req: {}, res: {} }))
+      .rejects.toThrow('Error mouahahah')
+  })
+
+  test('/error status code', async () => {
+    // const errorSpy = await interceptError()
+    await expect(rp(url('/error'))).rejects.toMatchObject({
+      statusCode: 500
+    })
+    // release()
+    // expect(errorSpy.calledOnce).toBe(true)
+    // expect(errorSpy.args[0][0].message.includes('Error mouahahah')).toBe(true)
+  })
+
+  test('/error2', async () => {
+    const { html, error } = await nuxt.renderRoute('/error2')
+    expect(html.includes('Custom error')).toBe(true)
+    expect(error.message.includes('Custom error')).toBe(true)
+    expect(error.statusCode === undefined).toBe(true)
+  })
+
+  test('/error2 status code', async () => {
+    await expect(rp(url('/error2'))).rejects.toMatchObject({
+      statusCode: 500,
+      message: expect.stringContaining('Custom error')
+    })
+  })
+
+  test('/error-midd', async () => {
+    // const errorSpy = await interceptError()
+    await expect(rp(url('/error-midd')))
+      .rejects.toMatchObject({ statusCode: 505 })
+    // release()
+    // Don't display error since redirect returns a noopApp
+    // expect(errorSpy.notCalled).toBe(true)
+  })
+
+  test('/redirect-middleware', async () => {
+    // const errorSpy = await interceptError()
+    await rp(url('/redirect-middleware')) // Should not console.error
+    // release()
+    // Don't display error since redirect returns a noopApp
+    // expect(errorSpy.notCalled).toBe(true)
+  })
+
+  test('/redirect-name', async () => {
+    const { html, redirected } = await nuxt.renderRoute('/redirect-name')
+    expect(html.includes('<div id="__nuxt"></div>')).toBe(true)
+    expect(redirected.path === '/stateless').toBe(true)
+    expect(redirected.status === 302).toBe(true)
+  })
+
+  test('/no-ssr', async () => {
+    const { html } = await nuxt.renderRoute('/no-ssr')
+    expect(html.includes(
       '<div class="no-ssr-placeholder">&lt;p&gt;Loading...&lt;/p&gt;</div>'
-    )
-  )
-})
-
-test('/no-ssr (client-side)', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/no-ssr'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('Displayed only on client-side</h1>'))
-})
-
-test('ETag Header', async t => {
-  const { headers: { etag } } = await rp(url('/stateless'), {
-    resolveWithFullResponse: true
+    )).toBe(true)
   })
-  // Verify functionality
-  const error = await t.throws(
-    rp(url('/stateless'), { headers: { 'If-None-Match': etag } })
-  )
-  t.is(error.statusCode, 304)
-})
 
-test('/_nuxt/server-bundle.json should return 404', async t => {
-  const err = await t.throws(
-    rp(url('/_nuxt/server-bundle.json'), { resolveWithFullResponse: true })
-  )
-  t.is(err.statusCode, 404)
-})
+  test('/no-ssr (client-side)', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/no-ssr'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('Displayed only on client-side</h1>')).toBe(true)
+  })
 
-test('/_nuxt/ should return 404', async t => {
-  const err = await t.throws(
-    rp(url('/_nuxt/'), { resolveWithFullResponse: true })
-  )
-  t.is(err.statusCode, 404)
-})
+  test('ETag Header', async () => {
+    const { headers: { etag } } = await rp(url('/stateless'), {
+      resolveWithFullResponse: true
+    })
+    // Verify functionality
+    await expect(rp(url('/stateless'), { headers: { 'If-None-Match': etag } }))
+      .rejects.toMatchObject({ statusCode: 304 })
+  })
 
-test('/meta', async t => {
-  const { html } = await nuxt.renderRoute('/meta')
-  t.true(html.includes('"meta":[{"works":true}]'))
-})
+  test('/_nuxt/server-bundle.json should return 404', async () => {
+    await expect(rp(url('/_nuxt/server-bundle.json')))
+      .rejects.toMatchObject({ statusCode: 404 })
+  })
 
-test('/fn-midd', async t => {
-  const err = await t.throws(
-    rp(url('/fn-midd'), { resolveWithFullResponse: true })
-  )
-  t.is(err.statusCode, 403)
-  t.true(err.response.body.includes('You need to ask the permission'))
-})
+  test('/_nuxt/ should return 404', async () => {
+    await expect(rp(url('/_nuxt/')))
+      .rejects.toMatchObject({ statusCode: 404 })
+  })
 
-test('/fn-midd?please=true', async t => {
-  const { html } = await nuxt.renderRoute('/fn-midd?please=true')
-  t.true(html.includes('<h1>Date:'))
-})
+  test('/meta', async () => {
+    const { html } = await nuxt.renderRoute('/meta')
+    expect(html.includes('"meta":[{"works":true}]')).toBe(true)
+  })
 
-test('/router-guard', async t => {
-  const { html } = await nuxt.renderRoute('/router-guard')
-  t.true(html.includes('<p>Nuxt.js</p>'))
-  t.false(html.includes('Router Guard'))
-})
+  test('/fn-midd', async () => {
+    await expect(rp(url('/fn-midd')))
+      .rejects.toMatchObject({ statusCode: 403 })
+  })
 
-test('/jsx', async t => {
-  const { html } = await nuxt.renderRoute('/jsx')
-  t.true(html.includes('<h1>JSX Page</h1>'))
-})
+  test('/fn-midd?please=true', async () => {
+    const { html } = await nuxt.renderRoute('/fn-midd?please=true')
+    expect(html.includes('<h1>Date:')).toBe(true)
+  })
 
-test('/jsx-link', async t => {
-  const { html } = await nuxt.renderRoute('/jsx-link')
-  t.true(html.includes('<h1>JSX Link Page</h1>'))
-})
+  test('/router-guard', async () => {
+    const { html } = await nuxt.renderRoute('/router-guard')
+    expect(html.includes('<p>Nuxt.js</p>')).toBe(true)
+    expect(html.includes('Router Guard')).toBe(false)
+  })
 
-test('/js-link', async t => {
-  const { html } = await nuxt.renderRoute('/js-link')
-  t.true(html.includes('<h1>vue file is first-class</h1>'))
-})
+  test('/jsx', async () => {
+    const { html } = await nuxt.renderRoute('/jsx')
+    expect(html.includes('<h1>JSX Page</h1>')).toBe(true)
+  })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  test('/jsx-link', async () => {
+    const { html } = await nuxt.renderRoute('/jsx-link')
+    expect(html.includes('<h1>JSX Link Page</h1>')).toBe(true)
+  })
+
+  test('/js-link', async () => {
+    const { html } = await nuxt.renderRoute('/js-link')
+    expect(html.includes('<h1>vue file is first-class</h1>')).toBe(true)
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/children.patch.test.js b/test/children.patch.test.js
index befcb646b8..c388f49eaf 100644
--- a/test/children.patch.test.js
+++ b/test/children.patch.test.js
@@ -1,11 +1,8 @@
 import { resolve } from 'path'
 
-import test from 'ava'
-
 import { Nuxt, Builder, Utils } from '..'
 
 import * as browser from './helpers/browser'
-import { interceptLog } from './helpers/console'
 
 const port = 4014
 const url = route => 'http://localhost:' + port + route
@@ -14,136 +11,133 @@ let nuxt = null
 let page
 const dates = {}
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/children'),
-    buildDir: '.nuxt-patch',
-    dev: false,
-    build: {
-      stats: false
+describe('children patch', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const options = {
+      rootDir: resolve(__dirname, 'fixtures/children'),
+      buildDir: '.nuxt-patch',
+      dev: false,
+      build: {
+        stats: false
+      }
     }
-  }
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(options)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('Start browser', async () => {
+    expect.assertions(0) // suppress 'no assertions' warning
+    await browser.start({
+      // slowMo: 50,
+      // headless: false
+    })
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('Loading /patch and keep ', async () => {
+    page = await browser.page(url('/patch'))
 
-test.serial('Start browser', async t => {
-  t.plan(0) // suppress 'no assertions' warning
-  await browser.start({
-    // slowMo: 50,
-    // headless: false
+    const h1 = await page.$text('h1')
+    expect(h1.includes('patch:')).toBe(true)
+    const h2 = await page.$text('h2')
+    expect(h2).toBe('Index')
+    dates.patch = await page.$text('[data-date-patch]')
+  })
+
+  test('Navigate to /patch/1', async () => {
+    const { hook } = await page.nuxt.navigate('/patch/1', false)
+    const loading = await page.nuxt.loadingData()
+    expect(loading.show).toBe(true)
+    await hook
+
+    const h2 = await page.$text('h2')
+    expect(h2.includes('_id:')).toBe(true)
+    dates.id = await page.$text('[data-date-id]')
+
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+  })
+
+  test('Navigate to /patch/2', async () => {
+    await page.nuxt.navigate('/patch/2')
+    const date = await page.$text('[data-date-id]')
+
+    expect(await page.$text('h3')).toBe('Index')
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(+dates.id < +date).toBe(true)
+    dates.id = date
+  })
+
+  test('Navigate to /patch/2?test=true', async () => {
+    await page.nuxt.navigate('/patch/2?test=true')
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(dates.id).toBe(await page.$text('[data-date-id]'))
+  })
+
+  test('Navigate to /patch/2#test', async () => {
+    await page.nuxt.navigate('/patch/2#test')
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(dates.id).toBe(await page.$text('[data-date-id]'))
+  })
+
+  test('Navigate to /patch/2/child', async () => {
+    await page.nuxt.navigate('/patch/2/child')
+    dates.child = await page.$text('[data-date-child]')
+    dates.slug = await page.$text('[data-date-child-slug]')
+
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(dates.id).toBe(await page.$text('[data-date-id]'))
+    expect(+dates.child > +dates.id).toBe(true)
+    expect(+dates.slug > +dates.child).toBe(true)
+  })
+
+  test('Navigate to /patch/2/child/1', async () => {
+    await page.nuxt.navigate('/patch/2/child/1')
+    const date = await page.$text('[data-date-child-slug]')
+
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(dates.id).toBe(await page.$text('[data-date-id]'))
+    expect(dates.child).toBe(await page.$text('[data-date-child]'))
+    expect(+date > +dates.slug).toBe(true)
+    dates.slug = date
+  })
+
+  test('Navigate to /patch/2/child/1?foo=bar', async () => {
+    await page.nuxt.navigate('/patch/2/child/1?foo=bar')
+
+    expect(dates.patch).toBe(await page.$text('[data-date-patch]'))
+    expect(dates.id).toBe(await page.$text('[data-date-id]'))
+    expect(dates.child).toBe(await page.$text('[data-date-child]'))
+    expect(dates.slug).toBe(await page.$text('[data-date-child-slug]'))
+  })
+
+  test('Search a country', async () => {
+    const countries = await page.$$text('[data-test-search-result]')
+    expect(countries.length).toBe(5)
+
+    await page.type('[data-test-search-input]', 'gu')
+
+    await Utils.waitFor(250)
+    const newCountries = await page.$$text('[data-test-search-result]')
+    expect(newCountries.length).toBe(1)
+    expect(newCountries).toEqual(['Guinea'])
+    expect(await page.nuxt.routeData()).toEqual({
+      path: '/patch/2/child/1',
+      query: {
+        foo: 'bar',
+        q: 'gu'
+      }
+    })
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
+
+  test('Stop browser', async () => {
+    await page.close()
+    await browser.stop()
   })
 })
-
-test.serial('Loading /patch and keep ', async t => {
-  page = await browser.page(url('/patch'))
-
-  const h1 = await page.$text('h1')
-  t.true(h1.includes('patch:'))
-  const h2 = await page.$text('h2')
-  t.is(h2, 'Index')
-  dates.patch = await page.$text('[data-date-patch]')
-})
-
-test.serial('Navigate to /patch/1', async t => {
-  const { hook } = await page.nuxt.navigate('/patch/1', false)
-  const loading = await page.nuxt.loadingData()
-  t.is(loading.show, true)
-  await hook
-
-  const h2 = await page.$text('h2')
-  t.true(h2.includes('_id:'))
-  dates.id = await page.$text('[data-date-id]')
-
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-})
-
-test.serial('Navigate to /patch/2', async t => {
-  await page.nuxt.navigate('/patch/2')
-  const date = await page.$text('[data-date-id]')
-
-  t.is(await page.$text('h3'), 'Index')
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.true(+dates.id < +date)
-  dates.id = date
-})
-
-test.serial('Navigate to /patch/2?test=true', async t => {
-  await page.nuxt.navigate('/patch/2?test=true')
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.is(dates.id, await page.$text('[data-date-id]'))
-})
-
-test.serial('Navigate to /patch/2#test', async t => {
-  await page.nuxt.navigate('/patch/2#test')
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.is(dates.id, await page.$text('[data-date-id]'))
-})
-
-test.serial('Navigate to /patch/2/child', async t => {
-  await page.nuxt.navigate('/patch/2/child')
-  dates.child = await page.$text('[data-date-child]')
-  dates.slug = await page.$text('[data-date-child-slug]')
-
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.is(dates.id, await page.$text('[data-date-id]'))
-  t.true(+dates.child > +dates.id)
-  t.true(+dates.slug > +dates.child)
-})
-
-test.serial('Navigate to /patch/2/child/1', async t => {
-  await page.nuxt.navigate('/patch/2/child/1')
-  const date = await page.$text('[data-date-child-slug]')
-
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.is(dates.id, await page.$text('[data-date-id]'))
-  t.is(dates.child, await page.$text('[data-date-child]'))
-  t.true(+date > +dates.slug)
-  dates.slug = date
-})
-
-test.serial('Navigate to /patch/2/child/1?foo=bar', async t => {
-  await page.nuxt.navigate('/patch/2/child/1?foo=bar')
-
-  t.is(dates.patch, await page.$text('[data-date-patch]'))
-  t.is(dates.id, await page.$text('[data-date-id]'))
-  t.is(dates.child, await page.$text('[data-date-child]'))
-  t.is(dates.slug, await page.$text('[data-date-child-slug]'))
-})
-
-test.serial('Search a country', async t => {
-  const countries = await page.$$text('[data-test-search-result]')
-  t.is(countries.length, 5)
-
-  await page.type('[data-test-search-input]', 'gu')
-
-  await Utils.waitFor(250)
-  const newCountries = await page.$$text('[data-test-search-result]')
-  t.is(newCountries.length, 1)
-  t.deepEqual(newCountries, ['Guinea'])
-  t.deepEqual(await page.nuxt.routeData(), {
-    path: '/patch/2/child/1',
-    query: {
-      foo: 'bar',
-      q: 'gu'
-    }
-  })
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
-})
-
-test.after.always('Stop browser', async t => {
-  await page.close()
-  await browser.stop()
-})
diff --git a/test/children.test.js b/test/children.test.js
index 8e15e8168d..c310aa1b3a 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,71 +1,64 @@
 import { resolve } from 'path'
 
-import test from 'ava'
-
 import { Nuxt, Builder } from '..'
 
-import { interceptLog } from './helpers/console'
-
 const port = 4013
 // const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/children'),
-    dev: false,
-    build: {
-      stats: false
+describe('children', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const options = {
+      rootDir: resolve(__dirname, 'fixtures/children'),
+      dev: false,
+      build: {
+        stats: false
+      }
     }
-  }
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(options)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('/parent', async () => {
+    const { html } = await nuxt.renderRoute('/parent')
+    expect(html.includes('<h1>I am the parent</h1>')).toBe(true)
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('/parent/child', async () => {
+    const { html } = await nuxt.renderRoute('/parent/child')
+    expect(html.includes('<h1>I am the parent</h1>')).toBe(true)
+    expect(html.includes('<h2>I am the child</h2>')).toBe(true)
+  })
 
-test('/parent', async t => {
-  const { html } = await nuxt.renderRoute('/parent')
-  t.true(html.includes('<h1>I am the parent</h1>'))
-})
+  test('/parent should call _id.vue', async () => {
+    const { html } = await nuxt.renderRoute('/parent')
+    expect(html.includes('<h1>I am the parent</h1>')).toBe(true)
+    expect(html.includes('<h2>Id=</h2>')).toBe(true)
+  })
 
-test('/parent/child', async t => {
-  const { html } = await nuxt.renderRoute('/parent/child')
-  t.true(html.includes('<h1>I am the parent</h1>'))
-  t.true(html.includes('<h2>I am the child</h2>'))
-})
+  test('/parent/1', async () => {
+    const { html } = await nuxt.renderRoute('/parent/1')
+    expect(html.includes('<h1>I am the parent</h1>')).toBe(true)
+    expect(html.includes('<h2>Id=1</h2>')).toBe(true)
+  })
 
-test('/parent should call _id.vue', async t => {
-  const { html } = await nuxt.renderRoute('/parent')
-  t.true(html.includes('<h1>I am the parent</h1>'))
-  t.true(html.includes('<h2>Id=</h2>'))
-})
+  test('/parent/validate-child should display 404', async () => {
+    const { html } = await nuxt.renderRoute('/parent/validate-child')
+    expect(html.includes('This page could not be found')).toBe(true)
+  })
 
-test('/parent/1', async t => {
-  const { html } = await nuxt.renderRoute('/parent/1')
-  t.true(html.includes('<h1>I am the parent</h1>'))
-  t.true(html.includes('<h2>Id=1</h2>'))
-})
+  test('/parent/validate-child?key=12345', async () => {
+    const { html } = await nuxt.renderRoute('/parent/validate-child?key=12345')
+    expect(html.includes('<h1>I am the parent</h1>')).toBe(true)
+    expect(html.includes('<h2>Child valid</h2>')).toBe(true)
+  })
 
-test('/parent/validate-child should display 404', async t => {
-  const { html } = await nuxt.renderRoute('/parent/validate-child')
-  t.true(html.includes('This page could not be found'))
-})
-
-test('/parent/validate-child?key=12345', async t => {
-  const { html } = await nuxt.renderRoute('/parent/validate-child?key=12345')
-  t.true(html.includes('<h1>I am the parent</h1>'))
-  t.true(html.includes('<h2>Child valid</h2>'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/cli.test.js b/test/cli.test.js
index 4d8449a58c..19bc0a5ae2 100644
--- a/test/cli.test.js
+++ b/test/cli.test.js
@@ -1,5 +1,4 @@
 import { promisify } from 'util'
-import test from 'ava'
 import { resolve } from 'path'
 import rp from 'request-promise-native'
 import { exec, spawn } from 'child_process'
@@ -13,84 +12,88 @@ const url = route => 'http://localhost:' + port + route
 
 const nuxtBin = resolve(__dirname, '..', 'bin', 'nuxt')
 
-test.serial('nuxt build', async t => {
-  const { stdout } = await execify(`node ${nuxtBin} build ${rootDir}`)
+describe('cli', () => {
+  test('nuxt build', async () => {
+    const { stdout } = await execify(`node ${nuxtBin} build ${rootDir}`)
 
-  t.true(stdout.includes('Compiled successfully'))
-})
-
-test.serial('nuxt build -> error config', async t => {
-  const { stderr } = await t.throws(execify(`node ${nuxtBin} build ${rootDir} -c config.js`))
-  t.true(stderr.includes('Could not load config file'))
-})
-
-test.serial('nuxt start', async t => {
-  let stdout = ''
-  // let stderr = ''
-  let error
-  let exitCode
-
-  const env = process.env
-  env.PORT = port
-
-  const nuxtStart = spawn('node', [nuxtBin, 'start', rootDir], { env: env })
-
-  nuxtStart.stdout.on('data', data => {
-    stdout += data
+    expect(stdout.includes('Compiled successfully')).toBe(true)
   })
 
-  nuxtStart.stderr.on('data', data => {
-    // stderr += data
+  test('nuxt build -> error config', async () => {
+    await expect(execify(`node ${nuxtBin} build ${rootDir} -c config.js`)).rejects.toMatchObject({
+      stderr: expect.stringContaining('Could not load config file')
+    })
   })
 
-  nuxtStart.on('error', err => {
-    error = err
+  test('nuxt start', async () => {
+    let stdout = ''
+    // let stderr = ''
+    let error
+    let exitCode
+
+    const env = process.env
+    env.PORT = port
+
+    const nuxtStart = spawn('node', [nuxtBin, 'start', rootDir], { env: env })
+
+    nuxtStart.stdout.on('data', data => {
+      stdout += data
+    })
+
+    nuxtStart.stderr.on('data', data => {
+      // stderr += data
+    })
+
+    nuxtStart.on('error', err => {
+      error = err
+    })
+
+    nuxtStart.on('close', code => {
+      exitCode = code
+    })
+
+    // Give the process max 20s to start
+    let iterator = 0
+    while (!stdout.includes('OPEN') && iterator < 80) {
+      await Utils.waitFor(250)
+      iterator++
+    }
+
+    if (iterator === 80) {
+      test.log('WARN: server failed to start successfully in 20 seconds')
+    }
+
+    expect(error).toBe(undefined)
+    expect(stdout.includes('OPEN')).toBe(true)
+
+    const html = await rp(url('/users/1'))
+    expect(html.includes('<h1>User: 1</h1>')).toBe(true)
+
+    nuxtStart.kill()
+
+    // Wait max 10s for the process to be killed
+    iterator = 0
+    // eslint-disable-next-line  no-unmodified-loop-condition
+    while (exitCode === undefined && iterator < 40) {
+      await Utils.waitFor(250)
+      iterator++
+    }
+
+    if (iterator >= 40) {
+      // eslint-disable-line no-console
+      test.log(
+        `WARN: we were unable to automatically kill the child process with pid: ${
+          nuxtStart.pid
+        }`
+      )
+    }
+
+    expect(exitCode).toBe(null)
   })
 
-  nuxtStart.on('close', code => {
-    exitCode = code
+  test('nuxt generate', async () => {
+    const { stdout } = await execify(`node ${nuxtBin} generate ${rootDir}`)
+
+    expect(stdout.includes('vue-ssr-client-manifest.json')).toBe(true)
   })
-
-  // Give the process max 20s to start
-  let iterator = 0
-  while (!stdout.includes('OPEN') && iterator < 80) {
-    await Utils.waitFor(250)
-    iterator++
-  }
-
-  if (iterator === 80) {
-    t.log('WARN: server failed to start successfully in 20 seconds')
-  }
-
-  t.is(error, undefined)
-  t.true(stdout.includes('OPEN'))
-
-  const html = await rp(url('/users/1'))
-  t.true(html.includes('<h1>User: 1</h1>'))
-
-  nuxtStart.kill()
-
-  // Wait max 10s for the process to be killed
-  iterator = 0
-  // eslint-disable-next-line  no-unmodified-loop-condition
-  while (exitCode === undefined && iterator < 40) {
-    await Utils.waitFor(250)
-    iterator++
-  }
-
-  if (iterator >= 40) {
-    t.log(
-      `WARN: we were unable to automatically kill the child process with pid: ${
-        nuxtStart.pid
-      }`
-    )
-  }
-
-  t.is(exitCode, null)
-})
-
-test.serial('nuxt generate', async t => {
-  const { stdout } = await execify(`node ${nuxtBin} generate ${rootDir}`)
-
-  t.true(stdout.includes('vue-ssr-client-manifest.json'))
 })
diff --git a/test/custom-dirs.test.js b/test/custom-dirs.test.js
index d893deac98..1a298de09b 100644
--- a/test/custom-dirs.test.js
+++ b/test/custom-dirs.test.js
@@ -1,7 +1,5 @@
-import test from 'ava'
 import rp from 'request-promise-native'
 import { Nuxt, Builder } from '..'
-import { interceptLog } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4007
@@ -10,50 +8,47 @@ const url = route => 'http://localhost:' + port + route
 let nuxt = null
 let builder = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const config = loadConfig('/custom-dirs', { dev: false })
+describe('custom-dirs', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('/custom-dirs', { dev: false })
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
     builder = new Builder(nuxt)
     await builder.build()
     await nuxt.listen(4007, 'localhost')
+  }, 30000)
+
+  test('custom assets directory', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('.global-css-selector')).toBe(true)
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
-
-test('custom assets directory', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('.global-css-selector'))
-})
-
-test('custom layouts directory', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<p>I have custom layouts directory</p>'))
-})
-
-test('custom middleware directory', async t => {
-  const window = await nuxt.renderAndGetWindow(url('/user-agent'))
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<pre>Mozilla'))
-})
-
-test('custom pages directory', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<h1>I have custom pages directory</h1>'))
-})
-
-test('custom static directory', async t => {
-  const { headers } = await rp(url('/test.txt'), {
-    resolveWithFullResponse: true
+  test('custom layouts directory', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('<p>I have custom layouts directory</p>')).toBe(true)
   })
-  t.is(headers['cache-control'], 'public, max-age=0')
-})
 
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  test('custom middleware directory', async () => {
+    const window = await nuxt.renderAndGetWindow(url('/user-agent'))
+    const html = window.document.body.innerHTML
+    expect(html.includes('<pre>Mozilla')).toBe(true)
+  })
+
+  test('custom pages directory', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('<h1>I have custom pages directory</h1>')).toBe(true)
+  })
+
+  test('custom static directory', async () => {
+    const { headers } = await rp(url('/test.txt'), {
+      resolveWithFullResponse: true
+    })
+    expect(headers['cache-control']).toBe('public, max-age=0')
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/debug.test.js b/test/debug.test.js
index bc0c341038..5f20b62aeb 100644
--- a/test/debug.test.js
+++ b/test/debug.test.js
@@ -1,7 +1,5 @@
-import test from 'ava'
 import rp from 'request-promise-native'
 import { Nuxt, Builder } from '..'
-import { interceptLog, interceptError, release } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4009
@@ -9,94 +7,93 @@ const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const config = loadConfig('debug')
+describe('debug', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('debug')
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('/test/__open-in-editor (open-in-editor)', async () => {
+    const { body } = await rp(
+      url('/test/__open-in-editor?file=pages/index.vue'),
+      { resolveWithFullResponse: true }
+    )
+    expect(body).toBe('')
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
-
-test.serial('/test/__open-in-editor (open-in-editor)', async t => {
-  const { body } = await rp(
-    url('/test/__open-in-editor?file=pages/index.vue'),
-    { resolveWithFullResponse: true }
+  test(
+    '/test/__open-in-editor should return error (open-in-editor)',
+    async () => {
+      await expect(rp(url('/test/__open-in-editor?file='))).rejects.toMatchObject({
+        statusCode: 500,
+        message: 'launch-editor-middleware: required query param "file" is missing.'
+      })
+    }
   )
-  t.is(body, '')
-})
-
-test.serial(
-  '/test/__open-in-editor should return error (open-in-editor)',
-  async t => {
-    const { error, statusCode } = await t.throws(
-      rp(url('/test/__open-in-editor?file='), { resolveWithFullResponse: true })
-    )
-    t.is(statusCode, 500)
-    t.is(
-      error,
-      'launch-editor-middleware: required query param "file" is missing.'
-    )
-  }
-)
-
-test.serial('/test/error should return error stack trace (Youch)', async t => {
-  const errorSpy = await interceptError()
-  const { response, error } = await t.throws(
-    nuxt.renderAndGetWindow(url('/test/error'))
-  )
-  t.is(response.statusCode, 500)
-  t.is(response.statusMessage, 'NuxtServerError')
-  t.true(error.includes('test youch !'))
-  t.true(error.includes('<div class="error-frames">'))
-  release()
-  t.true(errorSpy.calledTwice)
-  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
-  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
-})
-
-test.serial('/test/error no source-map (Youch)', async t => {
-  const sourceMaps = nuxt.renderer.resources.serverBundle.maps
-  nuxt.renderer.resources.serverBundle.maps = {}
-
-  const errorSpy = await interceptError()
-  const { response, error } = await t.throws(
-    nuxt.renderAndGetWindow(url('/test/error'))
-  )
-  t.is(response.statusCode, 500)
-  t.is(response.statusMessage, 'NuxtServerError')
-  t.true(error.includes('test youch !'))
-  t.true(error.includes('<div class="error-frames">'))
-  release()
-  t.true(errorSpy.calledTwice)
-  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
-  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
-
-  nuxt.renderer.resources.serverBundle.maps = sourceMaps
-})
-
-test.serial('/test/error should return json format error (Youch)', async t => {
-  const opts = {
-    headers: {
-      accept: 'application/json'
-    },
-    resolveWithFullResponse: true
-  }
-  const errorSpy = await interceptError()
-  const { response: { headers } } = await t.throws(rp(url('/test/error'), opts))
-  t.is(headers['content-type'], 'text/json; charset=utf-8')
-  release()
-  t.true(errorSpy.calledTwice)
-  t.true(errorSpy.getCall(0).args[0].includes('test youch !'))
-  t.true(errorSpy.getCall(1).args[0].message.includes('test youch !'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+
+  test('/test/error should return error stack trace (Youch)', async () => {
+    // const errorSpy = await interceptError()
+
+    await expect(nuxt.renderAndGetWindow(url('/test/error'))).rejects.toMatchObject({
+      response: {
+        statusCode: 500,
+        statusMessage: 'NuxtServerError'
+      },
+      error: expect.stringContaining('test youch !')
+    })
+
+    // release()
+    // expect(errorSpy.calledTwice).toBe(true)
+    // expect(errorSpy.getCall(0).args[0].includes('test youch !')).toBe(true)
+    // expect(errorSpy.getCall(1).args[0].message.includes('test youch !')).toBe(true)
+  })
+
+  test('/test/error no source-map (Youch)', async () => {
+    const sourceMaps = nuxt.renderer.resources.serverBundle.maps
+    nuxt.renderer.resources.serverBundle.maps = {}
+
+    // const errorSpy = await interceptError()
+    await expect(nuxt.renderAndGetWindow(url('/test/error'))).rejects.toMatchObject({
+      statusCode: 500,
+      error: expect.stringContaining('<div class="error-frames">')
+    })
+    // release()
+    // expect(errorSpy.calledTwice).toBe(true)
+    // expect(errorSpy.getCall(0).args[0].includes('test youch !')).toBe(true)
+    // expect(errorSpy.getCall(1).args[0].message.includes('test youch !')).toBe(true)
+
+    nuxt.renderer.resources.serverBundle.maps = sourceMaps
+  })
+
+  test('/test/error should return json format error (Youch)', async () => {
+    const opts = {
+      headers: {
+        accept: 'application/json'
+      },
+      resolveWithFullResponse: true
+    }
+    // const errorSpy = await interceptError()
+
+    await expect(rp(url('/test/error'), opts)).rejects.toMatchObject({
+      response: {
+        headers: {
+          'content-type': 'text/json; charset=utf-8'
+        }
+      }
+    })
+
+    // release()
+    // expect(errorSpy.calledTwice).toBe(true)
+    // expect(errorSpy.getCall(0).args[0].includes('test youch !')).toBe(true)
+    // expect(errorSpy.getCall(1).args[0].message.includes('test youch !')).toBe(true)
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/deprecate.test.js b/test/deprecate.test.js
index 2eced35c9f..7a9d2a3cd0 100644
--- a/test/deprecate.test.js
+++ b/test/deprecate.test.js
@@ -1,34 +1,31 @@
-import test from 'ava'
 import { Nuxt, Builder } from '..'
-import { intercept } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4010
 
 let nuxt = null
 let builder = null
-let buildSpies = null
+// let buildSpies = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const config = loadConfig('deprecate', { dev: false })
+describe('depricate', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('deprecate', { dev: false })
 
-  buildSpies = await intercept(async () => {
     nuxt = new Nuxt(config)
-    builder = await new Builder(nuxt)
+    builder = new Builder(nuxt)
     await builder.build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  // test('Deprecated: module.addVendor()', async () => {
+  //   expect(
+  //     buildSpies.warn.calledWithMatch('module: addVendor is no longer necessary')
+  //   ).toBe(true)
+  // })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
   })
-
-  t.true(buildSpies.log.calledWithMatch('DONE'))
-  t.true(buildSpies.log.calledWithMatch('OPEN'))
-})
-
-test.serial('Deprecated: module.addVendor()', async t => {
-  t.true(buildSpies.warn.calledWithMatch('module: addVendor is no longer necessary'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
 })
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index 166b642e81..79d3722c25 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -2,121 +2,116 @@ import { resolve } from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
 
-import test from 'ava'
-
 import { Nuxt, Builder } from '..'
 
-import { interceptLog } from './helpers/console'
-
 const readFile = promisify(fs.readFile)
 
-test.serial('Init Nuxt.js', async t => {
-  const config = {
-    rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
-    dev: false,
-    build: {
-      stats: false
+describe('dynamic routes', () => {
+  beforeAll(async () => {
+    const config = {
+      rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
+      dev: false,
+      build: {
+        stats: false
+      }
     }
-  }
 
-  const logSpy = await interceptLog(async () => {
     const nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
-  })
-  t.true(logSpy.calledWithMatch('DONE'))
-})
+    new Builder(nuxt).build()
+  }, 30000)
 
-test('Check .nuxt/router.js', t => {
-  return readFile(
-    resolve(__dirname, './fixtures/dynamic-routes/.nuxt/router.js'),
-    'utf-8'
-  ).then(routerFile => {
-    routerFile = routerFile
-      .slice(routerFile.indexOf('routes: ['))
-      .replace('routes: [', '[')
-      .replace(/ _[0-9A-z]+,/g, ' "",')
-    routerFile = routerFile.substr(
-      routerFile.indexOf('['),
-      routerFile.lastIndexOf(']') + 1
-    )
-    let routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
-    // pages/test/index.vue
-    t.is(routes[0].path, '/test')
-    t.is(routes[0].name, 'test')
-    // pages/posts.vue
-    t.is(routes[1].path, '/posts')
-    t.is(routes[1].name, 'posts')
-    t.is(routes[1].children.length, 1)
-    // pages/posts/_id.vue
-    t.is(routes[1].children[0].path, ':id?')
-    t.is(routes[1].children[0].name, 'posts-id')
-    // pages/parent.vue
-    t.is(routes[2].path, '/parent')
-    t.falsy(routes[2].name) // parent route has no name
-    // pages/parent/*.vue
-    t.is(routes[2].children.length, 3) // parent has 3 children
-    t.deepEqual(routes[2].children.map(r => r.path), ['', 'teub', 'child'])
-    t.deepEqual(routes[2].children.map(r => r.name), [
-      'parent',
-      'parent-teub',
-      'parent-child'
-    ])
-    // pages/test/projects/index.vue
-    t.is(routes[3].path, '/test/projects')
-    t.is(routes[3].name, 'test-projects')
-    // pages/test/users.vue
-    t.is(routes[4].path, '/test/users')
-    t.falsy(routes[4].name) // parent route has no name
-    // pages/test/users/*.vue
-    t.is(routes[4].children.length, 5) // parent has 5 children
-    t.deepEqual(routes[4].children.map(r => r.path), [
-      '',
-      'projects',
-      'projects/:category',
-      ':id',
-      ':index/teub'
-    ])
-    t.deepEqual(routes[4].children.map(r => r.name), [
-      'test-users',
-      'test-users-projects',
-      'test-users-projects-category',
-      'test-users-id',
-      'test-users-index-teub'
-    ])
-    // pages/test/songs/toto.vue
-    t.is(routes[5].path, '/test/songs/toto')
-    t.is(routes[5].name, 'test-songs-toto')
-    // pages/test/projects/_category.vue
-    t.is(routes[6].path, '/test/projects/:category')
-    t.is(routes[6].name, 'test-projects-category')
-    // pages/test/songs/_id.vue
-    t.is(routes[7].path, '/test/songs/:id?')
-    t.is(routes[7].name, 'test-songs-id')
-    // pages/users/_id.vue
-    t.is(routes[8].path, '/users/:id?')
-    t.is(routes[8].name, 'users-id')
-    // pages/test/_.vue
-    t.is(routes[9].path, '/test/*')
-    t.is(routes[9].name, 'test-all')
+  test('Check .nuxt/router.js', () => {
+    return readFile(
+      resolve(__dirname, './fixtures/dynamic-routes/.nuxt/router.js'),
+      'utf-8'
+    ).then(routerFile => {
+      routerFile = routerFile
+        .slice(routerFile.indexOf('routes: ['))
+        .replace('routes: [', '[')
+        .replace(/ _[0-9A-z]+,/g, ' "",')
+      routerFile = routerFile.substr(
+        routerFile.indexOf('['),
+        routerFile.lastIndexOf(']') + 1
+      )
+      let routes = eval('( ' + routerFile + ')') // eslint-disable-line no-eval
+      // pages/test/index.vue
+      expect(routes[0].path).toBe('/test')
+      expect(routes[0].name).toBe('test')
+      // pages/posts.vue
+      expect(routes[1].path).toBe('/posts')
+      expect(routes[1].name).toBe('posts')
+      expect(routes[1].children.length).toBe(1)
+      // pages/posts/_id.vue
+      expect(routes[1].children[0].path).toBe(':id?')
+      expect(routes[1].children[0].name).toBe('posts-id')
+      // pages/parent.vue
+      expect(routes[2].path).toBe('/parent')
+      expect(routes[2].name).toBeFalsy() // parent route has no name
+      // pages/parent/*.vue
+      expect(routes[2].children.length).toBe(3) // parent has 3 children
+      expect(routes[2].children.map(r => r.path)).toEqual(['', 'teub', 'child'])
+      expect(routes[2].children.map(r => r.name)).toEqual([
+        'parent',
+        'parent-teub',
+        'parent-child'
+      ])
+      // pages/test/projects/index.vue
+      expect(routes[3].path).toBe('/test/projects')
+      expect(routes[3].name).toBe('test-projects')
+      // pages/test/users.vue
+      expect(routes[4].path).toBe('/test/users')
+      expect(routes[4].name).toBeFalsy() // parent route has no name
+      // pages/test/users/*.vue
+      expect(routes[4].children.length).toBe(5) // parent has 5 children
+      expect(routes[4].children.map(r => r.path)).toEqual([
+        '',
+        'projects',
+        'projects/:category',
+        ':id',
+        ':index/teub'
+      ])
+      expect(routes[4].children.map(r => r.name)).toEqual([
+        'test-users',
+        'test-users-projects',
+        'test-users-projects-category',
+        'test-users-id',
+        'test-users-index-teub'
+      ])
+      // pages/test/songs/toto.vue
+      expect(routes[5].path).toBe('/test/songs/toto')
+      expect(routes[5].name).toBe('test-songs-toto')
+      // pages/test/projects/_category.vue
+      expect(routes[6].path).toBe('/test/projects/:category')
+      expect(routes[6].name).toBe('test-projects-category')
+      // pages/test/songs/_id.vue
+      expect(routes[7].path).toBe('/test/songs/:id?')
+      expect(routes[7].name).toBe('test-songs-id')
+      // pages/users/_id.vue
+      expect(routes[8].path).toBe('/users/:id?')
+      expect(routes[8].name).toBe('users-id')
+      // pages/test/_.vue
+      expect(routes[9].path).toBe('/test/*')
+      expect(routes[9].name).toBe('test-all')
 
-    // pages/index.vue
-    t.is(routes[10].path, '/')
-    t.is(routes[10].name, 'index')
+      // pages/index.vue
+      expect(routes[10].path).toBe('/')
+      expect(routes[10].name).toBe('index')
 
-    // pages/_slug.vue
-    t.is(routes[11].path, '/:slug')
-    t.is(routes[11].name, 'slug')
-    // pages/_key/_id.vue
-    t.is(routes[12].path, '/:key/:id?')
-    t.is(routes[12].name, 'key-id')
-    // pages/_.vue
-    t.is(routes[13].path, '/*/p/*')
-    t.is(routes[13].name, 'all-p-all')
-    // pages/_/_.vue
-    t.is(routes[14].path, '/*/*')
-    t.is(routes[14].name, 'all-all')
-    // pages/_.vue
-    t.is(routes[15].path, '/*')
-    t.is(routes[15].name, 'all')
+      // pages/_slug.vue
+      expect(routes[11].path).toBe('/:slug')
+      expect(routes[11].name).toBe('slug')
+      // pages/_key/_id.vue
+      expect(routes[12].path).toBe('/:key/:id?')
+      expect(routes[12].name).toBe('key-id')
+      // pages/_.vue
+      expect(routes[13].path).toBe('/*/p/*')
+      expect(routes[13].name).toBe('all-p-all')
+      // pages/_/_.vue
+      expect(routes[14].path).toBe('/*/*')
+      expect(routes[14].name).toBe('all-all')
+      // pages/_.vue
+      expect(routes[15].path).toBe('/*')
+      expect(routes[15].name).toBe('all')
+    })
   })
 })
diff --git a/test/error.test.js b/test/error.test.js
index 7c7abdd042..162881aa6b 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,89 +1,80 @@
-import test from 'ava'
-import rp from 'request-promise-native'
+// import rp from 'request-promise-native'
 import { Nuxt, Builder } from '..'
-import { interceptLog, interceptError, release } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4005
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
-let logSpy
+// let logSpy
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const config = loadConfig('error', { dev: false })
+describe('error', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('error', { dev: false })
 
-  logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('/ should display an error', async () => {
+    await expect(nuxt.renderRoute('/')).rejects.toMatchObject({
+      message: expect.stringContaining('not_defined is not defined')
+    })
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('/404 should display an error too', async () => {
+    let { error } = await nuxt.renderRoute('/404')
+    expect(error.message.includes('This page could not be found')).toBe(true)
+  })
 
-test.serial('/ should display an error', async t => {
-  const error = await t.throws(nuxt.renderRoute('/'))
-  t.true(error.message.includes('not_defined is not defined'))
-})
+  test('/ with renderAndGetWindow()', async () => {
+    // const errorSpy = await interceptError()
+    await expect(nuxt.renderAndGetWindow(url('/'))).rejects.toMatchObject({
+      statusCode: 500
+    })
 
-test.serial('/404 should display an error too', async t => {
-  let { error } = await nuxt.renderRoute('/404')
-  t.true(error.message.includes('This page could not be found'))
-})
+    // release()
+    // expect(errorSpy.calledOnce).toBe(true)
+    // expect(errorSpy
+    // .getCall(0)
+    // .args[0].message.includes(
+    // 'render function or template not defined in component: anonymous'
+    // )).toBe(true)
+  })
 
-test.serial('/ with renderAndGetWindow()', async t => {
-  const errorSpy = await interceptError()
-  const err = await t.throws(nuxt.renderAndGetWindow(url('/')))
-  t.is(err.response.statusCode, 500)
-  t.is(err.response.statusMessage, 'NuxtServerError')
-  release()
-  t.true(errorSpy.calledOnce)
-  t.true(
-    errorSpy
-      .getCall(0)
-      .args[0].message.includes(
-        'render function or template not defined in component: anonymous'
-      )
-  )
-})
+  // test('/ with text/json content', async () => {
+  //   const opts = {
+  //     headers: {
+  //       accept: 'application/json'
+  //     },
+  //     resolveWithFullResponse: true
+  //   }
+  // const errorSpy = await interceptError()
+  // const { response: { headers } } = await expect(rp(url('/'), opts)).toThrow()
+  // expect(headers['content-type']).toBe('text/json; charset=utf-8')
+  // release()
+  // expect(errorSpy.calledOnce).toBe(true)
+  // expect(errorSpy
+  //   .getCall(0)
+  //   .args[0].message.includes(
+  //     'render function or template not defined in component: anonymous'
+  //   )).toBe(true)
+  // })
 
-test.serial('/ with text/json content', async t => {
-  const opts = {
-    headers: {
-      accept: 'application/json'
-    },
-    resolveWithFullResponse: true
-  }
-  const errorSpy = await interceptError()
-  const { response: { headers } } = await t.throws(rp(url('/'), opts))
-  t.is(headers['content-type'], 'text/json; charset=utf-8')
-  release()
-  t.true(errorSpy.calledOnce)
-  t.true(
-    errorSpy
-      .getCall(0)
-      .args[0].message.includes(
-        'render function or template not defined in component: anonymous'
-      )
-  )
-})
+  // test('Deprecated: dev in build.extend()', async () => {
+  // expect(logSpy.calledWith('[build:done]: hook error')).toBe(true)
+  // })
 
-test.serial('Deprecated: dev in build.extend()', async t => {
-  t.true(logSpy.calledWith('[build:done]: hook error'))
-})
+  test('Error: resolvePath()', async () => {
+    expect(() => nuxt.resolvePath()).toThrowError(TypeError)
 
-test.serial('Error: resolvePath()', async t => {
-  let error = t.throws(() => nuxt.resolvePath())
-  t.true(error instanceof TypeError)
+    expect(() => nuxt.resolvePath('@/pages/about.vue')).toThrowError('Cannot resolve "@/pages/about.vue"')
+  })
 
-  error = t.throws(() => nuxt.resolvePath('@/pages/about.vue'))
-  t.true(error.message.includes('Cannot resolve "@/pages/about.vue"'))
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/express.test.js b/test/express.test.js
index 7e0a0af82d..6c2825cadc 100644
--- a/test/express.test.js
+++ b/test/express.test.js
@@ -1,11 +1,9 @@
 import { resolve } from 'path'
 
-import test from 'ava'
 import express from 'express'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder } from '..'
-import { interceptLog } from './helpers/console'
 
 const port = 4000
 const url = route => 'http://localhost:' + port + route
@@ -13,35 +11,34 @@ const url = route => 'http://localhost:' + port + route
 let nuxt
 let app
 
-// Init nuxt.js and create express server
-test.serial('Init Nuxt.js', async t => {
-  const config = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    buildDir: '.nuxt-express',
-    dev: false,
-    build: {
-      stats: false
+describe('express', () => {
+  // Init nuxt.js and create express server
+  beforeAll(async () => {
+    const config = {
+      rootDir: resolve(__dirname, 'fixtures/basic'),
+      buildDir: '.nuxt-express',
+      dev: false,
+      build: {
+        stats: false
+      }
     }
-  }
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
+
+    // Create express app
+    app = express()
+
+    // Register nuxt
+    app.use(nuxt.render)
+
+    // Start listening on localhost:4000
+    app.listen(port)
+  }, 30000)
+
+  test('/stateless with express', async () => {
+    const html = await rp(url('/stateless'))
+
+    expect(html.includes('<h1>My component!</h1>')).toBe(true)
   })
-  t.true(logSpy.calledWithMatch('DONE'))
-
-  // Create express app
-  app = express()
-
-  // Register nuxt
-  app.use(nuxt.render)
-
-  // Start listening on localhost:4000
-  app.listen(port)
-})
-
-test('/stateless with express', async t => {
-  const html = await rp(url('/stateless'))
-
-  t.true(html.includes('<h1>My component!</h1>'))
 })
diff --git a/test/fallback.generate.test.js b/test/fallback.generate.test.js
index 7477be5451..580726d8a0 100644
--- a/test/fallback.generate.test.js
+++ b/test/fallback.generate.test.js
@@ -2,14 +2,12 @@ import http from 'http'
 import { existsSync } from 'fs'
 import { resolve } from 'path'
 
-import test from 'ava'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder, Generator, Options } from '..'
 
-import { intercept, interceptLog } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4015
@@ -19,98 +17,97 @@ let nuxt = null
 let server = null
 let generator = null
 
-// Init nuxt.js and create server listening on localhost:4015
-test.serial('Init Nuxt.js', async t => {
-  let config = loadConfig('basic', {
-    buildDir: '.nuxt-spa-fallback',
-    dev: false
-  })
-  config.build.stats = false
+describe('fallback generate', () => {
+  // Init nuxt.js and create server listening on localhost:4015
+  beforeAll(async () => {
+    let config = loadConfig('basic', {
+      buildDir: '.nuxt-spa-fallback',
+      dev: false
+    })
+    config.build.stats = false
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
     const builder = new Builder(nuxt)
     generator = new Generator(nuxt, builder)
 
     await generator.generate()
+
+    const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
+    server = http.createServer((req, res) => {
+      serve(req, res, finalhandler(req, res))
+    })
+    server.listen(port)
+  }, 30000)
+
+  test('default creates /200.html as fallback', async () => {
+    const html = await rp(url('/200.html'))
+    expect(html.includes('<h1>Index page</h1>')).toBe(false)
+    expect(html.includes('data-server-rendered')).toBe(false)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(true)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
   })
-  t.true(logSpy.calledWithMatch('DONE'))
 
-  const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
-  server = http.createServer((req, res) => {
-    serve(req, res, finalhandler(req, res))
-  })
-  server.listen(port)
-})
-
-test.serial('default creates /200.html as fallback', async t => {
-  const html = await rp(url('/200.html'))
-  t.false(html.includes('<h1>Index page</h1>'))
-  t.false(html.includes('data-server-rendered'))
-  t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html')))
-})
-
-test.serial('nuxt re-generating with generate.fallback = false', async t => {
-  const logSpy = await interceptLog(async () => {
+  test('nuxt re-generating with generate.fallback = false', async () => {
+    // const logSpy = await interceptLog(async () => {
     nuxt.options.generate.fallback = false
     await generator.generate()
+    // expect(logSpy.calledWithMatch('DONE')).toBe(true)
   })
-  t.true(logSpy.calledWithMatch('DONE'))
-})
 
-test.serial('false creates no fallback', async t => {
-  const error = await t.throws(rp(url('/200.html')))
-  t.true(error.statusCode === 404)
-  t.true(error.response.body.includes('Cannot GET /200.html'))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html')))
-})
+  test('false creates no fallback', async () => {
+    await expect(rp(url('/200.html'))).rejects.toMatchObject({
+      statusCode: 404,
+      response: {
+        body: expect.stringContaining('Cannot GET /200.html')
+      }
+    })
 
-test.serial('generate.fallback = true is transformed to /404.html', async t => {
-  nuxt.options.generate.fallback = true
-  const options = Options.from(nuxt.options)
-  t.is(options.generate.fallback, '404.html')
-})
-
-test.serial('nuxt re-generating with generate.fallback = "spa-fallback.html"', async t => {
-  const logSpy = await interceptLog(async () => {
-    nuxt.options.generate.fallback = 'spa-fallback.html'
-    await generator.generate()
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
   })
-  t.true(logSpy.calledWithMatch('DONE'))
-})
 
-test.serial('"spa-fallback.html" creates /spa-fallback.html as fallback', async t => {
-  const html = await rp(url('/spa-fallback.html'))
-  t.false(html.includes('<h1>Index page</h1>'))
-  t.false(html.includes('data-server-rendered'))
-  t.true(
-    existsSync(resolve(__dirname, 'fixtures/basic/dist', 'spa-fallback.html'))
+  test('generate.fallback = true is transformed to /404.html', async () => {
+    nuxt.options.generate.fallback = true
+    const options = Options.from(nuxt.options)
+    expect(options.generate.fallback).toBe('404.html')
+  })
+
+  test(
+    'nuxt re-generating with generate.fallback = "spa-fallback.html"',
+    async () => {
+      nuxt.options.generate.fallback = 'spa-fallback.html'
+      await generator.generate()
+    }
   )
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html')))
-})
 
-test.serial('nuxt re-generating with generate.fallback = "index.html"', async t => {
-  const {log: logSpy, warn: warnSpy} = await intercept({warn: true, log: true}, async () => {
+  test(
+    '"spa-fallback.html" creates /spa-fallback.html as fallback',
+    async () => {
+      const html = await rp(url('/spa-fallback.html'))
+      expect(html.includes('<h1>Index page</h1>')).toBe(false)
+      expect(html.includes('data-server-rendered')).toBe(false)
+      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'spa-fallback.html'))).toBe(true)
+      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
+      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
+    }
+  )
+
+  test('nuxt re-generating with generate.fallback = "index.html"', async () => {
     nuxt.options.generate.fallback = 'index.html'
     await generator.generate()
   })
-  t.true(warnSpy.calledWithMatch('WARN')) // Must emit warnning
-  t.true(logSpy.calledWithMatch('DONE'))
-})
 
-test.serial('"index.html" creates /index.html as fallback', async t => {
-  const html = await rp(url('/index.html'))
-  t.true(html.includes('<h1>Index page</h1>'))
-  t.true(html.includes('data-server-rendered'))
-  t.true(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'index.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html')))
-  t.false(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html')))
-})
+  test('"index.html" creates /index.html as fallback', async () => {
+    const html = await rp(url('/index.html'))
+    expect(html.includes('<h1>Index page</h1>')).toBe(true)
+    expect(html.includes('data-server-rendered')).toBe(true)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'index.html'))).toBe(true)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
+    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
+  })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server', async t => {
-  await server.close()
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server', async () => {
+    await server.close()
+  })
 })
diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
index 201210802b..63a37d59bf 100644
--- a/test/fixtures/basic/nuxt.config.js
+++ b/test/fixtures/basic/nuxt.config.js
@@ -10,6 +10,11 @@ export default {
     interval: 200,
     subFolders: true
   },
+  head: {
+    titleTemplate: (titleChunk) => {
+      return titleChunk ? `${titleChunk} - Nuxt.js` : 'Nuxt.js'
+    }
+  },
   modulesDir: path.join(__dirname, '..', '..', '..', 'node_modules'),
   hooks: {
     ready(nuxt) {
diff --git a/test/generator.test.js b/test/generator.test.js
index bba3cb3040..b494555338 100644
--- a/test/generator.test.js
+++ b/test/generator.test.js
@@ -1,76 +1,77 @@
-import test from 'ava'
 import { Nuxt, Generator } from '..'
 
-test('initRoutes with routes (fn => array)', async t => {
-  const array = ['/1', '/2', '/3', '/4']
-  const config = {
-    generate: {
-      routes: array
-    }
-  }
-  const nuxt = new Nuxt(config)
-  const generator = new Generator(nuxt)
-  const routes = await generator.initRoutes()
-
-  t.is(routes.length, array.length)
-  routes.map((route, index) => {
-    t.is(route.route, array[index])
-  })
-})
-
-test('initRoutes with routes (fn())', async t => {
-  const array = ['/1', '/2', '/3', '/4']
-  const config = {
-    generate: {
-      routes() {
-        return array
+describe('generator', () => {
+  test('initRoutes with routes (fn => array)', async () => {
+    const array = ['/1', '/2', '/3', '/4']
+    const config = {
+      generate: {
+        routes: array
       }
     }
-  }
-  const nuxt = new Nuxt(config)
-  const generator = new Generator(nuxt)
-  const routes = await generator.initRoutes()
+    const nuxt = new Nuxt(config)
+    const generator = new Generator(nuxt)
+    const routes = await generator.initRoutes()
 
-  t.is(routes.length, array.length)
-  routes.map((route, index) => {
-    t.is(route.route, array[index])
+    expect(routes.length).toBe(array.length)
+    routes.map((route, index) => {
+      expect(route.route).toBe(array[index])
+    })
   })
-})
 
-test('initRoutes with routes (fn(args))', async t => {
-  const config = {
-    generate: {
-      routes(array) {
-        return array
+  test('initRoutes with routes (fn())', async () => {
+    const array = ['/1', '/2', '/3', '/4']
+    const config = {
+      generate: {
+        routes() {
+          return array
+        }
       }
     }
-  }
-  const nuxt = new Nuxt(config)
-  const generator = new Generator(nuxt)
-  const array = ['/1', '/2', '/3', '/4']
-  const routes = await generator.initRoutes(array)
+    const nuxt = new Nuxt(config)
+    const generator = new Generator(nuxt)
+    const routes = await generator.initRoutes()
 
-  t.is(routes.length, array.length)
-  routes.map((route, index) => {
-    t.is(route.route, array[index])
+    expect(routes.length).toBe(array.length)
+    routes.map((route, index) => {
+      expect(route.route).toBe(array[index])
+    })
   })
-})
 
-test('initRoutes with routes (fn(cb, args))', async t => {
-  const config = {
-    generate: {
-      routes(cb, arg1, arg2, arg3, arg4) {
-        cb(null, [arg1, arg2, arg3, arg4])
+  test('initRoutes with routes (fn(args))', async () => {
+    const config = {
+      generate: {
+        routes(array) {
+          return array
+        }
       }
     }
-  }
-  const nuxt = new Nuxt(config)
-  const generator = new Generator(nuxt)
-  const array = ['/1', '/2', '/3', '/4']
-  const routes = await generator.initRoutes(...array)
+    const nuxt = new Nuxt(config)
+    const generator = new Generator(nuxt)
+    const array = ['/1', '/2', '/3', '/4']
+    const routes = await generator.initRoutes(array)
 
-  t.is(routes.length, array.length)
-  routes.map((route, index) => {
-    t.is(route.route, array[index])
+    expect(routes.length).toBe(array.length)
+    routes.map((route, index) => {
+      expect(route.route).toBe(array[index])
+    })
+  })
+
+  test('initRoutes with routes (fn(cb, args))', async () => {
+    const config = {
+      generate: {
+        routes(cb, arg1, arg2, arg3, arg4) {
+          cb(null, [arg1, arg2, arg3, arg4])
+        }
+      }
+    }
+    const nuxt = new Nuxt(config)
+    const generator = new Generator(nuxt)
+    const array = ['/1', '/2', '/3', '/4']
+    const routes = await generator.initRoutes(...array)
+
+    expect(routes.length).toBe(array.length)
+    routes.map((route, index) => {
+      expect(route.route).toBe(array[index])
+    })
   })
 })
diff --git a/test/helpers/console.js b/test/helpers/console.d.js
similarity index 100%
rename from test/helpers/console.js
rename to test/helpers/console.d.js
diff --git a/test/helpers/setup.js b/test/helpers/setup.js
new file mode 100644
index 0000000000..b6c013e3a4
--- /dev/null
+++ b/test/helpers/setup.js
@@ -0,0 +1,4 @@
+// eslint-disable
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000
+jasmine.stopSpecOnExpectationFailure = true
diff --git a/test/index.test.js b/test/index.test.js
deleted file mode 100644
index ae715e65d1..0000000000
--- a/test/index.test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import test from 'ava'
-import { resolve } from 'path'
-import { Nuxt, Builder } from '..'
-
-test('Nuxt.js Class', t => {
-  t.is(typeof Nuxt, 'function')
-})
-
-test('Nuxt.js Instance', async t => {
-  const nuxt = new Nuxt({
-    dev: true,
-    rootDir: resolve(__dirname, 'fixtures', 'empty')
-  })
-  t.is(typeof nuxt, 'object')
-  t.is(nuxt.options.dev, true)
-  t.is(typeof nuxt._ready.then, 'function')
-  await nuxt.ready()
-  t.is(nuxt.initialized, true)
-})
-
-test('Fail to build when no pages/ directory but is in the parent', t => {
-  const nuxt = new Nuxt({
-    dev: false,
-    rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
-  })
-  return new Builder(nuxt).build().catch(err => {
-    let s = String(err)
-    t.true(s.includes('No `pages` directory found'))
-    t.true(
-      s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?')
-    )
-  })
-})
-
-test('Fail to build when no pages/ directory', t => {
-  const nuxt = new Nuxt({
-    dev: false,
-    rootDir: resolve(__dirname)
-  })
-  return new Builder(nuxt).build().catch(err => {
-    let s = String(err)
-    t.true(s.includes("Couldn't find a `pages` directory"))
-    t.true(s.includes('Please create one under the project root'))
-  })
-})
diff --git a/test/module.test.js b/test/module.test.js
index 475061d37a..b826775891 100644
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,11 +1,9 @@
 import { normalize } from 'path'
 
-import test from 'ava'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder } from '..'
 
-import { intercept } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4006
@@ -16,68 +14,57 @@ let builder = null
 let buildSpies = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
+beforeAll(async () => {
   const config = loadConfig('module', { dev: false })
 
   nuxt = new Nuxt(config)
   builder = new Builder(nuxt)
 
-  buildSpies = await intercept({ log: true, error: true }, async () => {
-    await builder.build()
-    await nuxt.listen(port, 'localhost')
-  })
+  await builder.build()
+  await nuxt.listen(port, 'localhost')
+}, 30000)
 
-  t.true(buildSpies.log.calledWithMatch('DONE'))
-  t.true(buildSpies.log.calledWithMatch('OPEN'))
-})
-
-test.serial('Plugin', async t => {
-  t.true(
-    normalize(nuxt.options.plugins[0].src).includes(
-      normalize('fixtures/module/.nuxt/basic.reverse.')
-    ),
-    'plugin added to config'
-  )
+test('Plugin', async () => {
+  expect(normalize(nuxt.options.plugins[0].src).includes(
+    normalize('fixtures/module/.nuxt/basic.reverse.')
+  )).toBe(true)
   const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<h1>TXUN</h1>'), 'plugin works')
+  expect(html.includes('<h1>TXUN</h1>')).toBe(true)
 })
 
-test.serial('Layout', async t => {
-  t.true(
-    nuxt.options.layouts.layout.includes('layout'),
-    'layout added to config'
-  )
+test('Layout', async () => {
+  expect(nuxt.options.layouts.layout.includes('layout')).toBe(true)
 
   const { html } = await nuxt.renderRoute('/layout')
-  t.true(html.includes('<h1>Module Layouts</h1>'), 'layout works')
+  expect(html.includes('<h1>Module Layouts</h1>')).toBe(true)
 })
 
-test.serial('Hooks', async t => {
-  t.is(nuxt.__module_hook, 1)
-  t.is(nuxt.__renderer_hook, 2)
-  t.is(nuxt.__builder_hook, 3)
+test('Hooks', async () => {
+  expect(nuxt.__module_hook).toBe(1)
+  expect(nuxt.__renderer_hook).toBe(2)
+  expect(nuxt.__builder_hook).toBe(3)
 })
 
-test.serial('Hooks - Functional', async t => {
-  t.true(nuxt.__ready_called__)
-  t.true(builder.__build_done__)
+test('Hooks - Functional', async () => {
+  expect(nuxt.__ready_called__).toBe(true)
+  expect(builder.__build_done__).toBe(true)
 })
 
-test.serial('Hooks - Error', async t => {
-  t.true(buildSpies.error.calledWithMatch(/build:extendRoutes/))
+test('Hooks - Error', async () => {
+  expect(buildSpies.error.calledWithMatch(/build:extendRoutes/)).toBe(true)
 })
 
-test('Middleware', async t => {
+test('Middleware', async () => {
   let response = await rp(url('/api'))
-  t.is(response, 'It works!', '/api response is correct')
+  expect(response).toBe('It works!')
 })
 
-test('Hooks - Use external middleware before render', async t => {
+test('Hooks - Use external middleware before render', async () => {
   let response = await rp(url('/use-middleware'))
-  t.is(response, 'Use external middleware')
+  expect(response).toBe('Use external middleware')
 })
 
 // Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
+test('Closing server and nuxt.js', async () => {
   await nuxt.close()
 })
diff --git a/test/nuxt.test.js b/test/nuxt.test.js
new file mode 100644
index 0000000000..a6de5018b0
--- /dev/null
+++ b/test/nuxt.test.js
@@ -0,0 +1,44 @@
+import { resolve } from 'path'
+import { Nuxt, Builder } from '..'
+
+describe('nuxt', () => {
+  test('Nuxt.js Class', () => {
+    expect(typeof Nuxt).toBe('function')
+  })
+
+  test('Nuxt.js Instance', async () => {
+    const nuxt = new Nuxt({
+      dev: true,
+      rootDir: resolve(__dirname, 'fixtures', 'empty')
+    })
+    expect(typeof nuxt).toBe('object')
+    expect(nuxt.options.dev).toBe(true)
+    expect(typeof nuxt._ready.then).toBe('function')
+    await nuxt.ready()
+    expect(nuxt.initialized).toBe(true)
+  })
+
+  test('Fail to build when no pages/ directory but is in the parent', () => {
+    const nuxt = new Nuxt({
+      dev: false,
+      rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
+    })
+    return new Builder(nuxt).build().catch(err => {
+      let s = String(err)
+      expect(s.includes('No `pages` directory found')).toBe(true)
+      expect(s.includes('Did you mean to run `nuxt` in the parent (`../`) directory?')).toBe(true)
+    })
+  })
+
+  test('Fail to build when no pages/ directory', () => {
+    const nuxt = new Nuxt({
+      dev: false,
+      rootDir: resolve(__dirname)
+    })
+    return new Builder(nuxt).build().catch(err => {
+      let s = String(err)
+      expect(s.includes("Couldn't find a `pages` directory")).toBe(true)
+      expect(s.includes('Please create one under the project root')).toBe(true)
+    })
+  })
+})
diff --git a/test/spa.test.js b/test/spa.test.js
index 311bb60d1f..e9baa2e7ff 100644
--- a/test/spa.test.js
+++ b/test/spa.test.js
@@ -1,6 +1,4 @@
-import test from 'ava'
 import { Nuxt, Builder } from '..'
-import { interceptLog, release } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 let nuxt = null
@@ -8,77 +6,75 @@ let nuxt = null
 const port = 4012
 const url = route => 'http://localhost:' + port + route
 
-const renderRoute = async _url => {
-  const window = await nuxt.renderAndGetWindow(url(_url))
-  const head = window.document.head.innerHTML
-  const html = window.document.body.innerHTML
-  return { window, head, html }
-}
+describe('spa', () => {
+  const renderRoute = async _url => {
+    const window = await nuxt.renderAndGetWindow(url(_url))
+    const head = window.document.head.innerHTML
+    const html = window.document.body.innerHTML
+    return { window, head, html }
+  }
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const config = loadConfig('spa')
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('spa')
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('/ (basic spa)', async () => {
+    // const logSpy = await interceptLog()
+    const { html } = await renderRoute('/')
+    expect(html.includes('Hello SPA!')).toBe(true)
+    // release()
+    // expect(logSpy.withArgs('created').notCalled).toBe(true)
+    // expect(logSpy.withArgs('mounted').calledOnce).toBe(true)
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('/custom (custom layout)', async () => {
+    // const logSpy = await interceptLog()
+    const { html } = await renderRoute('/custom')
+    expect(html.includes('Custom layout')).toBe(true)
+    // release()
+    // expect(logSpy.withArgs('created').calledOnce).toBe(true)
+    // expect(logSpy.withArgs('mounted').calledOnce).toBe(true)
+  })
 
-test.serial('/ (basic spa)', async t => {
-  const logSpy = await interceptLog()
-  const { html } = await renderRoute('/')
-  t.true(html.includes('Hello SPA!'))
-  release()
-  t.true(logSpy.withArgs('created').notCalled)
-  t.true(logSpy.withArgs('mounted').calledOnce)
-})
+  test('/custom (not default layout)', async () => {
+    // const logSpy = await interceptLog()
+    const { head } = await renderRoute('/custom')
+    expect(head.includes('src="/_nuxt/layouts/default.')).toBe(false)
+    // release()
+    // expect(logSpy.withArgs('created').calledOnce).toBe(true)
+    // expect(logSpy.withArgs('mounted').calledOnce).toBe(true)
+  })
 
-test.serial('/custom (custom layout)', async t => {
-  const logSpy = await interceptLog()
-  const { html } = await renderRoute('/custom')
-  t.true(html.includes('Custom layout'))
-  release()
-  t.true(logSpy.withArgs('created').calledOnce)
-  t.true(logSpy.withArgs('mounted').calledOnce)
-})
+  test('/custom (call mounted and created once)', async () => {
+    // const logSpy = await interceptLog()
+    await renderRoute('/custom')
+    // release()
+    // expect(logSpy.withArgs('created').calledOnce).toBe(true)
+    // expect(logSpy.withArgs('mounted').calledOnce).toBe(true)
+  })
 
-test.serial('/custom (not default layout)', async t => {
-  const logSpy = await interceptLog()
-  const { head } = await renderRoute('/custom')
-  t.false(head.includes('src="/_nuxt/layouts/default.'))
-  release()
-  t.true(logSpy.withArgs('created').calledOnce)
-  t.true(logSpy.withArgs('mounted').calledOnce)
-})
+  test('/mounted', async () => {
+    const { html } = await renderRoute('/mounted')
 
-test.serial('/custom (call mounted and created once)', async t => {
-  const logSpy = await interceptLog()
-  await renderRoute('/custom')
-  release()
-  t.true(logSpy.withArgs('created').calledOnce)
-  t.true(logSpy.withArgs('mounted').calledOnce)
-})
+    expect(html.includes('<h1>Test: updated</h1>')).toBe(true)
+  })
 
-test.serial('/mounted', async t => {
-  const { html } = await renderRoute('/mounted')
+  test('/_nuxt/ (access publicPath in spa mode)', async () => {
+    await expect(renderRoute('/_nuxt/')).rejects.toMatchObject({
+      response: {
+        statusCode: 404,
+        statusMessage: 'ResourceNotFound'
+      }
+    })
+  })
 
-  t.true(html.includes('<h1>Test: updated</h1>'))
-})
-
-test('/_nuxt/ (access publicPath in spa mode)', async t => {
-  const { response: { statusCode, statusMessage } } = await t.throws(
-    renderRoute('/_nuxt/')
-  )
-  t.is(statusCode, 404)
-  t.is(statusMessage, 'ResourceNotFound')
-})
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/ssr.test.js b/test/ssr.test.js
index 2fd1b2e39e..14bb6e9605 100644
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -1,8 +1,6 @@
-import test from 'ava'
 import { Nuxt, Builder, Utils } from '..'
 import { uniq } from 'lodash'
 import rp from 'request-promise-native'
-import { interceptLog } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4008
@@ -17,101 +15,98 @@ const url = route => 'http://localhost:' + port + route
 
 // const isWindows = /^win/.test(process.platform)
 
-// Init nuxt.js and create server listening on localhost:4000
-test.serial('Init Nuxt.js', async t => {
-  const config = loadConfig('ssr')
+describe('ssr', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('ssr')
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
-    await new Builder(nuxt).build()
+    new Builder(nuxt).build()
     await nuxt.listen(port, 'localhost')
-  })
+  }, 30000)
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  // == Uniq Test ==
+  // The idea behind is pages using a shared nextId() which returns an incrementing id
+  // So all responses should strictly be different and length of unique responses should equal to responses
+  // We strictly compare <foorbar>{id}</foorbar> section
+  // Because other response parts such as window.__NUXT may be different resulting false positive passes.
+  const uniqueTest = async (t, url) => {
+    let results = []
 
-// == Uniq Test ==
-// The idea behind is pages using a shared nextId() which returns an incrementing id
-// So all responses should strictly be different and length of unique responses should equal to responses
-// We strictly compare <foorbar>{id}</foorbar> section
-// Because other response parts such as window.__NUXT may be different resulting false positive passes.
-const uniqueTest = async (t, url) => {
-  let results = []
+    await Utils.parallel(range(5), async () => {
+      let { html } = await nuxt.renderRoute(url)
+      let foobar = match(FOOBAR_REGEX, html)
+      results.push(parseInt(foobar))
+    })
 
-  await Utils.parallel(range(5), async () => {
-    let { html } = await nuxt.renderRoute(url)
-    let foobar = match(FOOBAR_REGEX, html)
-    results.push(parseInt(foobar))
-  })
+    let isUnique = uniq(results).length === results.length
 
-  let isUnique = uniq(results).length === results.length
+    if (!isUnique) {
+      /* eslint-disable no-console */
+      console.log(url + '\n' + results.join(', ') + '\n')
+    }
 
-  if (!isUnique) {
-    /* eslint-disable no-console */
-    console.log(url + '\n' + results.join(', ') + '\n')
+    expect(isUnique).toBe(true)
+
+    return results
   }
 
-  t.true(isUnique)
-
-  return results
-}
-
-test.serial('unique responses with data()', async t => {
-  await uniqueTest(t, '/data')
-})
-
-test.serial('unique responses with component', async t => {
-  await uniqueTest(t, '/component')
-})
-
-test.serial('unique responses with async components', async t => {
-  await uniqueTest(t, '/asyncComponent')
-})
-
-test.serial('unique responses with asyncData()', async t => {
-  await uniqueTest(t, '/asyncData')
-})
-
-test.serial('unique responses with store initial state', async t => {
-  await uniqueTest(t, '/store')
-})
-
-test.serial('unique responses with nuxtServerInit', async t => {
-  await uniqueTest(t, '/store?onServerInit=1')
-})
-
-test.serial('unique responses with fetch', async t => {
-  await uniqueTest(t, '/fetch')
-})
-
-// == Stress Test ==
-// The idea of this test is to ensure there is no memory or data leak during SSR requests
-// Or pending promises/sockets and function calls.
-// Related issue: https://github.com/nuxt/nuxt.js/issues/1354
-const stressTest = async (t, _url, concurrency = 2, steps = 4) => {
-  let statusCodes = {}
-
-  await Utils.sequence(range(steps), async () => {
-    await Utils.parallel(range(concurrency), async () => {
-      let response = await rp(url(_url), { resolveWithFullResponse: true })
-      // Status Code
-      let code = response.statusCode
-      if (!statusCodes[code]) {
-        statusCodes[code] = 0
-      }
-      statusCodes[code]++
-    })
+  test('unique responses with data()', async () => {
+    await uniqueTest('/data')
   })
 
-  t.is(statusCodes[200], concurrency * steps)
-}
+  test('unique responses with component', async () => {
+    await uniqueTest('/component')
+  })
 
-test.serial('stress test with asyncData', async t => {
-  await stressTest(t, '/asyncData')
-})
+  test('unique responses with async components', async () => {
+    await uniqueTest('/asyncComponent')
+  })
 
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
+  test('unique responses with asyncData()', async () => {
+    await uniqueTest('/asyncData')
+  })
+
+  test('unique responses with store initial state', async () => {
+    await uniqueTest('/store')
+  })
+
+  test('unique responses with nuxtServerInit', async () => {
+    await uniqueTest('/store?onServerInit=1')
+  })
+
+  test('unique responses with fetch', async () => {
+    await uniqueTest('/fetch')
+  })
+
+  // == Stress Test ==
+  // The idea of this test is to ensure there is no memory or data leak during SSR requests
+  // Or pending promises/sockets and function calls.
+  // Related issue: https://github.com/nuxt/nuxt.js/issues/1354
+  const stressTest = async (t, _url, concurrency = 2, steps = 4) => {
+    let statusCodes = {}
+
+    await Utils.sequence(range(steps), async () => {
+      await Utils.parallel(range(concurrency), async () => {
+        let response = await rp(url(_url), { resolveWithFullResponse: true })
+        // Status Code
+        let code = response.statusCode
+        if (!statusCodes[code]) {
+          statusCodes[code] = 0
+        }
+        statusCodes[code]++
+      })
+    })
+
+    expect(statusCodes[200]).toBe(concurrency * steps)
+  }
+
+  test('stress test with asyncData', async () => {
+    await stressTest('/asyncData')
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
+  })
 })
diff --git a/test/utils.test.js b/test/utils.test.js
index 2dd8b11f00..1e3e59b170 100644
--- a/test/utils.test.js
+++ b/test/utils.test.js
@@ -1,207 +1,205 @@
-import test from 'ava'
 import ansiHTML from 'ansi-html'
 import { Utils } from '..'
 
-test('encodeHtml', t => {
-  const html = '<h1>Hello</h1>'
-  t.is(Utils.encodeHtml(html), '&lt;h1&gt;Hello&lt;/h1&gt;')
-})
-
-test('getContext', t => {
-  let ctx = Utils.getContext({ a: 1 }, { b: 2 })
-  t.is(Utils.getContext.length, 2)
-  t.is(typeof ctx.req, 'object')
-  t.is(typeof ctx.res, 'object')
-  t.is(ctx.req.a, 1)
-  t.is(ctx.res.b, 2)
-})
-
-test('setAnsiColors', t => {
-  Utils.setAnsiColors(ansiHTML)
-  t.pass()
-})
-
-test('waitFor', async t => {
-  let s = Date.now()
-  await Utils.waitFor(100)
-  t.true(Date.now() - s >= 100)
-  await Utils.waitFor()
-})
-
-test('timeout (promise)', async t => {
-  const result = await Utils.timeout(Promise.resolve('time not run out'), 100)
-  t.is(result, 'time not run out')
-})
-
-test('timeout (async function)', async t => {
-  const result = await Utils.timeout(async () => {
-    await Utils.waitFor(10)
-    return 'time not run out'
-  }, 100)
-  t.is(result, 'time not run out')
-})
-
-test('timeout (timeout in 100ms)', async t => {
-  const timeout = Utils.timeout(Utils.waitFor(200), 100, 'timeout test 100ms')
-  const { message } = await t.throws(timeout)
-  t.is(message, 'timeout test 100ms')
-})
-
-test('timeout (async timeout in 100ms)', async t => {
-  const timeout = Utils.timeout(async () => {
-    await Utils.waitFor(500)
-  }, 100, 'timeout test 100ms')
-  const { message } = await t.throws(timeout)
-  t.is(message, 'timeout test 100ms')
-})
-
-test('urlJoin', t => {
-  t.is(Utils.urlJoin('test', '/about'), 'test/about')
-})
-
-test('promisifyRoute (array)', t => {
-  const array = [1]
-  const promise = Utils.promisifyRoute(array)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res, array)
+describe('utils', () => {
+  test('encodeHtml', () => {
+    const html = '<h1>Hello</h1>'
+    expect(Utils.encodeHtml(html)).toBe('&lt;h1&gt;Hello&lt;/h1&gt;')
   })
-})
 
-test('promisifyRoute (fn => array)', t => {
-  const array = [1, 2]
-  const fn = function () {
-    return array
-  }
-  const promise = Utils.promisifyRoute(fn)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res, array)
+  test('getContext', () => {
+    let ctx = Utils.getContext({ a: 1 }, { b: 2 })
+    expect(Utils.getContext.length).toBe(2)
+    expect(typeof ctx.req).toBe('object')
+    expect(typeof ctx.res).toBe('object')
+    expect(ctx.req.a).toBe(1)
+    expect(ctx.res.b).toBe(2)
   })
-})
 
-test('promisifyRoute (fn => promise)', t => {
-  const array = [1, 2, 3]
-  const fn = function () {
-    return new Promise(resolve => {
-      resolve(array)
+  test('setAnsiColors', () => {
+    Utils.setAnsiColors(ansiHTML)
+  })
+
+  test('waitFor', async () => {
+    let s = Date.now()
+    await Utils.waitFor(100)
+    expect(Date.now() - s >= 100).toBe(true)
+    await Utils.waitFor()
+  })
+
+  test('timeout (promise)', async () => {
+    const result = await Utils.timeout(Promise.resolve('time not run out'), 100)
+    expect(result).toBe('time not run out')
+  })
+
+  test('timeout (async function)', async () => {
+    const result = await Utils.timeout(async () => {
+      await Utils.waitFor(10)
+      return 'time not run out'
+    }, 100)
+    expect(result).toBe('time not run out')
+  })
+
+  test('timeout (timeout in 100ms)', async () => {
+    const timeout = Utils.timeout(Utils.waitFor(200), 100, 'timeout test 100ms')
+    await expect(timeout).rejects.toThrow('timeout test 100ms')
+  })
+
+  test('timeout (async timeout in 100ms)', async () => {
+    const timeout = Utils.timeout(async () => {
+      await Utils.waitFor(500)
+    }, 100, 'timeout test 100ms')
+    await expect(timeout).rejects.toThrow('timeout test 100ms')
+  })
+
+  test('urlJoin', () => {
+    expect(Utils.urlJoin('test', '/about')).toBe('test/about')
+  })
+
+  test('promisifyRoute (array)', () => {
+    const array = [1]
+    const promise = Utils.promisifyRoute(array)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res).toBe(array)
     })
-  }
-  const promise = Utils.promisifyRoute(fn)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res, array)
   })
-})
 
-test('promisifyRoute ((fn(args) => promise))', t => {
-  const fn = function (array) {
-    return new Promise(resolve => {
-      resolve(array)
+  test('promisifyRoute (fn => array)', () => {
+    const array = [1, 2]
+    const fn = function () {
+      return array
+    }
+    const promise = Utils.promisifyRoute(fn)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res).toBe(array)
     })
-  }
-  const array = [1, 2, 3]
-  const promise = Utils.promisifyRoute(fn, array)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res, array)
+  })
+
+  test('promisifyRoute (fn => promise)', () => {
+    const array = [1, 2, 3]
+    const fn = function () {
+      return new Promise(resolve => {
+        resolve(array)
+      })
+    }
+    const promise = Utils.promisifyRoute(fn)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res).toBe(array)
+    })
+  })
+
+  test('promisifyRoute ((fn(args) => promise))', () => {
+    const fn = function (array) {
+      return new Promise(resolve => {
+        resolve(array)
+      })
+    }
+    const array = [1, 2, 3]
+    const promise = Utils.promisifyRoute(fn, array)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res).toBe(array)
+    })
+  })
+
+  test('promisifyRoute (fn(cb) with error)', () => {
+    const fn = function (cb) {
+      cb(new Error('Error here'))
+    }
+    const promise = Utils.promisifyRoute(fn)
+    expect(typeof promise).toBe('object')
+    return promise.catch(e => {
+      expect(e.message).toBe('Error here')
+    })
+  })
+
+  test('promisifyRoute (fn(cb, args) with error)', () => {
+    const fn = function (cb, array) {
+      cb(new Error('Error here: ' + array.join()))
+    }
+    const array = [1, 2, 3, 4]
+    const promise = Utils.promisifyRoute(fn, array)
+    expect(typeof promise).toBe('object')
+    return promise.catch(e => {
+      expect(e.message).toBe('Error here: ' + array.join())
+    })
+  })
+
+  test('promisifyRoute (fn(cb) with result)', () => {
+    const array = [1, 2, 3, 4]
+    const fn = function (cb) {
+      cb(null, array)
+    }
+    const promise = Utils.promisifyRoute(fn)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res).toBe(array)
+    })
+  })
+
+  test('promisifyRoute (fn(cb, args) with result)', () => {
+    const fn = function (cb, array, object) {
+      cb(null, { array, object })
+    }
+    const array = [1, 2, 3, 4]
+    const object = { a: 1 }
+    const promise = Utils.promisifyRoute(fn, array, object)
+    expect(typeof promise).toBe('object')
+    return promise.then(res => {
+      expect(res.array).toBe(array)
+      expect(res.object).toBe(object)
+    })
+  })
+
+  test('chainFn (mutate, mutate)', () => {
+    // Pass more than one argument to test that they're actually taken into account
+    const firstFn = function (obj, count) {
+      obj.foo = count + 1
+    }
+    const secondFn = function (obj, count) {
+      obj.bar = count + 2
+    }
+
+    const chainedFn = Utils.chainFn(firstFn, secondFn)
+    expect(chainedFn({}, 10)).toEqual({ foo: 11, bar: 12 })
+  })
+
+  test('chainFn (mutate, return)', () => {
+    const firstFn = function (obj, count) {
+      obj.foo = count + 1
+    }
+    const secondFn = function (obj, count) {
+      return Object.assign({}, obj, { bar: count + 2 })
+    }
+
+    const chainedFn = Utils.chainFn(firstFn, secondFn)
+    expect(chainedFn({}, 10)).toEqual({ foo: 11, bar: 12 })
+  })
+
+  test('chainFn (return, mutate)', () => {
+    const firstFn = function (obj, count) {
+      return Object.assign({}, obj, { foo: count + 1 })
+    }
+    const secondFn = function (obj, count) {
+      obj.bar = count + 2
+    }
+
+    const chainedFn = Utils.chainFn(firstFn, secondFn)
+    expect(chainedFn({}, 10)).toEqual({ foo: 11, bar: 12 })
+  })
+
+  test('chainFn (return, return)', () => {
+    const firstFn = function (obj, count) {
+      return Object.assign({}, obj, { foo: count + 1 })
+    }
+    const secondFn = function (obj, count) {
+      return Object.assign({}, obj, { bar: count + 2 })
+    }
+
+    const chainedFn = Utils.chainFn(firstFn, secondFn)
+    expect(chainedFn({}, 10)).toEqual({ foo: 11, bar: 12 })
   })
 })
-
-test('promisifyRoute (fn(cb) with error)', t => {
-  const fn = function (cb) {
-    cb(new Error('Error here'))
-  }
-  const promise = Utils.promisifyRoute(fn)
-  t.is(typeof promise, 'object')
-  return promise.catch(e => {
-    t.is(e.message, 'Error here')
-  })
-})
-
-test('promisifyRoute (fn(cb, args) with error)', t => {
-  const fn = function (cb, array) {
-    cb(new Error('Error here: ' + array.join()))
-  }
-  const array = [1, 2, 3, 4]
-  const promise = Utils.promisifyRoute(fn, array)
-  t.is(typeof promise, 'object')
-  return promise.catch(e => {
-    t.is(e.message, 'Error here: ' + array.join())
-  })
-})
-
-test('promisifyRoute (fn(cb) with result)', t => {
-  const array = [1, 2, 3, 4]
-  const fn = function (cb) {
-    cb(null, array)
-  }
-  const promise = Utils.promisifyRoute(fn)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res, array)
-  })
-})
-
-test('promisifyRoute (fn(cb, args) with result)', t => {
-  const fn = function (cb, array, object) {
-    cb(null, { array, object })
-  }
-  const array = [1, 2, 3, 4]
-  const object = { a: 1 }
-  const promise = Utils.promisifyRoute(fn, array, object)
-  t.is(typeof promise, 'object')
-  return promise.then(res => {
-    t.is(res.array, array)
-    t.is(res.object, object)
-  })
-})
-
-test('chainFn (mutate, mutate)', t => {
-  // Pass more than one argument to test that they're actually taken into account
-  const firstFn = function (obj, count) {
-    obj.foo = count + 1
-  }
-  const secondFn = function (obj, count) {
-    obj.bar = count + 2
-  }
-  const chainedFn = Utils.chainFn(firstFn, secondFn)
-  const expectedResult = { foo: 11, bar: 12 }
-  t.deepEqual(chainedFn({}, 10), expectedResult)
-})
-
-test('chainFn (mutate, return)', t => {
-  const firstFn = function (obj, count) {
-    obj.foo = count + 1
-  }
-  const secondFn = function (obj, count) {
-    return Object.assign({}, obj, { bar: count + 2 })
-  }
-  const chainedFn = Utils.chainFn(firstFn, secondFn)
-  const expectedResult = { foo: 11, bar: 12 }
-  t.deepEqual(chainedFn({}, 10), expectedResult)
-})
-
-test('chainFn (return, mutate)', t => {
-  const firstFn = function (obj, count) {
-    return Object.assign({}, obj, { foo: count + 1 })
-  }
-  const secondFn = function (obj, count) {
-    obj.bar = count + 2
-  }
-  const chainedFn = Utils.chainFn(firstFn, secondFn)
-  const expectedResult = { foo: 11, bar: 12 }
-  t.deepEqual(chainedFn({}, 10), expectedResult)
-})
-
-test('chainFn (return, return)', t => {
-  const firstFn = function (obj, count) {
-    return Object.assign({}, obj, { foo: count + 1 })
-  }
-  const secondFn = function (obj, count) {
-    return Object.assign({}, obj, { bar: count + 2 })
-  }
-  const chainedFn = Utils.chainFn(firstFn, secondFn)
-  const expectedResult = { foo: 11, bar: 12 }
-  t.deepEqual(chainedFn({}, 10), expectedResult)
-})
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 1d3a6b81c7..210050f697 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,12 +1,10 @@
 import { resolve } from 'path'
 
-import test from 'ava'
 import rp from 'request-promise-native'
 
 import { Nuxt, Builder } from '..'
 import styleLoader from '../lib/builder/webpack/style-loader'
 
-import { interceptLog, release } from './helpers/console'
 import { loadConfig } from './helpers/config'
 
 const port = 4007
@@ -15,210 +13,205 @@ const url = route => 'http://localhost:' + port + route
 let nuxt = null
 let builder = null
 
-// Init nuxt.js and create server listening on localhost:4000
-test.before('Init Nuxt.js', async t => {
-  const config = loadConfig('with-config', {
-    dev: false
-  })
+describe('with-config', () => {
+  // Init nuxt.js and create server listening on localhost:4000
+  beforeAll(async () => {
+    const config = loadConfig('with-config', {
+      dev: false
+    })
 
-  const logSpy = await interceptLog(async () => {
     nuxt = new Nuxt(config)
     builder = new Builder(nuxt)
     await builder.build()
     await nuxt.listen(port, 'localhost')
+  }, 30000)
+
+  test('/', async () => {
+    // const logSpy = await interceptLog()
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('<h1>I have custom configurations</h1>')).toBe(true)
+    // release()
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
   })
 
-  t.true(logSpy.calledWithMatch('DONE'))
-  t.true(logSpy.calledWithMatch('OPEN'))
-})
+  test('/ (global styles inlined)', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('.global-css-selector')).toBe(true)
+  })
 
-test.serial('/', async t => {
-  const logSpy = await interceptLog()
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<h1>I have custom configurations</h1>'))
-  release()
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-})
-
-test('/ (global styles inlined)', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('.global-css-selector'))
-})
-
-test.skip('/ (preload fonts)', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(
-    html.includes(
+  test.skip('/ (preload fonts)', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes(
       '<link rel="preload" href="/test/orion/fonts/roboto.7cf5d7c.woff2" as="font" type="font/woff2" crossorigin'
-    )
-  )
-})
-
-test('/ (custom app.html)', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<p>Made by Nuxt.js team</p>'))
-})
-
-test('/ (custom build.publicPath)', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('<script src="/test/orion/'))
-})
-
-test('/ (custom postcss.config.js)', async t => {
-  const { html } = await nuxt.renderRoute('/')
-  t.true(html.includes('::-webkit-input-placeholder'))
-})
-
-test.serial('/test/ (router base)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/'))
-
-  const html = window.document.body.innerHTML
-  t.is(window.__NUXT__.layout, 'default')
-  t.true(html.includes('<h1>Default layout</h1>'))
-  t.true(html.includes('<h1>I have custom configurations</h1>'))
-  release()
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-})
-
-test.serial('/test/about (custom layout)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/about'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.is(window.__NUXT__.layout, 'custom')
-  t.true(html.includes('<h1>Custom layout</h1>'))
-  t.true(html.includes('<h1>About page</h1>'))
-})
-
-test.serial('/test/desktop (custom layout in desktop folder)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/desktop'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.is(window.__NUXT__.layout, 'desktop/default')
-  t.true(html.includes('<h1>Default desktop layout</h1>'))
-  t.true(html.includes('<h1>Desktop page</h1>'))
-})
-
-test.serial('/test/mobile (custom layout in mobile folder)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/mobile'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.is(window.__NUXT__.layout, 'mobile/default')
-  t.true(html.includes('<h1>Default mobile layout</h1>'))
-  t.true(html.includes('<h1>Mobile page</h1>'))
-})
-
-test.serial('/test/env', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/env'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Custom env layout</h1>'))
-  t.true(html.includes('"bool": true'))
-  t.true(html.includes('"num": 23'))
-  t.true(html.includes('"string": "Nuxt.js"'))
-  t.true(html.includes('"bool": false'))
-  t.true(html.includes('"string": "ok"'))
-  t.true(html.includes('"num2": 8.23'))
-  t.true(html.includes('"obj": {'))
-})
-
-test.serial('/test/error', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/error'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.true(html.includes('Error page'))
-})
-
-test.serial('/test/user-agent', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/user-agent'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<pre>Mozilla'))
-})
-
-test.serial('/test/about-bis (added with extendRoutes)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/about-bis'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Custom layout</h1>'))
-  t.true(html.includes('<h1>About page</h1>'))
-})
-
-test.serial('/test/redirect/about-bis (redirect with extendRoutes)', async t => {
-  const logSpy = await interceptLog()
-  const window = await nuxt.renderAndGetWindow(url('/test/redirect/about-bis'))
-  t.true(logSpy.calledOnce)
-  t.is(logSpy.args[0][0], 'Test plugin!')
-  release()
-
-  const windowHref = window.location.href
-  t.true(windowHref.includes('/test/about-bis'))
-
-  const html = window.document.body.innerHTML
-  t.true(html.includes('<h1>Custom layout</h1>'))
-  t.true(html.includes('<h1>About page</h1>'))
-})
-
-test('Check stats.json generated by build.analyze', t => {
-  const stats = require(resolve(
-    __dirname,
-    'fixtures/with-config/.nuxt/dist/stats.json'
-  ))
-  t.is(stats.assets.length > 0, true)
-})
-
-test('Check /test/test.txt with custom serve-static options', async t => {
-  const { headers } = await rp(url('/test/test.txt'), {
-    resolveWithFullResponse: true
+    )).toBe(true)
   })
-  t.is(headers['cache-control'], 'public, max-age=31536000')
-})
 
-test('Check /test.txt should return 404', async t => {
-  const err = await t.throws(rp(url('/test.txt')))
-  t.is(err.response.statusCode, 404)
-})
+  test('/ (custom app.html)', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('<p>Made by Nuxt.js team</p>')).toBe(true)
+  })
 
-test('Check build.styleResources for style-resources-loader', async t => {
-  const loaders = styleLoader.call(builder, 'scss')
-  const loader = loaders.find(l => l.loader === 'style-resources-loader')
-  t.is(typeof loader, 'object')
-  t.deepEqual(loader.options, {
-    patterns: ['~/assets/pre-process.scss']
+  test('/ (custom build.publicPath)', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('<script src="/test/orion/')).toBe(true)
+  })
+
+  test('/ (custom postcss.config.js)', async () => {
+    const { html } = await nuxt.renderRoute('/')
+    expect(html.includes('::-webkit-input-placeholder')).toBe(true)
+  })
+
+  test('/test/ (router base)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/'))
+
+    const html = window.document.body.innerHTML
+    expect(window.__NUXT__.layout).toBe('default')
+    expect(html.includes('<h1>Default layout</h1>')).toBe(true)
+    expect(html.includes('<h1>I have custom configurations</h1>')).toBe(true)
+    // release()
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+  })
+
+  test('/test/about (custom layout)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/about'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(window.__NUXT__.layout).toBe('custom')
+    expect(html.includes('<h1>Custom layout</h1>')).toBe(true)
+    expect(html.includes('<h1>About page</h1>')).toBe(true)
+  })
+
+  test('/test/desktop (custom layout in desktop folder)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/desktop'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(window.__NUXT__.layout).toBe('desktop/default')
+    expect(html.includes('<h1>Default desktop layout</h1>')).toBe(true)
+    expect(html.includes('<h1>Desktop page</h1>')).toBe(true)
+  })
+
+  test('/test/mobile (custom layout in mobile folder)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/mobile'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(window.__NUXT__.layout).toBe('mobile/default')
+    expect(html.includes('<h1>Default mobile layout</h1>')).toBe(true)
+    expect(html.includes('<h1>Mobile page</h1>')).toBe(true)
+  })
+
+  test('/test/env', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/env'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>Custom env layout</h1>')).toBe(true)
+    expect(html.includes('"bool": true')).toBe(true)
+    expect(html.includes('"num": 23')).toBe(true)
+    expect(html.includes('"string": "Nuxt.js"')).toBe(true)
+    expect(html.includes('"bool": false')).toBe(true)
+    expect(html.includes('"string": "ok"')).toBe(true)
+    expect(html.includes('"num2": 8.23')).toBe(true)
+    expect(html.includes('"obj": {')).toBe(true)
+  })
+
+  test('/test/error', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/error'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(html.includes('Error page')).toBe(true)
+  })
+
+  test('/test/user-agent', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/user-agent'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(html.includes('<pre>Mozilla')).toBe(true)
+  })
+
+  test('/test/about-bis (added with extendRoutes)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/about-bis'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>Custom layout</h1>')).toBe(true)
+    expect(html.includes('<h1>About page</h1>')).toBe(true)
+  })
+
+  test('/test/redirect/about-bis (redirect with extendRoutes)', async () => {
+    // const logSpy = await interceptLog()
+    const window = await nuxt.renderAndGetWindow(url('/test/redirect/about-bis'))
+    // expect(logSpy.calledOnce).toBe(true)
+    // expect(logSpy.args[0][0]).toBe('Test plugin!')
+    // release()
+
+    const windowHref = window.location.href
+    expect(windowHref.includes('/test/about-bis')).toBe(true)
+
+    const html = window.document.body.innerHTML
+    expect(html.includes('<h1>Custom layout</h1>')).toBe(true)
+    expect(html.includes('<h1>About page</h1>')).toBe(true)
+  })
+
+  test('Check stats.json generated by build.analyze', () => {
+    const stats = require(resolve(
+      __dirname,
+      'fixtures/with-config/.nuxt/dist/stats.json'
+    ))
+    expect(stats.assets.length > 0).toBe(true)
+  })
+
+  test('Check /test/test.txt with custom serve-static options', async () => {
+    const { headers } = await rp(url('/test/test.txt'), {
+      resolveWithFullResponse: true
+    })
+    expect(headers['cache-control']).toBe('public, max-age=31536000')
+  })
+
+  test('Check /test.txt should return 404', async () => {
+    await expect(rp(url('/test.txt')))
+      .rejects.toMatchObject({ statusCode: 404 })
+  })
+
+  test('Check build.styleResources for style-resources-loader', async () => {
+    const loaders = styleLoader.call(builder, 'scss')
+    const loader = loaders.find(l => l.loader === 'style-resources-loader')
+    expect(typeof loader).toBe('object')
+    expect(loader.options).toEqual({
+      patterns: ['~/assets/pre-process.scss']
+    })
+  })
+
+  // Close server and ask nuxt to stop listening to file changes
+  test('Closing server and nuxt.js', async () => {
+    await nuxt.close()
   })
 })
-
-// Close server and ask nuxt to stop listening to file changes
-test.after.always('Closing server and nuxt.js', async t => {
-  await nuxt.close()
-})

From 07c40a913aa2272f31daa40a0671a0fae8af19da Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Sun, 18 Mar 2018 23:41:43 +0330
Subject: [PATCH 05/55] build-fixtures script

---
 package.json           |  1 +
 scripts/build-fixtures | 57 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100755 scripts/build-fixtures

diff --git a/package.json b/package.json
index a1759ca58d..b46814fe79 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "setupTestFrameworkScriptFile": "./test/helpers/setup"
   },
   "scripts": {
+    "build-fixtures": "./scripts/build-fixtures",
     "test": "npm run lint && jest",
     "test-appveyor": "yarn test",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
diff --git a/scripts/build-fixtures b/scripts/build-fixtures
new file mode 100755
index 0000000000..f5fc464ee2
--- /dev/null
+++ b/scripts/build-fixtures
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+process.env.NODE_ENV = 'test'
+
+const { Builder, Nuxt } = require('..')
+const { requireModule } = require('../lib/common/module')
+const path = require('path')
+const fs = require('fs')
+const ORA = require('ora')
+
+const fixtures = [
+  // csr, dev, generate, fail generate, fallback generate, ssr, ssr csp, spa
+  'basic',
+
+  'children',
+  'custom-dirs',
+  'debug',
+  'deprecate',
+  'dynamic-routes',
+  'empty',
+  'error',
+  'module',
+  'ssr',
+  'with-config'
+]
+
+const spinner = new ORA()
+
+async function buildFixture(name) {
+  spinner.info('Loading config for fixture ' + name)
+
+  const rootDir = path.resolve(__dirname, '../test/fixtures', name)
+  const configFile = path.resolve(rootDir, 'nuxt.config.js')
+  const config = fs.existsSync(configFile) ? requireModule(configFile) : {}
+
+  config.rootDir = rootDir
+
+  spinner.start('Building fixture ' + name)
+
+  const nuxt = new Nuxt(config)
+  const builder = new Builder(nuxt)
+
+  await builder.build()
+
+  spinner.succeed('Built fixture ' + name)
+
+  await nuxt.close()
+}
+
+async function run() {
+  for (let fixture of fixtures) {
+    await buildFixture(fixture)
+  }
+}
+
+run()
+  .catch(console.error) // eslint-disable-line no-console
+  .then(() => process.exit(0))

From e59152c550e90e4f0e2600a09eaa81c976619864 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 02:44:27 +0330
Subject: [PATCH 06/55] fix(utils): use typeof for function check

---
 lib/common/utils.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/common/utils.mjs b/lib/common/utils.mjs
index 96730ab8c3..2559e79b16 100644
--- a/lib/common/utils.mjs
+++ b/lib/common/utils.mjs
@@ -133,8 +133,8 @@ export const parallel = function parallel(tasks, fn) {
 
 export const chainFn = function chainFn(base, fn) {
   /* istanbul ignore if */
-  if (!(fn instanceof Function)) {
-    return
+  if (typeof fn !== 'function') {
+    return base
   }
   return function () {
     if (typeof base !== 'function') {

From e6f84d16bbc4731c737fc41137c30ffe0a47e4cc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 02:45:07 +0330
Subject: [PATCH 07/55] fix(webpack): revert back ExtractTextPlugin to
 base.config

---
 lib/builder/webpack/base.config.mjs   | 15 +++++++++++++++
 lib/builder/webpack/client.config.mjs | 17 -----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/builder/webpack/base.config.mjs b/lib/builder/webpack/base.config.mjs
index dcc91f189d..4f9305beb0 100644
--- a/lib/builder/webpack/base.config.mjs
+++ b/lib/builder/webpack/base.config.mjs
@@ -1,5 +1,6 @@
 import path from 'path'
 
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import TimeFixPlugin from 'time-fix-plugin'
 import webpack from 'webpack'
 import _ from 'lodash'
@@ -146,6 +147,20 @@ export default function webpackBaseConfig({ name, isServer }) {
   // Hide warnings about plugins without a default export (#1179)
   config.plugins.push(new WarnFixPlugin())
 
+  // CSS extraction
+  const extractCSS = this.options.build.extractCSS
+  if (extractCSS) {
+    config.plugins.push(new ExtractTextPlugin(Object.assign({
+      filename: this.getFileName('css')
+
+      // When using optimization.splitChunks and there are
+      // extracted chunks in the commons chunk,
+      // allChunks *must* be set to true
+      // TODO: For nuxt this makes duplicate css assets!
+      // allChunks: true
+    }, typeof extractCSS === 'object' ? extractCSS : {})))
+  }
+
   // Clone deep avoid leaking config between Client and Server
   return _.cloneDeep(config)
 }
diff --git a/lib/builder/webpack/client.config.mjs b/lib/builder/webpack/client.config.mjs
index 75f546b356..5025a8d4e9 100644
--- a/lib/builder/webpack/client.config.mjs
+++ b/lib/builder/webpack/client.config.mjs
@@ -4,7 +4,6 @@ import _ from 'lodash'
 import webpack from 'webpack'
 import HTMLPlugin from 'html-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from '@nuxtjs/friendly-errors-webpack-plugin'
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import StylishPlugin from 'webpack-stylish'
 import BundleAnalyzer from 'webpack-bundle-analyzer'
 
@@ -135,22 +134,6 @@ export default function webpackClientConfig() {
   // Create additional runtime chunk for cache boosting
   config.optimization.runtimeChunk = true
 
-  // CSS extraction
-  const extractCSS = this.options.build.extractCSS
-  if (extractCSS) {
-    config.plugins.push(new ExtractTextPlugin(Object.assign({
-      filename: this.getFileName('css')
-
-      // When using optimization.splitChunks and there are
-      // extracted chunks in the commons chunk,
-      // allChunks *must* be set to true
-      // TODO: For nuxt this makes duplicate css assets!
-      // allChunks: true
-    },
-    typeof extractCSS === 'object' ? extractCSS : {}
-    )))
-  }
-
   // --------------------------------------
   // Dev specific config
   // --------------------------------------

From c4068c3a704b020903a5b202e164e6b7a279175a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 03:11:14 +0330
Subject: [PATCH 08/55] working tests

---
 jest.config.js                                |  21 +++
 package.json                                  |   8 +-
 scripts/build-fixtures                        |   1 +
 ...asic.csr.test.js => basic.browser.test.js} |  71 ++-------
 test/basic.config.defaults.test.js            |   1 -
 test/basic.dev.test.js                        |  26 +---
 test/basic.fail.generate.test.js              |  29 ++--
 test/basic.generate.test.js                   |  32 ++--
 test/basic.ssr.csp.test.js                    |  24 +--
 test/basic.ssr.test.js                        |  23 +--
 ...test.js => children.patch.browser.test.js} |  29 ++--
 test/children.test.js                         |  21 +--
 test/cli.test.js                              |  10 +-
 test/custom-dirs.test.js                      |  18 +--
 test/debug.test.js                            |  16 +-
 test/deprecate.test.js                        |  25 ++-
 test/dynamic-routes.test.js                   |  15 --
 test/error.test.js                            |  14 +-
 test/express.test.js                          |  33 ++--
 test/fallback.generate.test.js                |  56 ++-----
 test/fixtures/basic/nuxt.config.js            |   9 ++
 test/helpers/config.js                        |  11 --
 test/helpers/console.d.js                     | 142 ------------------
 test/module.test.js                           |  30 ++--
 test/nuxt.test.js                             |  14 +-
 test/spa.test.js                              |  28 ++--
 test/ssr.test.js                              | 110 +++++++-------
 test/{helpers => utils}/browser.js            |   2 +-
 test/utils/index.js                           |  21 +++
 test/{helpers => utils}/setup.js              |   1 -
 test/with-config.test.js                      |  40 +----
 yarn.lock                                     | 108 +++++++++++--
 32 files changed, 382 insertions(+), 607 deletions(-)
 create mode 100644 jest.config.js
 rename test/{basic.csr.test.js => basic.browser.test.js} (77%)
 rename test/{children.patch.test.js => children.patch.browser.test.js} (89%)
 delete mode 100644 test/helpers/config.js
 delete mode 100644 test/helpers/console.d.js
 rename test/{helpers => utils}/browser.js (98%)
 create mode 100644 test/utils/index.js
 rename test/{helpers => utils}/setup.js (57%)

diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000000..7478e43cdf
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+  'testEnvironment': 'node',
+  'coverageDirectory': './coverage/',
+  'collectCoverage': false,
+  'setupTestFrameworkScriptFile': './test/utils/setup',
+  'testMatch': [
+    '<rootDir>/test/*.test.js'
+  ],
+  'projects': [
+    // {
+    //   'displayName': 'Lint',
+    //   'runner': 'jest-runner-eslint',
+    //   'testMatch': [
+    //     '<rootDir>/lib/*.js'
+    //   ]
+    // },
+    {
+      'displayName': 'Test'
+    }
+  ]
+}
diff --git a/package.json b/package.json
index b46814fe79..e2bd934c48 100644
--- a/package.json
+++ b/package.json
@@ -40,12 +40,6 @@
   "bin": {
     "nuxt": "./bin/nuxt"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": false,
-    "setupTestFrameworkScriptFile": "./test/helpers/setup"
-  },
   "scripts": {
     "build-fixtures": "./scripts/build-fixtures",
     "test": "npm run lint && jest",
@@ -136,7 +130,9 @@
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.16.2",
     "finalhandler": "^1.1.1",
+    "get-port": "^3.2.0",
     "jest": "^22.4.2",
+    "jest-runner-eslint": "^0.4.0",
     "jsdom": "^11.6.2",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index f5fc464ee2..958779517b 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -33,6 +33,7 @@ async function buildFixture(name) {
   const config = fs.existsSync(configFile) ? requireModule(configFile) : {}
 
   config.rootDir = rootDir
+  config.dev = false
 
   spinner.start('Building fixture ' + name)
 
diff --git a/test/basic.csr.test.js b/test/basic.browser.test.js
similarity index 77%
rename from test/basic.csr.test.js
rename to test/basic.browser.test.js
index 9eff2fdc3b..e9315b757b 100644
--- a/test/basic.csr.test.js
+++ b/test/basic.browser.test.js
@@ -1,36 +1,19 @@
-import { resolve } from 'path'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
+import * as browser from './utils/browser'
 
-import { Nuxt, Builder } from '..'
-
-import * as browser from './helpers/browser'
-
-const port = 4003
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 let page = null
 
-const waitFor = ms => new Promise(resolve => setTimeout(resolve, ms || 0))
-
-describe('basic csr', () => {
-  // Init nuxt.js and create server listening on localhost:4003
+describe('basic browser', () => {
   beforeAll(async () => {
-    const options = {
-      rootDir: resolve(__dirname, 'fixtures/basic'),
-      buildDir: '.nuxt-csr',
-      dev: true,
-      build: {
-        stats: false
-      }
-    }
+    const config = loadFixture('basic')
+    nuxt = new Nuxt(config)
+    port = await getPort() ; await nuxt.listen(port, 'localhost')
 
-    nuxt = new Nuxt(options)
-    new Builder(nuxt).build()
-    await nuxt.listen(port, 'localhost')
-  }, 30000)
-
-  test('Start browser', async () => {
-    expect.assertions(0) // suppress 'no assertions' warning
     await browser.start({
       // slowMo: 50,
       // headless: false
@@ -39,7 +22,6 @@ describe('basic csr', () => {
 
   test('Open /', async () => {
     page = await browser.page(url('/'))
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('Index page')
   })
@@ -47,7 +29,6 @@ describe('basic csr', () => {
   test('/stateless', async () => {
     const { hook } = await page.nuxt.navigate('/stateless', false)
     const loading = await page.nuxt.loadingData()
-    await waitFor(1000)
 
     expect(loading.show).toBe(true)
     await hook
@@ -56,22 +37,20 @@ describe('basic csr', () => {
 
   test('/css', async () => {
     await page.nuxt.navigate('/css')
-    await waitFor(1000)
 
     expect(await page.$text('.red')).toBe('This is red')
     expect(await page.$eval('.red', red => window.getComputedStyle(red).color)).toBe('rgb(255, 0, 0)')
   })
 
-  test('/stateful', async () => {
-    await page.nuxt.navigate('/stateful')
-    await waitFor(1000)
+  test.skip('/stateful', async () => {
+    const { hook } = await page.nuxt.navigate('/stateful')
 
+    await hook
     expect(await page.$text('p')).toBe('The answer is 42')
   })
 
   test('/store', async () => {
     await page.nuxt.navigate('/store')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('Vuex Nested Modules')
     expect(await page.$text('p')).toBe('1')
@@ -83,7 +62,6 @@ describe('basic csr', () => {
     )
     await page.nuxt.navigate('/head')
     const metas = await page.$$attr('meta', 'content')
-    await waitFor(1000)
 
     expect(await msg).toBe('Body script!')
     expect(await page.title()).toBe('My title - Nuxt.js')
@@ -93,35 +71,30 @@ describe('basic csr', () => {
 
   test('/async-data', async () => {
     await page.nuxt.navigate('/async-data')
-    await waitFor(1000)
 
     expect(await page.$text('p')).toBe('Nuxt.js')
   })
 
   test('/await-async-data', async () => {
     await page.nuxt.navigate('/await-async-data')
-    await waitFor(1000)
 
     expect(await page.$text('p')).toBe('Await Nuxt.js')
   })
 
   test('/callback-async-data', async () => {
     await page.nuxt.navigate('/callback-async-data')
-    await waitFor(1000)
 
     expect(await page.$text('p')).toBe('Callback Nuxt.js')
   })
 
   test('/users/1', async () => {
     await page.nuxt.navigate('/users/1')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('User: 1')
   })
 
   test('/validate should display a 404', async () => {
     await page.nuxt.navigate('/validate')
-    await waitFor(1000)
 
     const error = await page.nuxt.errorData()
 
@@ -131,21 +104,18 @@ describe('basic csr', () => {
 
   test('/validate?valid=true', async () => {
     await page.nuxt.navigate('/validate?valid=true')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('I am valid')
   })
 
   test('/redirect', async () => {
     await page.nuxt.navigate('/redirect')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('Index page')
   })
 
   test('/error', async () => {
     await page.nuxt.navigate('/error')
-    await waitFor(1000)
 
     expect(await page.nuxt.errorData()).toEqual({ statusCode: 500 })
     expect(await page.$text('.title')).toBe('Error mouahahah')
@@ -153,7 +123,6 @@ describe('basic csr', () => {
 
   test('/error2', async () => {
     await page.nuxt.navigate('/error2')
-    await waitFor(1000)
 
     expect(await page.$text('.title')).toBe('Custom error')
     expect(await page.nuxt.errorData()).toEqual({ message: 'Custom error' })
@@ -161,7 +130,6 @@ describe('basic csr', () => {
 
   test('/redirect-middleware', async () => {
     await page.nuxt.navigate('/redirect-middleware')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('Index page')
   })
@@ -171,7 +139,6 @@ describe('basic csr', () => {
     const page = await browser.page(url('/'))
 
     await page.nuxt.navigate('/redirect-external', false)
-    await waitFor(1000)
 
     await page.waitForFunction(
       () => window.location.href === 'https://nuxtjs.org/'
@@ -181,21 +148,18 @@ describe('basic csr', () => {
 
   test('/redirect-name', async () => {
     await page.nuxt.navigate('/redirect-name')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('My component!')
   })
 
   test('/no-ssr', async () => {
     await page.nuxt.navigate('/no-ssr')
-    await waitFor(1000)
 
     expect(await page.$text('h1')).toBe('Displayed only on client-side')
   })
 
   test('/meta', async () => {
     await page.nuxt.navigate('/meta')
-    await waitFor(1000)
 
     const state = await page.nuxt.storeState()
     expect(state.meta).toEqual([{ works: true }])
@@ -203,7 +167,6 @@ describe('basic csr', () => {
 
   test('/fn-midd', async () => {
     await page.nuxt.navigate('/fn-midd')
-    await waitFor(1000)
 
     expect(await page.$text('.title')).toBe('You need to ask the permission')
     expect(await page.nuxt.errorData()).toEqual({
@@ -214,7 +177,6 @@ describe('basic csr', () => {
 
   test('/fn-midd?please=true', async () => {
     await page.nuxt.navigate('/fn-midd?please=true')
-    await waitFor(1000)
 
     const h1 = await page.$text('h1')
     expect(h1.includes('Date:')).toBe(true)
@@ -222,19 +184,18 @@ describe('basic csr', () => {
 
   test('/router-guard', async () => {
     await page.nuxt.navigate('/router-guard')
-    await waitFor(1000)
 
     const p = await page.$text('p')
     expect(p).toBe('Nuxt.js')
   })
 
-  test('Stop browser', async () => {
-    process.on('unhandledRejection', () => { })
-    await browser.stop()
-  })
-
   // Close server and ask nuxt to stop listening to file changes
   test('Closing server and nuxt.js', async () => {
     await nuxt.close()
   })
+
+  test('Stop browser', async () => {
+    await page.close()
+    await browser.close()
+  })
 })
diff --git a/test/basic.config.defaults.test.js b/test/basic.config.defaults.test.js
index 46f9f7d4aa..e3c4125b22 100644
--- a/test/basic.config.defaults.test.js
+++ b/test/basic.config.defaults.test.js
@@ -1,5 +1,4 @@
 import { resolve } from 'path'
-
 import { Nuxt, Options } from '..'
 import { version } from '../package.json'
 
diff --git a/test/basic.dev.test.js b/test/basic.dev.test.js
index ff73006735..5f83d887d4 100644
--- a/test/basic.dev.test.js
+++ b/test/basic.dev.test.js
@@ -1,32 +1,20 @@
-import { resolve } from 'path'
 import { Nuxt, Builder } from '..'
+import { loadFixture, getPort } from './utils'
 
-const port = 4001
+let port
 const url = route => 'http://localhost:' + port + route
-const rootDir = resolve(__dirname, 'fixtures/basic')
 
 let nuxt = null
 
 describe('basic dev', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const options = {
-      rootDir,
-      buildDir: '.nuxt-dev',
-      dev: true,
-      build: {
-        stats: false,
-        profile: true,
-        extractCSS: {
-          allChunks: true
-        }
-      }
-    }
-
-    nuxt = new Nuxt(options)
+    const config = loadFixture('basic', { buildDir: '.nuxt-dev' })
+    config.dev = true
+    nuxt = new Nuxt(config)
     new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   // TODO: enable test when style-loader.js:60 was resolved
   // test.serial('/extractCSS', async t => {
diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js
index 7544a46c65..dee2f50366 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/basic.fail.generate.test.js
@@ -1,28 +1,21 @@
-import { resolve } from 'path'
-
-import { Nuxt, Builder, Generator } from '..'
+import { Nuxt, Generator } from '..'
+import { loadFixture } from './utils'
 
 describe('basic fail generate', () => {
   test('Fail with routes() which throw an error', async () => {
-    const options = {
-      rootDir: resolve(__dirname, 'fixtures/basic'),
-      buildDir: '.nuxt-fail',
-      dev: false,
-      build: {
-        stats: false
-      },
+    const options = loadFixture('basic', {
       generate: {
         async routes() {
           throw new Error('Not today!')
         }
       }
-    }
-    const nuxt = new Nuxt(options)
-    const builder = new Builder(nuxt)
-    const generator = new Generator(nuxt, builder)
-
-    await generator.generate().catch(e => {
-      expect(e.message === 'Not today!').toBe(true)
     })
-  }, 30000)
+
+    const nuxt = new Nuxt(options)
+    const generator = new Generator(nuxt)
+
+    await generator.generate({ build: false }).catch(e => {
+      expect(e.message).toBe('Not today!')
+    })
+  })
 })
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index 0614ef0a31..9868054abb 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -1,17 +1,15 @@
 import { existsSync } from 'fs'
 import http from 'http'
 import { resolve } from 'path'
-
 import { remove } from 'fs-extra'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
+import { Nuxt, Generator } from '..'
+import { loadFixture, getPort } from './utils'
+import { get } from 'https';
 
-import { Nuxt, Builder, Generator } from '..'
-
-import { loadConfig } from './helpers/config'
-
-const port = 4002
+let port
 const url = route => 'http://localhost:' + port + route
 const rootDir = resolve(__dirname, 'fixtures/basic')
 
@@ -20,27 +18,21 @@ let server = null
 let generator = null
 
 describe('basic generate', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('basic', {
-      buildDir: '.nuxt-generate',
-      dev: false
-    })
-
-    config.build.stats = false
-
+    const config = loadFixture('basic')
     nuxt = new Nuxt(config)
-    const builder = new Builder(nuxt)
-    generator = new Generator(nuxt, builder)
+    generator = new Generator(nuxt)
 
-    await generator.generate()
+    await generator.generate({ build: false })
 
     const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
     server = http.createServer((req, res) => {
       serve(req, res, finalhandler(req, res))
     })
+
+    port = await getPort()
     server.listen(port)
-  }, 30000)
+  })
 
   test('Check ready hook called', async () => {
     expect(nuxt.__hook_called__).toBe(true)
@@ -76,7 +68,7 @@ describe('basic generate', () => {
     const window = await nuxt.renderAndGetWindow(url('/head'))
     const html = window.document.body.innerHTML
     const metas = window.document.getElementsByTagName('meta')
-    expect(window.document.title).toBe('My title')
+    expect(window.document.title).toBe('My title - Nuxt.js')
     expect(metas[0].getAttribute('content')).toBe('my meta')
     expect(html.includes('<div><h1>I can haz meta tags</h1></div>')).toBe(true)
     // release()
@@ -160,7 +152,7 @@ describe('basic generate', () => {
   test('nuxt re-generating with no subfolders', async () => {
     // const logSpy = await interceptLog()
     nuxt.options.generate.subFolders = false
-    await generator.generate()
+    await generator.generate({ build: false })
     // release()
     // expect(logSpy.calledWithMatch('DONE')).toBe(true)
   })
diff --git a/test/basic.ssr.csp.test.js b/test/basic.ssr.csp.test.js
index 4a7bc3310a..eba2d5fe7e 100644
--- a/test/basic.ssr.csp.test.js
+++ b/test/basic.ssr.csp.test.js
@@ -1,27 +1,15 @@
-import { resolve } from 'path'
-
 import rp from 'request-promise-native'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-
-const port = 4005
+let port
 const url = route => 'http://localhost:' + port + route
 
 const startCSPTestServer = async (csp) => {
-  const options = {
-    rootDir: resolve(__dirname, 'fixtures/basic'),
-    buildDir: '.nuxt-ssr-csp',
-    dev: false,
-    build: { stats: false },
-    render: { csp }
-  }
-
-  let nuxt = null
-  nuxt = new Nuxt(options)
-  const builder = new Builder(nuxt)
-  await builder.build()
+  const options = loadFixture('basic', { render: { csp } })
+  const nuxt = new Nuxt(options)
+  port = await getPort()
   await nuxt.listen(port, '0.0.0.0')
-
   return nuxt
 }
 
diff --git a/test/basic.ssr.test.js b/test/basic.ssr.test.js
index 16c775339c..6ae9608fac 100644
--- a/test/basic.ssr.test.js
+++ b/test/basic.ssr.test.js
@@ -1,30 +1,19 @@
 import rp from 'request-promise-native'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-
-import { loadConfig } from './helpers/config'
-
-const port = 4004
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 
 describe('basic ssr', () => {
-  // Init nuxt.js and create server listening on localhost:4004
   beforeAll(async () => {
-    const options = loadConfig('basic', {
-      buildDir: '.nuxt-ssr',
-      dev: false,
-      build: {
-        stats: false
-      }
-    })
-
+    const options = loadFixture('basic')
     nuxt = new Nuxt(options)
-    const builder = new Builder(nuxt)
-    await builder.build()
+    port = await getPort()
     await nuxt.listen(port, '0.0.0.0')
-  }, 30000)
+  })
 
   test('/stateless', async () => {
     const { html } = await nuxt.renderRoute('/stateless')
diff --git a/test/children.patch.test.js b/test/children.patch.browser.test.js
similarity index 89%
rename from test/children.patch.test.js
rename to test/children.patch.browser.test.js
index c388f49eaf..0c6b924dc3 100644
--- a/test/children.patch.test.js
+++ b/test/children.patch.browser.test.js
@@ -1,32 +1,21 @@
-import { resolve } from 'path'
+import { Nuxt, Utils } from '..'
+import * as browser from './utils/browser'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder, Utils } from '..'
-
-import * as browser from './helpers/browser'
-
-const port = 4014
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 let page
 const dates = {}
 
-describe('children patch', () => {
-  // Init nuxt.js and create server listening on localhost:4000
+describe('children patch (browser)', () => {
   beforeAll(async () => {
-    const options = {
-      rootDir: resolve(__dirname, 'fixtures/children'),
-      buildDir: '.nuxt-patch',
-      dev: false,
-      build: {
-        stats: false
-      }
-    }
-
+    const options = loadFixture('children')
     nuxt = new Nuxt(options)
-    new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('Start browser', async () => {
     expect.assertions(0) // suppress 'no assertions' warning
@@ -138,6 +127,6 @@ describe('children patch', () => {
 
   test('Stop browser', async () => {
     await page.close()
-    await browser.stop()
+    await browser.close()
   })
 })
diff --git a/test/children.test.js b/test/children.test.js
index c310aa1b3a..1c9e06cb99 100644
--- a/test/children.test.js
+++ b/test/children.test.js
@@ -1,27 +1,18 @@
-import { resolve } from 'path'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-
-const port = 4013
+let port
 // const url = (route) => 'http://localhost:' + port + route
 
 let nuxt = null
 
 describe('children', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const options = {
-      rootDir: resolve(__dirname, 'fixtures/children'),
-      dev: false,
-      build: {
-        stats: false
-      }
-    }
-
+    const options = loadFixture('children')
     nuxt = new Nuxt(options)
-    new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('/parent', async () => {
     const { html } = await nuxt.renderRoute('/parent')
diff --git a/test/cli.test.js b/test/cli.test.js
index 19bc0a5ae2..77d194b76c 100644
--- a/test/cli.test.js
+++ b/test/cli.test.js
@@ -1,18 +1,18 @@
-import { promisify } from 'util'
-import { resolve } from 'path'
-import rp from 'request-promise-native'
 import { exec, spawn } from 'child_process'
+import { resolve } from 'path'
+import { promisify } from 'util'
+import rp from 'request-promise-native'
 import { Utils } from '..'
 
 const execify = promisify(exec)
 const rootDir = resolve(__dirname, 'fixtures/basic')
 
-const port = 4011
+let port
 const url = route => 'http://localhost:' + port + route
 
 const nuxtBin = resolve(__dirname, '..', 'bin', 'nuxt')
 
-describe('cli', () => {
+describe.skip('cli', () => {
   test('nuxt build', async () => {
     const { stdout } = await execify(`node ${nuxtBin} build ${rootDir}`)
 
diff --git a/test/custom-dirs.test.js b/test/custom-dirs.test.js
index 1a298de09b..9444733a7c 100644
--- a/test/custom-dirs.test.js
+++ b/test/custom-dirs.test.js
@@ -1,23 +1,19 @@
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '..'
-import { loadConfig } from './helpers/config'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-const port = 4007
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
-let builder = null
 
 describe('custom-dirs', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('/custom-dirs', { dev: false })
-
+    const config = loadFixture('custom-dirs')
     nuxt = new Nuxt(config)
-    builder = new Builder(nuxt)
-    await builder.build()
-    await nuxt.listen(4007, 'localhost')
-  }, 30000)
+    port = await getPort()
+    await nuxt.listen(port, 'localhost')
+  })
 
   test('custom assets directory', async () => {
     const { html } = await nuxt.renderRoute('/')
diff --git a/test/debug.test.js b/test/debug.test.js
index 5f20b62aeb..d8f2530499 100644
--- a/test/debug.test.js
+++ b/test/debug.test.js
@@ -1,21 +1,19 @@
 import rp from 'request-promise-native'
-import { Nuxt, Builder } from '..'
-import { loadConfig } from './helpers/config'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-const port = 4009
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 
-describe('debug', () => {
-  // Init nuxt.js and create server listening on localhost:4000
+describe.skip('debug', () => {
   beforeAll(async () => {
-    const config = loadConfig('debug')
-
+    const config = loadFixture('debug')
     nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('/test/__open-in-editor (open-in-editor)', async () => {
     const { body } = await rp(
diff --git a/test/deprecate.test.js b/test/deprecate.test.js
index 7a9d2a3cd0..ceb30fec7a 100644
--- a/test/deprecate.test.js
+++ b/test/deprecate.test.js
@@ -1,28 +1,25 @@
-import { Nuxt, Builder } from '..'
-import { loadConfig } from './helpers/config'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-const port = 4010
+let port
 
 let nuxt = null
-let builder = null
 // let buildSpies = null
 
 describe('depricate', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('deprecate', { dev: false })
+    const config = loadFixture('deprecate')
 
     nuxt = new Nuxt(config)
-    builder = new Builder(nuxt)
-    await builder.build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
-  // test('Deprecated: module.addVendor()', async () => {
-  //   expect(
-  //     buildSpies.warn.calledWithMatch('module: addVendor is no longer necessary')
-  //   ).toBe(true)
-  // })
+  test.skip('Deprecated: module.addVendor()', async () => {
+    // expect(
+    //   buildSpies.warn.calledWithMatch('module: addVendor is no longer necessary')
+    // ).toBe(true)
+  })
 
   // Close server and ask nuxt to stop listening to file changes
   test('Closing server and nuxt.js', async () => {
diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js
index 79d3722c25..c96b8ed506 100644
--- a/test/dynamic-routes.test.js
+++ b/test/dynamic-routes.test.js
@@ -2,24 +2,9 @@ import { resolve } from 'path'
 import fs from 'fs'
 import { promisify } from 'util'
 
-import { Nuxt, Builder } from '..'
-
 const readFile = promisify(fs.readFile)
 
 describe('dynamic routes', () => {
-  beforeAll(async () => {
-    const config = {
-      rootDir: resolve(__dirname, 'fixtures/dynamic-routes'),
-      dev: false,
-      build: {
-        stats: false
-      }
-    }
-
-    const nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
-  }, 30000)
-
   test('Check .nuxt/router.js', () => {
     return readFile(
       resolve(__dirname, './fixtures/dynamic-routes/.nuxt/router.js'),
diff --git a/test/error.test.js b/test/error.test.js
index 162881aa6b..5cc3c50ace 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -1,22 +1,20 @@
 // import rp from 'request-promise-native'
-import { Nuxt, Builder } from '..'
-import { loadConfig } from './helpers/config'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-const port = 4005
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
 // let logSpy
 
 describe('error', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('error', { dev: false })
-
+    const config = loadFixture('error')
     nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('/ should display an error', async () => {
     await expect(nuxt.renderRoute('/')).rejects.toMatchObject({
diff --git a/test/express.test.js b/test/express.test.js
index 6c2825cadc..5dc4a47b64 100644
--- a/test/express.test.js
+++ b/test/express.test.js
@@ -1,30 +1,22 @@
-import { resolve } from 'path'
-
 import express from 'express'
 import rp from 'request-promise-native'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-
-const port = 4000
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt
 let app
+let server
 
 describe('express', () => {
   // Init nuxt.js and create express server
   beforeAll(async () => {
-    const config = {
-      rootDir: resolve(__dirname, 'fixtures/basic'),
-      buildDir: '.nuxt-express',
-      dev: false,
-      build: {
-        stats: false
-      }
-    }
-
+    const config = loadFixture('basic')
     nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
+
+    port = await getPort()
 
     // Create express app
     app = express()
@@ -33,12 +25,19 @@ describe('express', () => {
     app.use(nuxt.render)
 
     // Start listening on localhost:4000
-    app.listen(port)
-  }, 30000)
+    server = app.listen(port)
+  })
 
   test('/stateless with express', async () => {
     const html = await rp(url('/stateless'))
 
     expect(html.includes('<h1>My component!</h1>')).toBe(true)
   })
+
+  test('close server', async () => {
+    await nuxt.close()
+    await new Promise((resolve, reject) => {
+      server.close(err => err ? reject(err) : resolve())
+    })
+  })
 })
diff --git a/test/fallback.generate.test.js b/test/fallback.generate.test.js
index 580726d8a0..b419a5692d 100644
--- a/test/fallback.generate.test.js
+++ b/test/fallback.generate.test.js
@@ -1,16 +1,13 @@
 import http from 'http'
 import { existsSync } from 'fs'
 import { resolve } from 'path'
-
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
+import { Nuxt, Generator, Options } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder, Generator, Options } from '..'
-
-import { loadConfig } from './helpers/config'
-
-const port = 4015
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
@@ -18,26 +15,23 @@ let server = null
 let generator = null
 
 describe('fallback generate', () => {
-  // Init nuxt.js and create server listening on localhost:4015
   beforeAll(async () => {
-    let config = loadConfig('basic', {
-      buildDir: '.nuxt-spa-fallback',
-      dev: false
-    })
-    config.build.stats = false
+    const config = loadFixture('basic')
 
     nuxt = new Nuxt(config)
-    const builder = new Builder(nuxt)
-    generator = new Generator(nuxt, builder)
+    generator = new Generator(nuxt)
 
-    await generator.generate()
+    await generator.generate({ build: false })
 
     const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
     server = http.createServer((req, res) => {
       serve(req, res, finalhandler(req, res))
     })
+
+    port = await getPort()
+
     server.listen(port)
-  }, 30000)
+  })
 
   test('default creates /200.html as fallback', async () => {
     const html = await rp(url('/200.html'))
@@ -50,7 +44,7 @@ describe('fallback generate', () => {
   test('nuxt re-generating with generate.fallback = false', async () => {
     // const logSpy = await interceptLog(async () => {
     nuxt.options.generate.fallback = false
-    await generator.generate()
+    await generator.generate({ build: false })
     // expect(logSpy.calledWithMatch('DONE')).toBe(true)
   })
 
@@ -76,36 +70,10 @@ describe('fallback generate', () => {
     'nuxt re-generating with generate.fallback = "spa-fallback.html"',
     async () => {
       nuxt.options.generate.fallback = 'spa-fallback.html'
-      await generator.generate()
+      await generator.generate({ build: false })
     }
   )
 
-  test(
-    '"spa-fallback.html" creates /spa-fallback.html as fallback',
-    async () => {
-      const html = await rp(url('/spa-fallback.html'))
-      expect(html.includes('<h1>Index page</h1>')).toBe(false)
-      expect(html.includes('data-server-rendered')).toBe(false)
-      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'spa-fallback.html'))).toBe(true)
-      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
-      expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
-    }
-  )
-
-  test('nuxt re-generating with generate.fallback = "index.html"', async () => {
-    nuxt.options.generate.fallback = 'index.html'
-    await generator.generate()
-  })
-
-  test('"index.html" creates /index.html as fallback', async () => {
-    const html = await rp(url('/index.html'))
-    expect(html.includes('<h1>Index page</h1>')).toBe(true)
-    expect(html.includes('data-server-rendered')).toBe(true)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'index.html'))).toBe(true)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
-  })
-
   // Close server and ask nuxt to stop listening to file changes
   test('Closing server', async () => {
     await server.close()
diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
index 63a37d59bf..dc18e78e62 100644
--- a/test/fixtures/basic/nuxt.config.js
+++ b/test/fixtures/basic/nuxt.config.js
@@ -3,6 +3,15 @@ import path from 'path'
 export default {
   generate: {
     routes: [
+      // TODO: generate with {build: false} does not scans pages!
+      '/stateless',
+      '/css',
+      '/stateful',
+      '/head',
+      '/async-data',
+      '/validate',
+      '/redirect',
+
       '/users/1',
       '/users/2',
       { route: '/users/3', payload: { id: 3000 } }
diff --git a/test/helpers/config.js b/test/helpers/config.js
deleted file mode 100644
index c0547c4ad7..0000000000
--- a/test/helpers/config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { resolve } from 'path'
-
-import { requireModule } from '../../lib/common/module'
-
-export function loadConfig(fixture, overrides) {
-  const rootDir = resolve(__dirname, '../fixtures/' + fixture)
-
-  const config = requireModule(resolve(rootDir, 'nuxt.config.js'))
-
-  return Object.assign({ rootDir }, config, overrides)
-}
diff --git a/test/helpers/console.d.js b/test/helpers/console.d.js
deleted file mode 100644
index ade2d43339..0000000000
--- a/test/helpers/console.d.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import sinon from 'sinon'
-
-let context = null
-
-export function release() {
-  if (context === null) {
-    process.stderr.write(
-      'Console spy context was empty, did a previous test already release it?\n'
-    )
-    return
-  }
-
-  if (context.log) {
-    console.log = context.log // eslint-disable-line no-console
-  }
-  if (context.info) {
-    console.info = context.info // eslint-disable-line no-console
-  }
-  if (context.warn) {
-    console.warn = context.warn // eslint-disable-line no-console
-  }
-  if (context.error) {
-    console.error = context.error // eslint-disable-line no-console
-  }
-  if (context.stdout) {
-    process.stdout.write = context.stdout
-  }
-  if (context.stderr) {
-    process.stderr.write = context.stderr
-  }
-
-  context = null
-  delete console.spiedInTest // eslint-disable-line no-console
-}
-
-export async function intercept(levels, msg, cb) {
-  if (context !== null) {
-    process.stderr.write(
-      'Console spy context was not empty, did a previous test not release it?\n'
-    )
-  }
-  context = {}
-  console.spiedInTest = true // eslint-disable-line no-console
-
-  if (cb === undefined && typeof msg === 'function') {
-    cb = msg
-    msg = undefined
-
-    if (typeof levels === 'string') {
-      msg = levels
-      levels = undefined
-    }
-  }
-
-  if (cb === undefined && msg === undefined && typeof levels === 'function') {
-    cb = levels
-    levels = undefined
-  }
-
-  const all = levels === undefined || levels === {}
-  const spies = {}
-
-  if (all || levels.log) {
-    context.log = console.log // eslint-disable-line no-console
-    spies.log = console.log = sinon.spy() // eslint-disable-line no-console
-  }
-
-  if (all || levels.info) {
-    context.info = console.info // eslint-disable-line no-console
-    spies.info = console.info = sinon.spy() // eslint-disable-line no-console
-  }
-
-  if (all || levels.warn) {
-    context.warn = console.warn // eslint-disable-line no-console
-    spies.warn = console.warn = sinon.spy() // eslint-disable-line no-console
-  }
-
-  if (all || levels.error) {
-    context.error = console.error // eslint-disable-line no-console
-    spies.error = console.error = sinon.spy() // eslint-disable-line no-console
-  }
-
-  if (levels && levels.stdout) {
-    context.stdout = process.stdout.write
-    spies.stdout = process.stdout.write = sinon.spy()
-  }
-
-  if (levels && levels.stderr) {
-    context.stderr = process.stderr.write
-    spies.stderr = process.stderr.write = sinon.spy()
-  }
-
-  if (cb) {
-    if (msg) {
-      if (context.stdout) {
-        context.stdout(`  ${msg}`)
-      } else {
-        process.stdout.write(`  ${msg}`)
-      }
-    }
-
-    await cb()
-
-    release()
-
-    if (msg) {
-      process.stdout.write('\n')
-    }
-  }
-
-  return spies
-}
-
-export async function interceptLog(msg, cb) {
-  const { log } = await intercept({ log: true }, msg, cb)
-  return log
-}
-
-export async function interceptInfo(msg, cb) {
-  const { info } = await intercept({ info: true }, msg, cb)
-  return info
-}
-
-export async function interceptWarn(msg, cb) {
-  const { warn } = await intercept({ warn: true }, msg, cb)
-  return warn
-}
-
-export async function interceptError(msg, cb) {
-  const { error } = await intercept({ error: true }, msg, cb)
-  return error
-}
-
-export async function interceptStdout(msg, cb) {
-  const { stdout } = await intercept({ stdout: true }, msg, cb)
-  return stdout
-}
-
-export async function interceptStderr(msg, cb) {
-  const { stderr } = await intercept({ stderr: true }, msg, cb)
-  return stderr
-}
diff --git a/test/module.test.js b/test/module.test.js
index b826775891..368803af35 100644
--- a/test/module.test.js
+++ b/test/module.test.js
@@ -1,28 +1,20 @@
 import { normalize } from 'path'
-
 import rp from 'request-promise-native'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-
-import { loadConfig } from './helpers/config'
-
-const port = 4006
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
-let builder = null
-let buildSpies = null
+// let buildSpies = null
 
-// Init nuxt.js and create server listening on localhost:4000
 beforeAll(async () => {
-  const config = loadConfig('module', { dev: false })
-
+  const config = loadFixture('module')
   nuxt = new Nuxt(config)
-  builder = new Builder(nuxt)
-
-  await builder.build()
+  port = await getPort()
   await nuxt.listen(port, 'localhost')
-}, 30000)
+})
 
 test('Plugin', async () => {
   expect(normalize(nuxt.options.plugins[0].src).includes(
@@ -42,17 +34,15 @@ test('Layout', async () => {
 test('Hooks', async () => {
   expect(nuxt.__module_hook).toBe(1)
   expect(nuxt.__renderer_hook).toBe(2)
-  expect(nuxt.__builder_hook).toBe(3)
 })
 
 test('Hooks - Functional', async () => {
   expect(nuxt.__ready_called__).toBe(true)
-  expect(builder.__build_done__).toBe(true)
 })
 
-test('Hooks - Error', async () => {
-  expect(buildSpies.error.calledWithMatch(/build:extendRoutes/)).toBe(true)
-})
+// test('Hooks - Error', async () => {
+//   expect(buildSpies.error.calledWithMatch(/build:extendRoutes/)).toBe(true)
+// })
 
 test('Middleware', async () => {
   let response = await rp(url('/api'))
diff --git a/test/nuxt.test.js b/test/nuxt.test.js
index a6de5018b0..bdc53111e3 100644
--- a/test/nuxt.test.js
+++ b/test/nuxt.test.js
@@ -1,5 +1,6 @@
 import { resolve } from 'path'
 import { Nuxt, Builder } from '..'
+import { loadFixture } from './utils'
 
 describe('nuxt', () => {
   test('Nuxt.js Class', () => {
@@ -7,14 +8,15 @@ describe('nuxt', () => {
   })
 
   test('Nuxt.js Instance', async () => {
-    const nuxt = new Nuxt({
-      dev: true,
-      rootDir: resolve(__dirname, 'fixtures', 'empty')
-    })
+    const config = loadFixture('empty')
+    const nuxt = new Nuxt(config)
+
     expect(typeof nuxt).toBe('object')
-    expect(nuxt.options.dev).toBe(true)
+    expect(nuxt.options.dev).toBe(false)
     expect(typeof nuxt._ready.then).toBe('function')
+
     await nuxt.ready()
+
     expect(nuxt.initialized).toBe(true)
   })
 
@@ -23,6 +25,7 @@ describe('nuxt', () => {
       dev: false,
       rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
     })
+
     return new Builder(nuxt).build().catch(err => {
       let s = String(err)
       expect(s.includes('No `pages` directory found')).toBe(true)
@@ -35,6 +38,7 @@ describe('nuxt', () => {
       dev: false,
       rootDir: resolve(__dirname)
     })
+
     return new Builder(nuxt).build().catch(err => {
       let s = String(err)
       expect(s.includes("Couldn't find a `pages` directory")).toBe(true)
diff --git a/test/spa.test.js b/test/spa.test.js
index e9baa2e7ff..3bdbaf7fd2 100644
--- a/test/spa.test.js
+++ b/test/spa.test.js
@@ -1,27 +1,25 @@
-import { Nuxt, Builder } from '..'
-import { loadConfig } from './helpers/config'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
 let nuxt = null
 
-const port = 4012
+let port
 const url = route => 'http://localhost:' + port + route
 
+const renderRoute = async _url => {
+  const window = await nuxt.renderAndGetWindow(url(_url))
+  const head = window.document.head.innerHTML
+  const html = window.document.body.innerHTML
+  return { window, head, html }
+}
+
 describe('spa', () => {
-  const renderRoute = async _url => {
-    const window = await nuxt.renderAndGetWindow(url(_url))
-    const head = window.document.head.innerHTML
-    const html = window.document.body.innerHTML
-    return { window, head, html }
-  }
-
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('spa')
-
+    const config = loadFixture('spa')
     nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('/ (basic spa)', async () => {
     // const logSpy = await interceptLog()
diff --git a/test/ssr.test.js b/test/ssr.test.js
index 14bb6e9605..5a600a9a6d 100644
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -1,9 +1,9 @@
-import { Nuxt, Builder, Utils } from '..'
+import { Nuxt, Utils } from '..'
 import { uniq } from 'lodash'
 import rp from 'request-promise-native'
-import { loadConfig } from './helpers/config'
+import { loadFixture, getPort } from './utils'
 
-const port = 4008
+let port
 let nuxt = null
 
 // Utils
@@ -15,42 +15,62 @@ const url = route => 'http://localhost:' + port + route
 
 // const isWindows = /^win/.test(process.platform)
 
-describe('ssr', () => {
-  // Init nuxt.js and create server listening on localhost:4000
-  beforeAll(async () => {
-    const config = loadConfig('ssr')
+// == Uniq Test ==
+// The idea behind is pages using a shared nextId() which returns an incrementing id
+// So all responses should strictly be different and length of unique responses should equal to responses
+// We strictly compare <foorbar>{id}</foorbar> section
+// Because other response parts such as window.__NUXT may be different resulting false positive passes.
+const uniqueTest = async (url) => {
+  let results = []
 
-    nuxt = new Nuxt(config)
-    new Builder(nuxt).build()
-    await nuxt.listen(port, 'localhost')
-  }, 30000)
+  await Utils.parallel(range(5), async () => {
+    let { html } = await nuxt.renderRoute(url)
+    let foobar = match(FOOBAR_REGEX, html)
+    results.push(parseInt(foobar))
+  })
 
-  // == Uniq Test ==
-  // The idea behind is pages using a shared nextId() which returns an incrementing id
-  // So all responses should strictly be different and length of unique responses should equal to responses
-  // We strictly compare <foorbar>{id}</foorbar> section
-  // Because other response parts such as window.__NUXT may be different resulting false positive passes.
-  const uniqueTest = async (t, url) => {
-    let results = []
+  let isUnique = uniq(results).length === results.length
 
-    await Utils.parallel(range(5), async () => {
-      let { html } = await nuxt.renderRoute(url)
-      let foobar = match(FOOBAR_REGEX, html)
-      results.push(parseInt(foobar))
-    })
-
-    let isUnique = uniq(results).length === results.length
-
-    if (!isUnique) {
-      /* eslint-disable no-console */
-      console.log(url + '\n' + results.join(', ') + '\n')
-    }
-
-    expect(isUnique).toBe(true)
-
-    return results
+  if (!isUnique) {
+    /* eslint-disable no-console */
+    console.log(url + '\n' + results.join(', ') + '\n')
   }
 
+  expect(isUnique).toBe(true)
+
+  return results
+}
+
+// == Stress Test ==
+// The idea of this test is to ensure there is no memory or data leak during SSR requests
+// Or pending promises/sockets and function calls.
+// Related issue: https://github.com/nuxt/nuxt.js/issues/1354
+const stressTest = async (_url, concurrency = 2, steps = 4) => {port = await getPort() ; await nuxt.listen(port, 'localhost')
+  let statusCodes = {}
+
+  await Utils.sequence(range(steps), async () => {
+    await Utils.parallel(range(concurrency), async () => {
+      let response = await rp(url(_url), { resolveWithFullResponse: true })
+      // Status Code
+      let code = response.statusCode
+      if (!statusCodes[code]) {
+        statusCodes[code] = 0
+      }
+      statusCodes[code]++
+    })
+  })
+
+  expect(statusCodes[200]).toBe(concurrency * steps)
+}
+
+describe('ssr', () => {
+  beforeAll(async () => {
+    const config = loadFixture('ssr')
+    nuxt = new Nuxt(config)
+    port = await getPort()
+    await nuxt.listen(port, 'localhost')
+  })
+
   test('unique responses with data()', async () => {
     await uniqueTest('/data')
   })
@@ -79,28 +99,6 @@ describe('ssr', () => {
     await uniqueTest('/fetch')
   })
 
-  // == Stress Test ==
-  // The idea of this test is to ensure there is no memory or data leak during SSR requests
-  // Or pending promises/sockets and function calls.
-  // Related issue: https://github.com/nuxt/nuxt.js/issues/1354
-  const stressTest = async (t, _url, concurrency = 2, steps = 4) => {
-    let statusCodes = {}
-
-    await Utils.sequence(range(steps), async () => {
-      await Utils.parallel(range(concurrency), async () => {
-        let response = await rp(url(_url), { resolveWithFullResponse: true })
-        // Status Code
-        let code = response.statusCode
-        if (!statusCodes[code]) {
-          statusCodes[code] = 0
-        }
-        statusCodes[code]++
-      })
-    })
-
-    expect(statusCodes[200]).toBe(concurrency * steps)
-  }
-
   test('stress test with asyncData', async () => {
     await stressTest('/asyncData')
   })
diff --git a/test/helpers/browser.js b/test/utils/browser.js
similarity index 98%
rename from test/helpers/browser.js
rename to test/utils/browser.js
index 160c2da455..8cf29162e8 100644
--- a/test/helpers/browser.js
+++ b/test/utils/browser.js
@@ -14,7 +14,7 @@ export async function start(options = {}) {
   )
 }
 
-export async function stop() {
+export async function close() {
   if (!browser) return
   await browser.close()
 }
diff --git a/test/utils/index.js b/test/utils/index.js
new file mode 100644
index 0000000000..8c0ad24a40
--- /dev/null
+++ b/test/utils/index.js
@@ -0,0 +1,21 @@
+import path from 'path'
+import fs from 'fs'
+import _getPort from 'get-port'
+
+import { requireModule } from '../../lib/common/module'
+
+export function loadFixture(fixture, overrides) {
+  const rootDir = path.resolve(__dirname, '../fixtures/' + fixture)
+  const configFile = path.resolve(rootDir, 'nuxt.config.js')
+
+  const config = fs.existsSync(configFile) ? requireModule(configFile) : {}
+
+  config.rootDir = rootDir
+  config.dev = false
+
+  return Object.assign({}, config, overrides)
+}
+
+export function getPort() {
+  return _getPort()
+}
diff --git a/test/helpers/setup.js b/test/utils/setup.js
similarity index 57%
rename from test/helpers/setup.js
rename to test/utils/setup.js
index b6c013e3a4..d3a340ea6d 100644
--- a/test/helpers/setup.js
+++ b/test/utils/setup.js
@@ -1,4 +1,3 @@
 // eslint-disable
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000
-jasmine.stopSpecOnExpectationFailure = true
diff --git a/test/with-config.test.js b/test/with-config.test.js
index 210050f697..c280b57768 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -1,30 +1,19 @@
-import { resolve } from 'path'
-
 import rp from 'request-promise-native'
+import { Nuxt } from '..'
+import { loadFixture, getPort } from './utils'
 
-import { Nuxt, Builder } from '..'
-import styleLoader from '../lib/builder/webpack/style-loader'
-
-import { loadConfig } from './helpers/config'
-
-const port = 4007
+let port
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
-let builder = null
 
 describe('with-config', () => {
-  // Init nuxt.js and create server listening on localhost:4000
   beforeAll(async () => {
-    const config = loadConfig('with-config', {
-      dev: false
-    })
-
+    const config = loadFixture('with-config')
     nuxt = new Nuxt(config)
-    builder = new Builder(nuxt)
-    await builder.build()
+    port = await getPort()
     await nuxt.listen(port, 'localhost')
-  }, 30000)
+  })
 
   test('/', async () => {
     // const logSpy = await interceptLog()
@@ -181,14 +170,6 @@ describe('with-config', () => {
     expect(html.includes('<h1>About page</h1>')).toBe(true)
   })
 
-  test('Check stats.json generated by build.analyze', () => {
-    const stats = require(resolve(
-      __dirname,
-      'fixtures/with-config/.nuxt/dist/stats.json'
-    ))
-    expect(stats.assets.length > 0).toBe(true)
-  })
-
   test('Check /test/test.txt with custom serve-static options', async () => {
     const { headers } = await rp(url('/test/test.txt'), {
       resolveWithFullResponse: true
@@ -201,15 +182,6 @@ describe('with-config', () => {
       .rejects.toMatchObject({ statusCode: 404 })
   })
 
-  test('Check build.styleResources for style-resources-loader', async () => {
-    const loaders = styleLoader.call(builder, 'scss')
-    const loader = loaders.find(l => l.loader === 'style-resources-loader')
-    expect(typeof loader).toBe('object')
-    expect(loader.options).toEqual({
-      patterns: ['~/assets/pre-process.scss']
-    })
-  })
-
   // Close server and ask nuxt to stop listening to file changes
   test('Closing server and nuxt.js', async () => {
     await nuxt.close()
diff --git a/yarn.lock b/yarn.lock
index 6f9269b11f..030b1e07b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1750,6 +1750,15 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
     parse-json "^2.2.0"
     require-from-string "^1.1.0"
 
+cosmiconfig@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^3.0.0"
+    require-from-string "^2.0.1"
+
 create-ecdh@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
@@ -2263,13 +2272,13 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-errno@^0.1.3, errno@~0.1.7:
+errno@^0.1.3, errno@^0.1.4, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -2454,11 +2463,54 @@ eslint@^4.18.2:
     table "4.0.2"
     text-table "~0.2.0"
 
+eslint@^4.5.0:
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.0.tgz#9e900efb5506812ac374557034ef6f5c3642fc4c"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
+    esquery "^1.0.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.0.1"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
+
 esm@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.6.tgz#0b327fb312e287d9e1a95e728c18b79603fb6d9e"
 
-espree@^3.5.2:
+espree@^3.5.2, espree@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
@@ -2958,6 +3010,10 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-port@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3951,6 +4007,17 @@ jest-resolve@^22.4.2:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
 
+jest-runner-eslint@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/jest-runner-eslint/-/jest-runner-eslint-0.4.0.tgz#938a54fb767d1803d45613ae3eac0adc2de426db"
+  dependencies:
+    cosmiconfig "^3.0.1"
+    eslint "^4.5.0"
+    find-up "^2.1.0"
+    pify "3.0.0"
+    throat "4.1.0"
+    worker-farm "1.5.0"
+
 jest-runner@^22.4.2:
   version "22.4.2"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.2.tgz#19390ea9d99f768973e16f95a1efa351c0017e87"
@@ -4050,7 +4117,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.1:
+js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
@@ -4989,6 +5056,12 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13"
+  dependencies:
+    error-ex "^1.3.1"
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -5081,14 +5154,14 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
+pify@3.0.0, pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -5999,6 +6072,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexpp@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -6133,6 +6210,10 @@ require-from-string@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
+require-from-string@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
+
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -6799,7 +6880,7 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-throat@^4.0.0:
+throat@4.1.0, throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
 
@@ -7401,6 +7482,13 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+worker-farm@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"
+  dependencies:
+    errno "^0.1.4"
+    xtend "^4.0.1"
+
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -7455,7 +7543,7 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
-xtend@^4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From 584b943688ac9c9bc513cc4a640e761a66b29689 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 03:23:36 +0330
Subject: [PATCH 09/55] fix test script

---
 package.json                | 2 +-
 test/basic.browser.test.js  | 3 ++-
 test/basic.generate.test.js | 1 -
 test/ssr.test.js            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e2bd934c48..0f753d6bf8 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   },
   "scripts": {
     "build-fixtures": "./scripts/build-fixtures",
-    "test": "npm run lint && jest",
+    "test": "npm run lint && npm run build-fixtures && jest",
     "test-appveyor": "yarn test",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
diff --git a/test/basic.browser.test.js b/test/basic.browser.test.js
index e9315b757b..ab590bd011 100644
--- a/test/basic.browser.test.js
+++ b/test/basic.browser.test.js
@@ -12,7 +12,8 @@ describe('basic browser', () => {
   beforeAll(async () => {
     const config = loadFixture('basic')
     nuxt = new Nuxt(config)
-    port = await getPort() ; await nuxt.listen(port, 'localhost')
+    port = await getPort()
+    await nuxt.listen(port, 'localhost')
 
     await browser.start({
       // slowMo: 50,
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index 9868054abb..006efb8189 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -7,7 +7,6 @@ import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
 import { Nuxt, Generator } from '..'
 import { loadFixture, getPort } from './utils'
-import { get } from 'https';
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/ssr.test.js b/test/ssr.test.js
index 5a600a9a6d..997733a3b3 100644
--- a/test/ssr.test.js
+++ b/test/ssr.test.js
@@ -45,7 +45,7 @@ const uniqueTest = async (url) => {
 // The idea of this test is to ensure there is no memory or data leak during SSR requests
 // Or pending promises/sockets and function calls.
 // Related issue: https://github.com/nuxt/nuxt.js/issues/1354
-const stressTest = async (_url, concurrency = 2, steps = 4) => {port = await getPort() ; await nuxt.listen(port, 'localhost')
+const stressTest = async (_url, concurrency = 2, steps = 4) => {
   let statusCodes = {}
 
   await Utils.sequence(range(steps), async () => {

From 19775d58f72eb1556a86fd424f12bac5f40572e4 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:21:06 +0330
Subject: [PATCH 10/55] perf(build-fixtures): parallel builds

---
 package.json           |  2 ++
 scripts/build-fixtures | 65 +++++++++++++++++++++++++-----------------
 yarn.lock              |  8 +++++-
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 0f753d6bf8..ac9079dae0 100644
--- a/package.json
+++ b/package.json
@@ -116,6 +116,7 @@
     "webpack-stylish": "^0.1.6"
   },
   "devDependencies": {
+    "@expo/spawn-async": "^1.3.0",
     "babel-eslint": "^8.2.1",
     "codecov": "^3.0.0",
     "eslint": "^4.18.2",
@@ -134,6 +135,7 @@
     "jest": "^22.4.2",
     "jest-runner-eslint": "^0.4.0",
     "jsdom": "^11.6.2",
+    "p-limit": "^1.2.0",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index 958779517b..8d84c53bd8 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -1,16 +1,14 @@
 #!/usr/bin/env node
 process.env.NODE_ENV = 'test'
 
-const { Builder, Nuxt } = require('..')
-const { requireModule } = require('../lib/common/module')
-const path = require('path')
-const fs = require('fs')
+const { resolve } = require('path')
+const { cpus } = require('os')
+
+const spawnAsync = require('@expo/spawn-async')
 const ORA = require('ora')
+const pLimit = require('p-limit')
 
 const fixtures = [
-  // csr, dev, generate, fail generate, fallback generate, ssr, ssr csp, spa
-  'basic',
-
   'children',
   'custom-dirs',
   'debug',
@@ -20,37 +18,52 @@ const fixtures = [
   'error',
   'module',
   'ssr',
-  'with-config'
+  'with-config',
+
+  // csr,
+  // dev,
+  // generate,
+  // fail generate,
+  // fallback generate,
+  // ssr,
+  // ssr csp,
+  // spa
+  'basic'
 ]
 
 const spinner = new ORA()
+const nuxtBuild = resolve(__dirname, '../bin/nuxt-build')
+
+let _total = fixtures.length
+let _done = 0
+let remaining = () => ` (${_done}/${_total})`
 
 async function buildFixture(name) {
-  spinner.info('Loading config for fixture ' + name)
+  _done++
 
-  const rootDir = path.resolve(__dirname, '../test/fixtures', name)
-  const configFile = path.resolve(rootDir, 'nuxt.config.js')
-  const config = fs.existsSync(configFile) ? requireModule(configFile) : {}
+  let _name = `'${name}'`
 
-  config.rootDir = rootDir
-  config.dev = false
+  spinner.info('Building ' + _name + remaining())
 
-  spinner.start('Building fixture ' + name)
+  const rootDir = resolve(__dirname, '../test/fixtures', name)
 
-  const nuxt = new Nuxt(config)
-  const builder = new Builder(nuxt)
-
-  await builder.build()
-
-  spinner.succeed('Built fixture ' + name)
-
-  await nuxt.close()
+  await spawnAsync('node', [nuxtBuild, rootDir])
+    .catch((err) => {
+      spinner.warn('Errors while building ' + _name + ': ' + err)
+    })
+    .then(() => {
+      spinner.succeed('Built fixture: ' + _name + remaining())
+    })
 }
 
 async function run() {
-  for (let fixture of fixtures) {
-    await buildFixture(fixture)
-  }
+  const cpuCount = cpus().length
+
+  spinner.info('Builing with concurrency of ' + cpuCount)
+  const limit = pLimit(cpuCount)
+
+  await Promise.all(fixtures.map(fixture =>
+    limit(() => buildFixture(fixture))))
 }
 
 run()
diff --git a/yarn.lock b/yarn.lock
index 030b1e07b2..e5549b0c34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -85,6 +85,12 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@expo/spawn-async@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.3.0.tgz#01b8a4f6bba10b792663f9272df66c7e90166dad"
+  dependencies:
+    cross-spawn "^5.1.0"
+
 "@nuxtjs/friendly-errors-webpack-plugin@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@nuxtjs/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.0.0.tgz#70fb321c78362e2b4bce1d522ecdf7f87a4dacec"
@@ -4997,7 +5003,7 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-limit@^1.1.0:
+p-limit@^1.1.0, p-limit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:

From 6152894384a25fc7f1596bef773ae63503d9a210 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:25:12 +0330
Subject: [PATCH 11/55] force enable spinner in CI

---
 scripts/build-fixtures | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index 8d84c53bd8..6155df7829 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -31,7 +31,7 @@ const fixtures = [
   'basic'
 ]
 
-const spinner = new ORA()
+const spinner = new ORA({ enabled: true })
 const nuxtBuild = resolve(__dirname, '../bin/nuxt-build')
 
 let _total = fixtures.length

From 0b5824a765aee299f5bf3c696ddef0d06113c73c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:29:54 +0330
Subject: [PATCH 12/55] fix windows

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac9079dae0..b88ffdd56e 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "nuxt": "./bin/nuxt"
   },
   "scripts": {
-    "build-fixtures": "./scripts/build-fixtures",
+    "build-fixtures": "node ./scripts/build-fixtures",
     "test": "npm run lint && npm run build-fixtures && jest",
     "test-appveyor": "yarn test",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",

From f9c4f8bfb26b1abd50b2ac1cf3f8442fd90a003a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:30:54 +0330
Subject: [PATCH 13/55] limit build concurrency

---
 scripts/build-fixtures | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index 6155df7829..5f7441ed71 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -57,10 +57,10 @@ async function buildFixture(name) {
 }
 
 async function run() {
-  const cpuCount = cpus().length
+  const concurrency = Math.min(4, cpus().length)
 
-  spinner.info('Builing with concurrency of ' + cpuCount)
-  const limit = pLimit(cpuCount)
+  spinner.info('Builing with concurrency of ' + concurrency)
+  const limit = pLimit(concurrency)
 
   await Promise.all(fixtures.map(fixture =>
     limit(() => buildFixture(fixture))))

From 05e3da6e51d0be7447646001467b29f3a99a2f1e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:37:47 +0330
Subject: [PATCH 14/55] fix build scripts

---
 appveyor.yml | 4 ++--
 package.json | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index bab4179e71..9ce63a4e85 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,10 +19,10 @@ install:
 test_script:
   # Output useful info for debugging.
   - node --version
-  - npm --version
+  # - npm --version
   - yarn --version
   # run tests
-  - yarn test-appveyor
+  - yarn test
 
 # Don't actually build.
 build: off
diff --git a/package.json b/package.json
index b88ffdd56e..cbc448e899 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,7 @@
   },
   "scripts": {
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test": "npm run lint && npm run build-fixtures && jest",
-    "test-appveyor": "yarn test",
+    "test": "npm run lint && npm run build-fixtures && jest test/",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",

From a9622102198b6754520bc033554b3cb3661773d9 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 04:43:26 +0330
Subject: [PATCH 15/55] increase jasmine timeouts

Thank you slow CI :)
---
 test/utils/setup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/setup.js b/test/utils/setup.js
index d3a340ea6d..c083a47b2d 100644
--- a/test/utils/setup.js
+++ b/test/utils/setup.js
@@ -1,3 +1,3 @@
 // eslint-disable
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 120 * 1000

From b1199f8fa4e31c0b4e556255338cc63583bfb751 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 10:13:05 +0800
Subject: [PATCH 16/55] test: remove hook assetion  in error.test.js

---
 test/error.test.js                 | 32 ------------------------------
 test/fixtures/error/nuxt.config.js |  8 --------
 2 files changed, 40 deletions(-)

diff --git a/test/error.test.js b/test/error.test.js
index 5cc3c50ace..bf7bc4c9c7 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -33,38 +33,6 @@ describe('error', () => {
       statusCode: 500
     })
 
-    // release()
-    // expect(errorSpy.calledOnce).toBe(true)
-    // expect(errorSpy
-    // .getCall(0)
-    // .args[0].message.includes(
-    // 'render function or template not defined in component: anonymous'
-    // )).toBe(true)
-  })
-
-  // test('/ with text/json content', async () => {
-  //   const opts = {
-  //     headers: {
-  //       accept: 'application/json'
-  //     },
-  //     resolveWithFullResponse: true
-  //   }
-  // const errorSpy = await interceptError()
-  // const { response: { headers } } = await expect(rp(url('/'), opts)).toThrow()
-  // expect(headers['content-type']).toBe('text/json; charset=utf-8')
-  // release()
-  // expect(errorSpy.calledOnce).toBe(true)
-  // expect(errorSpy
-  //   .getCall(0)
-  //   .args[0].message.includes(
-  //     'render function or template not defined in component: anonymous'
-  //   )).toBe(true)
-  // })
-
-  // test('Deprecated: dev in build.extend()', async () => {
-  // expect(logSpy.calledWith('[build:done]: hook error')).toBe(true)
-  // })
-
   test('Error: resolvePath()', async () => {
     expect(() => nuxt.resolvePath()).toThrowError(TypeError)
 
diff --git a/test/fixtures/error/nuxt.config.js b/test/fixtures/error/nuxt.config.js
index 96e260ba0b..33b2bc1b49 100644
--- a/test/fixtures/error/nuxt.config.js
+++ b/test/fixtures/error/nuxt.config.js
@@ -1,12 +1,4 @@
 export default {
-  hooks(hook) {
-    hook('build:done', nuxt => {
-      throw new Error('hook error')
-    })
-    hook('error', ({message}, from) => {
-      console.log(`[${from}]: ${message}`) // eslint-disable-line no-console
-    })
-  },
   build: {
     stats: false
   }

From 6c48ad2038945dcb9856001f65850f48167ecd18 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 10:14:26 +0800
Subject: [PATCH 17/55] test: fix syntax error

---
 test/error.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/error.test.js b/test/error.test.js
index bf7bc4c9c7..bdf9d5c2d1 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -32,6 +32,7 @@ describe('error', () => {
     await expect(nuxt.renderAndGetWindow(url('/'))).rejects.toMatchObject({
       statusCode: 500
     })
+  })
 
   test('Error: resolvePath()', async () => {
     expect(() => nuxt.resolvePath()).toThrowError(TypeError)

From 0a4560e5e200138ad54d23939a3c790e66a9d4ec Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 10:19:19 +0800
Subject: [PATCH 18/55] test: fix some typos

---
 scripts/build-fixtures | 2 +-
 test/deprecate.test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index 5f7441ed71..ed61dde576 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -59,7 +59,7 @@ async function buildFixture(name) {
 async function run() {
   const concurrency = Math.min(4, cpus().length)
 
-  spinner.info('Builing with concurrency of ' + concurrency)
+  spinner.info('Building with concurrency of ' + concurrency)
   const limit = pLimit(concurrency)
 
   await Promise.all(fixtures.map(fixture =>
diff --git a/test/deprecate.test.js b/test/deprecate.test.js
index ceb30fec7a..ad6b5c9740 100644
--- a/test/deprecate.test.js
+++ b/test/deprecate.test.js
@@ -6,7 +6,7 @@ let port
 let nuxt = null
 // let buildSpies = null
 
-describe('depricate', () => {
+describe('deprecate', () => {
   beforeAll(async () => {
     const config = loadFixture('deprecate')
 

From eb6ee868454a029946f55a68f8881d717daee35e Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 10:20:20 +0800
Subject: [PATCH 19/55] test: remove error hook in module.test.js

---
 test/fixtures/module/modules/hooks/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/fixtures/module/modules/hooks/index.js b/test/fixtures/module/modules/hooks/index.js
index eac4a10e97..e998d8a974 100644
--- a/test/fixtures/module/modules/hooks/index.js
+++ b/test/fixtures/module/modules/hooks/index.js
@@ -19,8 +19,4 @@ export default function () {
   this.nuxt.hook('build:done', (builder) => {
     this.nuxt.__builder_plugin = builder && ctr++
   })
-
-  this.nuxt.hook('build:extendRoutes', (builder) => {
-    throw new Error('hook error testing')
-  })
 }

From 6cd7f04a4e66b3c02de91d0555acd350f56ab9b2 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 10:41:46 +0800
Subject: [PATCH 20/55] refactor: rename examples

---
 examples/async-component-injection/package.json | 2 +-
 examples/async-data/package.json                | 2 +-
 examples/auth-routes/package.json               | 2 +-
 examples/axios/package.json                     | 2 +-
 examples/cached-components/package.json         | 2 +-
 examples/coffeescript/package.json              | 2 +-
 examples/custom-build/package.json              | 2 +-
 examples/custom-layouts/package.json            | 2 +-
 examples/custom-loading/package.json            | 2 +-
 examples/custom-routes/package.json             | 2 +-
 examples/custom-server/package.json             | 2 +-
 examples/dynamic-components/package.json        | 2 +-
 examples/dynamic-layouts/package.json           | 2 +-
 examples/global-css/package.json                | 2 +-
 examples/hello-world/package.json               | 2 +-
 examples/i18n/package.json                      | 2 +-
 examples/jsx/package.json                       | 2 +-
 examples/layout-transitions/package.json        | 2 +-
 examples/markdownit/package.json                | 2 +-
 examples/meta-info/package.json                 | 2 +-
 examples/middleware/package.json                | 2 +-
 examples/nested-components/package.json         | 2 +-
 examples/nested-routes/package.json             | 2 +-
 examples/no-ssr/package.json                    | 2 +-
 examples/plugins-vendor/package.json            | 2 +-
 examples/routes-transitions/package.json        | 2 +-
 examples/scroll-behavior/package.json           | 2 +-
 examples/spa/package.json                       | 2 +-
 examples/static-images/package.json             | 2 +-
 examples/storybook/package.json                 | 2 +-
 examples/style-resources/package.json           | 2 +-
 examples/tailwindcss/package.json               | 2 +-
 examples/uikit/package.json                     | 2 +-
 examples/vue-apollo/package.json                | 2 +-
 examples/vue-chartjs/package.json               | 2 +-
 examples/vue-class-component/package.json       | 2 +-
 examples/vuex-persistedstate/package.json       | 2 +-
 examples/vuex-store-modules/package.json        | 2 +-
 examples/vuex-store/package.json                | 2 +-
 examples/with-amp/package.json                  | 2 +-
 examples/with-ava/package.json                  | 2 +-
 examples/with-buefy/package.json                | 2 +-
 examples/with-cookies/package.json              | 2 +-
 examples/with-element-ui/package.json           | 2 +-
 examples/with-feathers/package.json             | 2 +-
 examples/with-firebase/package.json             | 2 +-
 examples/with-keep-alive/package.json           | 2 +-
 examples/with-museui/package.json               | 2 +-
 examples/with-purgecss/package.json             | 2 +-
 examples/with-sockets/package.json              | 2 +-
 examples/with-tape/package.json                 | 2 +-
 examples/with-vue-material/package.json         | 2 +-
 examples/with-vuetify/package.json              | 2 +-
 examples/with-vux/package.json                  | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/examples/async-component-injection/package.json b/examples/async-component-injection/package.json
index 4aeda9d845..c2a55b2829 100644
--- a/examples/async-component-injection/package.json
+++ b/examples/async-component-injection/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "components-injection-nuxt",
+  "name": "example-async-components-injection",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/async-data/package.json b/examples/async-data/package.json
index 028496f7fe..bdab722095 100644
--- a/examples/async-data/package.json
+++ b/examples/async-data/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-async-data",
+  "name": "example-async-data",
   "dependencies": {
     "axios": "latest",
     "nuxt": "latest"
diff --git a/examples/auth-routes/package.json b/examples/auth-routes/package.json
index dd7c4c3926..9e1ed5c80f 100644
--- a/examples/auth-routes/package.json
+++ b/examples/auth-routes/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "auth-routes",
+  "name": "example-auth-routes",
   "dependencies": {
     "axios": "^0.16.1",
     "body-parser": "^1.17.2",
diff --git a/examples/axios/package.json b/examples/axios/package.json
index 377e6287c9..aaa5c56dcf 100644
--- a/examples/axios/package.json
+++ b/examples/axios/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-proxy",
+  "name": "example-axios",
   "version": "1.0.0",
   "dependencies": {
     "@nuxtjs/axios": "^5.0.0",
diff --git a/examples/cached-components/package.json b/examples/cached-components/package.json
index 1e7850343b..597fe8ab6d 100644
--- a/examples/cached-components/package.json
+++ b/examples/cached-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-cached-components",
+  "name": "example-cached-components",
   "dependencies": {
     "lru-cache": "^4.0.2",
     "nuxt": "latest"
diff --git a/examples/coffeescript/package.json b/examples/coffeescript/package.json
index 759d04ff0f..f1e6c2e195 100644
--- a/examples/coffeescript/package.json
+++ b/examples/coffeescript/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "coffeescript",
+  "name": "example-coffeescript",
   "version": "1.0.0",
   "description": "Nuxt.js with CoffeeScript",
   "author": "Alex Ananiev <alex.ananiev.r@gmail.com>",
diff --git a/examples/custom-build/package.json b/examples/custom-build/package.json
index bca372acaa..262147d6fe 100644
--- a/examples/custom-build/package.json
+++ b/examples/custom-build/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-custom-build",
+  "name": "example-custom-build",
   "description": "",
   "dependencies": {
     "nuxt": "latest"
diff --git a/examples/custom-layouts/package.json b/examples/custom-layouts/package.json
index 4b5f4b7874..a5b7a731d9 100644
--- a/examples/custom-layouts/package.json
+++ b/examples/custom-layouts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-custom-layouts",
+  "name": "example-custom-layouts",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/custom-loading/package.json b/examples/custom-loading/package.json
index c177c2338b..b2dcfbc2ee 100644
--- a/examples/custom-loading/package.json
+++ b/examples/custom-loading/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-custom-loading",
+  "name": "example-custom-loading",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/custom-routes/package.json b/examples/custom-routes/package.json
index 437be36725..15c615ff87 100644
--- a/examples/custom-routes/package.json
+++ b/examples/custom-routes/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-custom-routes",
+  "name": "example-custom-routes",
   "dependencies": {
     "axios": "latest",
     "nuxt": "latest"
diff --git a/examples/custom-server/package.json b/examples/custom-server/package.json
index d686d66254..5afd1369ec 100644
--- a/examples/custom-server/package.json
+++ b/examples/custom-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-custom-server",
+  "name": "example-custom-server",
   "dependencies": {
     "express": "^4.15.3",
     "nuxt": "latest"
diff --git a/examples/dynamic-components/package.json b/examples/dynamic-components/package.json
index 7486edc9cd..31f52dbf45 100644
--- a/examples/dynamic-components/package.json
+++ b/examples/dynamic-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "dynamic-components-nuxt",
+  "name": "example-dynamic-components",
   "dependencies": {
     "chart.js": "^2.7.0",
     "nuxt": "latest",
diff --git a/examples/dynamic-layouts/package.json b/examples/dynamic-layouts/package.json
index cd97f88ca2..4ec8d06bac 100644
--- a/examples/dynamic-layouts/package.json
+++ b/examples/dynamic-layouts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-dynamic-layouts",
+  "name": "example-dynamic-layouts",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/global-css/package.json b/examples/global-css/package.json
index 1525d69e4e..61f426698d 100644
--- a/examples/global-css/package.json
+++ b/examples/global-css/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-global-css",
+  "name": "example-global-css",
   "dependencies": {
     "bulma": "^0.5.1",
     "nuxt": "latest"
diff --git a/examples/hello-world/package.json b/examples/hello-world/package.json
index 2e16d42040..0cc6a5c7c8 100644
--- a/examples/hello-world/package.json
+++ b/examples/hello-world/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-nuxt",
+  "name": "example-hello-world",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/i18n/package.json b/examples/i18n/package.json
index 0761757ce8..fbc1b45df5 100644
--- a/examples/i18n/package.json
+++ b/examples/i18n/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-i18n",
+  "name": "example-i18n",
   "dependencies": {
     "nuxt": "latest",
     "vue-i18n": "^7.3.2"
diff --git a/examples/jsx/package.json b/examples/jsx/package.json
index d6478c6544..9922994937 100644
--- a/examples/jsx/package.json
+++ b/examples/jsx/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-jsx",
+  "name": "example-jsx",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/layout-transitions/package.json b/examples/layout-transitions/package.json
index 822831ec96..1cc2bc34fe 100644
--- a/examples/layout-transitions/package.json
+++ b/examples/layout-transitions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-layout-transitions",
+  "name": "example-layout-transitions",
   "dependencies": {
     "axios": "^0.15.3",
     "nuxt": "latest"
diff --git a/examples/markdownit/package.json b/examples/markdownit/package.json
index bdbe75cd3b..391d1fd42c 100644
--- a/examples/markdownit/package.json
+++ b/examples/markdownit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-markdownit",
+  "name": "example-markdownit",
   "version": "1.0.0",
   "dependencies": {
     "@nuxtjs/markdownit": "^1.1.2",
diff --git a/examples/meta-info/package.json b/examples/meta-info/package.json
index b06c061ade..2e5f33b3b4 100644
--- a/examples/meta-info/package.json
+++ b/examples/meta-info/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-head-elements",
+  "name": "example-meta-info",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 7d068bad95..7c45ac8e61 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-middleware",
+  "name": "example-middleware",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/nested-components/package.json b/examples/nested-components/package.json
index cf348d5c6f..49f4d99588 100644
--- a/examples/nested-components/package.json
+++ b/examples/nested-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-nested-components",
+  "name": "example-nested-components",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/nested-routes/package.json b/examples/nested-routes/package.json
index d3d40f04d3..350733131c 100644
--- a/examples/nested-routes/package.json
+++ b/examples/nested-routes/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-nested-routes",
+  "name": "example-nested-routes",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/no-ssr/package.json b/examples/no-ssr/package.json
index 9e2167e845..1e9e185ae4 100644
--- a/examples/no-ssr/package.json
+++ b/examples/no-ssr/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "no-ssr-cmp-nuxt",
+  "name": "example-no-ssr",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/plugins-vendor/package.json b/examples/plugins-vendor/package.json
index 995af2c330..05456a14c7 100644
--- a/examples/plugins-vendor/package.json
+++ b/examples/plugins-vendor/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-plugins-vendor",
+  "name": "example-plugins-vendor",
   "dependencies": {
     "axios": "^0.16.2",
     "mini-toastr": "^0.6.5",
diff --git a/examples/routes-transitions/package.json b/examples/routes-transitions/package.json
index c61dd88174..59c5c79ca1 100644
--- a/examples/routes-transitions/package.json
+++ b/examples/routes-transitions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-routes-transitions",
+  "name": "example-routes-transitions",
   "dependencies": {
     "axios": "^0.15.3",
     "nuxt": "latest"
diff --git a/examples/scroll-behavior/package.json b/examples/scroll-behavior/package.json
index 2a869bb622..af16c90f04 100644
--- a/examples/scroll-behavior/package.json
+++ b/examples/scroll-behavior/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-routes-transitions",
+  "name": "example-scroll-behavior",
   "dependencies": {
     "axios": "^0.15.3",
     "nuxt": "latest",
diff --git a/examples/spa/package.json b/examples/spa/package.json
index 92325ecf81..e9c67af966 100644
--- a/examples/spa/package.json
+++ b/examples/spa/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-nuxt",
+  "name": "example-spa",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/static-images/package.json b/examples/static-images/package.json
index 33d3b0501f..c81f68b36d 100644
--- a/examples/static-images/package.json
+++ b/examples/static-images/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-hello-world",
+  "name": "example-static-images",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/storybook/package.json b/examples/storybook/package.json
index 2aead00510..2fe78720e1 100644
--- a/examples/storybook/package.json
+++ b/examples/storybook/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "storybook",
+  "name": "example-storybook",
   "version": "1.0.0",
   "description": "sample storybook setup for nuxt",
   "scripts": {
diff --git a/examples/style-resources/package.json b/examples/style-resources/package.json
index 000d53f18f..5ff614e832 100644
--- a/examples/style-resources/package.json
+++ b/examples/style-resources/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "style-resources",
+  "name": "example-style-resources",
   "dependencies": {
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
diff --git a/examples/tailwindcss/package.json b/examples/tailwindcss/package.json
index 11c1208cb1..4278286a1a 100644
--- a/examples/tailwindcss/package.json
+++ b/examples/tailwindcss/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-tailwindcss",
+  "name": "example-tailwindcss",
   "description": "Nuxt.js with Tailwind CSS",
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/uikit/package.json b/examples/uikit/package.json
index bc539ba586..54d25b924b 100644
--- a/examples/uikit/package.json
+++ b/examples/uikit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "uikit-nuxt",
+  "name": "example-uikit",
   "dependencies": {
     "nuxt": "latest",
     "uikit": "^3.0.0-beta.30",
diff --git a/examples/vue-apollo/package.json b/examples/vue-apollo/package.json
index c9ffee9f88..4ae856ea88 100644
--- a/examples/vue-apollo/package.json
+++ b/examples/vue-apollo/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-vue-apollo",
+  "name": "example-vue-apollo",
   "dependencies": {
     "@nuxtjs/apollo": "^2.1.1",
     "nuxt": "latest"
diff --git a/examples/vue-chartjs/package.json b/examples/vue-chartjs/package.json
index 90319704d1..19951c1123 100644
--- a/examples/vue-chartjs/package.json
+++ b/examples/vue-chartjs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "vue-chartjs-nuxt",
+  "name": "example-vue-chartjs",
   "dependencies": {
     "axios": "^0.16.2",
     "chart.js": "^2.7.1",
diff --git a/examples/vue-class-component/package.json b/examples/vue-class-component/package.json
index 797a48f36e..0df6deda02 100644
--- a/examples/vue-class-component/package.json
+++ b/examples/vue-class-component/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-class-component",
+  "name": "example-vue-class-component",
   "dependencies": {
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
diff --git a/examples/vuex-persistedstate/package.json b/examples/vuex-persistedstate/package.json
index 5d9eef3ddf..d6088f8070 100644
--- a/examples/vuex-persistedstate/package.json
+++ b/examples/vuex-persistedstate/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-vuex-store",
+  "name": "example-persisted-state",
   "dependencies": {
     "nuxt": "latest",
     "vuex-persistedstate": "^2.0.0"
diff --git a/examples/vuex-store-modules/package.json b/examples/vuex-store-modules/package.json
index 3bd4273fa4..b9fec7b13f 100644
--- a/examples/vuex-store-modules/package.json
+++ b/examples/vuex-store-modules/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-vuex-store",
+  "name": "example-vuex-store-modules",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/vuex-store/package.json b/examples/vuex-store/package.json
index 3bd4273fa4..c614964594 100644
--- a/examples/vuex-store/package.json
+++ b/examples/vuex-store/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-vuex-store",
+  "name": "example-vuex-store",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/with-amp/package.json b/examples/with-amp/package.json
index a9b129ca86..1d2244bbad 100644
--- a/examples/with-amp/package.json
+++ b/examples/with-amp/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-amp",
+  "name": "example-with-amp",
   "version": "1.0.0",
   "dependencies": {
     "nuxt": "latest"
diff --git a/examples/with-ava/package.json b/examples/with-ava/package.json
index 02065f4c57..bd3904771b 100755
--- a/examples/with-ava/package.json
+++ b/examples/with-ava/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-with-ava",
+  "name": "example-with-ava",
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build",
diff --git a/examples/with-buefy/package.json b/examples/with-buefy/package.json
index cd44d6e878..d8969fd213 100644
--- a/examples/with-buefy/package.json
+++ b/examples/with-buefy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-buefy",
+  "name": "example-with-buefy",
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
diff --git a/examples/with-cookies/package.json b/examples/with-cookies/package.json
index 17fc29e968..ab58fd3dac 100644
--- a/examples/with-cookies/package.json
+++ b/examples/with-cookies/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-nuxt",
+  "name": "example-with-cookies",
   "dependencies": {
     "cookie": "^0.3.1",
     "js-cookie": "^2.1.4",
diff --git a/examples/with-element-ui/package.json b/examples/with-element-ui/package.json
index 40dc968f5b..97e2beacfd 100644
--- a/examples/with-element-ui/package.json
+++ b/examples/with-element-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-element-ui",
+  "name": "example-with-element-ui",
   "version": "1.0.0",
   "license": "MIT",
   "dependencies": {
diff --git a/examples/with-feathers/package.json b/examples/with-feathers/package.json
index fc99464a7f..ada1686173 100644
--- a/examples/with-feathers/package.json
+++ b/examples/with-feathers/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-feathers",
+  "name": "example-with-feathers",
   "description": "Nuxt.js with FeathersJS",
   "version": "1.0.0",
   "main": "src/",
diff --git a/examples/with-firebase/package.json b/examples/with-firebase/package.json
index 99d0797aa6..7207064e23 100644
--- a/examples/with-firebase/package.json
+++ b/examples/with-firebase/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-firebase",
+  "name": "example-with-firebase",
   "version": "1.0.0",
   "description": "Nuxt.js with Firebase",
   "scripts": {
diff --git a/examples/with-keep-alive/package.json b/examples/with-keep-alive/package.json
index eb09c6630e..adfaf8bf95 100644
--- a/examples/with-keep-alive/package.json
+++ b/examples/with-keep-alive/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hello-nuxt-keep-alive",
+  "name": "example-with-keep-alive",
   "dependencies": {
     "nuxt": "latest"
   },
diff --git a/examples/with-museui/package.json b/examples/with-museui/package.json
index 6f88ac897c..7eaef886d9 100644
--- a/examples/with-museui/package.json
+++ b/examples/with-museui/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "with-museui",
+	"name": "example-with-museui",
 	"dependencies": {
 		"nuxt": "latest",
 		"muse-ui": "latest"
diff --git a/examples/with-purgecss/package.json b/examples/with-purgecss/package.json
index 538e7ca36f..72a0c82ea0 100644
--- a/examples/with-purgecss/package.json
+++ b/examples/with-purgecss/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-tailwindcss",
+  "name": "example-with-purgecss",
   "description": "Nuxt.js with Tailwind CSS",
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/with-sockets/package.json b/examples/with-sockets/package.json
index b29200ff34..5f82d28ef1 100644
--- a/examples/with-sockets/package.json
+++ b/examples/with-sockets/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nuxt-socketio",
+  "name": "example-with-sockets",
   "scripts": {
     "dev": "nodemon -w server.js -w nuxt.config.js server.js",
     "build": "nuxt build",
diff --git a/examples/with-tape/package.json b/examples/with-tape/package.json
index afb974ee4a..6c2c56aeac 100755
--- a/examples/with-tape/package.json
+++ b/examples/with-tape/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "nuxt-with-tape",
+	"name": "example-with-tape",
 	"scripts": {
 		"dev": "nuxt",
 		"build": "nuxt build",
diff --git a/examples/with-vue-material/package.json b/examples/with-vue-material/package.json
index 0363fc255b..b7e8306d7d 100644
--- a/examples/with-vue-material/package.json
+++ b/examples/with-vue-material/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-vue-material",
+  "name": "example-with-vue-material",
   "version": "1.0.0",
   "dependencies": {
     "nuxt": "latest",
diff --git a/examples/with-vuetify/package.json b/examples/with-vuetify/package.json
index 646947ae35..b7b176f153 100644
--- a/examples/with-vuetify/package.json
+++ b/examples/with-vuetify/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-vuetify",
+  "name": "example-with-vuetify",
   "dependencies": {
     "nuxt": "latest",
     "vuetify": "latest"
diff --git a/examples/with-vux/package.json b/examples/with-vux/package.json
index 7684d25bd7..844cd2cd98 100644
--- a/examples/with-vux/package.json
+++ b/examples/with-vux/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "with-vux",
+  "name": "example-with-vux",
   "version": "1.0.0",
   "license": "MIT",
   "dependencies": {

From b4727eb4c4a33598fe0170037d9b4b207c4ddbef Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 12:21:04 +0800
Subject: [PATCH 21/55] test: refactor generate tests

---
 package.json                   |  1 +
 test/basic.generate.test.js    | 15 ++++++++-------
 test/fallback.generate.test.js | 13 +++++++------
 test/utils/index.js            |  3 ++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index cbc448e899..081bf03f31 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
   "scripts": {
     "build-fixtures": "node ./scripts/build-fixtures",
     "test": "npm run lint && npm run build-fixtures && jest test/",
+    "test:unit": "jest",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",
diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js
index 006efb8189..22c0a5f4ce 100644
--- a/test/basic.generate.test.js
+++ b/test/basic.generate.test.js
@@ -11,6 +11,7 @@ import { loadFixture, getPort } from './utils'
 let port
 const url = route => 'http://localhost:' + port + route
 const rootDir = resolve(__dirname, 'fixtures/basic')
+const distDir = resolve(rootDir, '.nuxt-generate')
 
 let nuxt = null
 let server = null
@@ -18,13 +19,13 @@ let generator = null
 
 describe('basic generate', () => {
   beforeAll(async () => {
-    const config = loadFixture('basic')
+    const config = loadFixture('basic', {generate: {dir: '.nuxt-generate'}})
     nuxt = new Nuxt(config)
     generator = new Generator(nuxt)
 
     await generator.generate({ build: false })
 
-    const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
+    const serve = serveStatic(distDir)
     server = http.createServer((req, res) => {
       serve(req, res, finalhandler(req, res))
     })
@@ -84,9 +85,9 @@ describe('basic generate', () => {
     const html = await rp(url('/users/1/index.html'))
     expect(html.includes('<h1>User: 1</h1>')).toBe(true)
     expect(
-      existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
+      existsSync(resolve(distDir, 'users/1/index.html'))
     ).toBe(true)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html'))).toBe(false)
+    expect(existsSync(resolve(distDir, 'users/1.html'))).toBe(false)
   })
 
   test('/users/2', async () => {
@@ -139,7 +140,7 @@ describe('basic generate', () => {
   })
 
   test('/users/1 not found', async () => {
-    await remove(resolve(rootDir, 'dist/users'))
+    await remove(resolve(distDir, 'users'))
     await expect(rp(url('/users/1'))).rejects.toMatchObject({
       statusCode: 404,
       response: {
@@ -159,9 +160,9 @@ describe('basic generate', () => {
   test('/users/1.html', async () => {
     const html = await rp(url('/users/1.html'))
     expect(html.includes('<h1>User: 1</h1>')).toBe(true)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1.html'))).toBe(true)
+    expect(existsSync(resolve(distDir, 'users/1.html'))).toBe(true)
     expect(
-      existsSync(resolve(__dirname, 'fixtures/basic/dist', 'users/1/index.html'))
+      existsSync(resolve(distDir, 'users/1/index.html'))
     ).toBe(false)
   })
 
diff --git a/test/fallback.generate.test.js b/test/fallback.generate.test.js
index b419a5692d..a300c00eb7 100644
--- a/test/fallback.generate.test.js
+++ b/test/fallback.generate.test.js
@@ -9,6 +9,7 @@ import { loadFixture, getPort } from './utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
+const distDir = resolve(__dirname, 'fixtures/basic/.nuxt-generate-fallback')
 
 let nuxt = null
 let server = null
@@ -16,14 +17,14 @@ let generator = null
 
 describe('fallback generate', () => {
   beforeAll(async () => {
-    const config = loadFixture('basic')
+    const config = loadFixture('basic', {generate: {dir: '.nuxt-generate-fallback'}})
 
     nuxt = new Nuxt(config)
     generator = new Generator(nuxt)
 
     await generator.generate({ build: false })
 
-    const serve = serveStatic(resolve(__dirname, 'fixtures/basic/dist'))
+    const serve = serveStatic(distDir)
     server = http.createServer((req, res) => {
       serve(req, res, finalhandler(req, res))
     })
@@ -37,8 +38,8 @@ describe('fallback generate', () => {
     const html = await rp(url('/200.html'))
     expect(html.includes('<h1>Index page</h1>')).toBe(false)
     expect(html.includes('data-server-rendered')).toBe(false)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(true)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
+    expect(existsSync(resolve(distDir, '200.html'))).toBe(true)
+    expect(existsSync(resolve(distDir, '404.html'))).toBe(false)
   })
 
   test('nuxt re-generating with generate.fallback = false', async () => {
@@ -56,8 +57,8 @@ describe('fallback generate', () => {
       }
     })
 
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '200.html'))).toBe(false)
-    expect(existsSync(resolve(__dirname, 'fixtures/basic/dist', '404.html'))).toBe(false)
+    expect(existsSync(resolve(distDir, '200.html'))).toBe(false)
+    expect(existsSync(resolve(distDir, '404.html'))).toBe(false)
   })
 
   test('generate.fallback = true is transformed to /404.html', async () => {
diff --git a/test/utils/index.js b/test/utils/index.js
index 8c0ad24a40..0732e8f57d 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,6 +1,7 @@
 import path from 'path'
 import fs from 'fs'
 import _getPort from 'get-port'
+import { defaultsDeep } from 'lodash'
 
 import { requireModule } from '../../lib/common/module'
 
@@ -13,7 +14,7 @@ export function loadFixture(fixture, overrides) {
   config.rootDir = rootDir
   config.dev = false
 
-  return Object.assign({}, config, overrides)
+  return defaultsDeep({}, overrides, config)
 }
 
 export function getPort() {

From f537abe06708c452d14d834c17ffb4a23a927f78 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 13:17:48 +0800
Subject: [PATCH 22/55] refactor: build-fixtures

---
 package.json           |   2 +-
 scripts/build-fixtures |  49 +++++-------
 yarn.lock              | 171 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 187 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 081bf03f31..52a8a4bf59 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "jest": "^22.4.2",
     "jest-runner-eslint": "^0.4.0",
     "jsdom": "^11.6.2",
-    "p-limit": "^1.2.0",
+    "listr": "^0.13.0",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index ed61dde576..cf452be8b4 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -5,8 +5,7 @@ const { resolve } = require('path')
 const { cpus } = require('os')
 
 const spawnAsync = require('@expo/spawn-async')
-const ORA = require('ora')
-const pLimit = require('p-limit')
+const Listr = require('listr')
 
 const fixtures = [
   'children',
@@ -31,41 +30,29 @@ const fixtures = [
   'basic'
 ]
 
-const spinner = new ORA({ enabled: true })
 const nuxtBuild = resolve(__dirname, '../bin/nuxt-build')
 
-let _total = fixtures.length
-let _done = 0
-let remaining = () => ` (${_done}/${_total})`
-
-async function buildFixture(name) {
-  _done++
-
-  let _name = `'${name}'`
-
-  spinner.info('Building ' + _name + remaining())
-
+function buildFixture(name) {
   const rootDir = resolve(__dirname, '../test/fixtures', name)
-
-  await spawnAsync('node', [nuxtBuild, rootDir])
-    .catch((err) => {
-      spinner.warn('Errors while building ' + _name + ': ' + err)
-    })
-    .then(() => {
-      spinner.succeed('Built fixture: ' + _name + remaining())
-    })
+  return spawnAsync('node', [nuxtBuild, rootDir])
 }
 
-async function run() {
-  const concurrency = Math.min(4, cpus().length)
-
-  spinner.info('Building with concurrency of ' + concurrency)
-  const limit = pLimit(concurrency)
-
-  await Promise.all(fixtures.map(fixture =>
-    limit(() => buildFixture(fixture))))
+const tasks = []
+for (let fixture of fixtures) {
+  tasks.push({
+    title: 'Building fixtures ' + fixture,
+    task: (ctx, task) => buildFixture(fixture)
+      .then(() => {
+        task.title = task.title.replace(/^Building/, 'Built') + ' Successfully'
+      })
+  })
 }
 
-run()
+const concurrency = Math.min(4, cpus().length)
+new Listr([{
+  title: `Build ${fixtures.length} fixtures with concurrency of ${concurrency}`,
+  task: () => new Listr(tasks, {concurrent: concurrency})
+}])
+  .run()
   .catch(console.error) // eslint-disable-line no-console
   .then(() => process.exit(0))
diff --git a/yarn.lock b/yarn.lock
index e5549b0c34..2835df7d84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -209,7 +209,7 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-escapes@^1.1.0:
+ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
@@ -239,6 +239,10 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+any-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1384,7 +1388,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1472,16 +1476,33 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
+cli-cursor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+
 cli-spinners@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
 
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1971,6 +1992,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.27.2:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2225,6 +2250,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@
   version "1.3.37"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz#4a92734e0044c8cf0b1553be57eae21a4c6e5fab"
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -2588,6 +2617,10 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -2772,6 +2805,13 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -3404,6 +3444,16 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -3654,6 +3704,12 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
+is-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  dependencies:
+    symbol-observable "^0.2.2"
+
 is-odd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
@@ -4297,6 +4353,54 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+
+listr-update-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-observable "^0.2.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.4.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^5.4.2"
+    stream-to-observable "^0.2.0"
+    strip-ansi "^3.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -4389,12 +4493,25 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5,
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
 log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
     chalk "^2.0.1"
 
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
+
 loglevelnext@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e"
@@ -4915,6 +5032,10 @@ onecolor@^3.0.4:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6"
 
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -4961,6 +5082,15 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
+
 ora@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ora/-/ora-2.0.0.tgz#8ec3a37fa7bffb54a3a0c188a1f6798e7e1827cd"
@@ -5003,7 +5133,7 @@ p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
-p-limit@^1.1.0, p-limit@^1.2.0:
+p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
@@ -5015,6 +5145,10 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -6259,6 +6393,13 @@ resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -6323,6 +6464,12 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
+rxjs@^5.4.2:
+  version "5.5.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.7.tgz#afb3d1642b069b2fbf203903d6501d1acb4cda27"
+  dependencies:
+    symbol-observable "1.0.1"
+
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -6495,6 +6642,10 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
@@ -6709,6 +6860,12 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
+stream-to-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
+  dependencies:
+    any-observable "^0.2.0"
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -6824,6 +6981,14 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
+symbol-observable@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"

From e8ed1e5809bec620b040833282bde5db0426e54c Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 13:48:11 +0800
Subject: [PATCH 23/55] test: fix error.test

---
 test/error.test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/error.test.js b/test/error.test.js
index bdf9d5c2d1..d46cb8680f 100644
--- a/test/error.test.js
+++ b/test/error.test.js
@@ -35,8 +35,7 @@ describe('error', () => {
   })
 
   test('Error: resolvePath()', async () => {
-    expect(() => nuxt.resolvePath()).toThrowError(TypeError)
-
+    expect(() => nuxt.resolvePath()).toThrowError('The \'request\' argument must be string')
     expect(() => nuxt.resolvePath('@/pages/about.vue')).toThrowError('Cannot resolve "@/pages/about.vue"')
   })
 

From c12c5502eeb42c712afade25ffccf50ff3484a2e Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 13:53:48 +0800
Subject: [PATCH 24/55] refactor: test and coverage script

---
 package.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 52a8a4bf59..de77d2fc83 100644
--- a/package.json
+++ b/package.json
@@ -42,13 +42,17 @@
   },
   "scripts": {
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test": "npm run lint && npm run build-fixtures && jest test/",
+    "test": "npm run lint && npm run build-fixtures && jest test/ --coverage",
     "test:unit": "jest",
-    "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
+    "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",
     "postinstall": "opencollective postinstall || exit 0"
   },
+  "jest": {
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": true
+  },
   "engines": {
     "node": ">=8.0.0",
     "npm": ">=5.0.0"

From f9ccbb575438a209e7249ca604b7ec8037ce703a Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:08:23 +0800
Subject: [PATCH 25/55] refactor: make build-fixtures slient when not support
 tty

---
 scripts/build-fixtures | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index cf452be8b4..b98e7be123 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -52,7 +52,7 @@ const concurrency = Math.min(4, cpus().length)
 new Listr([{
   title: `Build ${fixtures.length} fixtures with concurrency of ${concurrency}`,
   task: () => new Listr(tasks, {concurrent: concurrency})
-}])
+}], { nonTTYRenderer: 'silent' })
   .run()
   .catch(console.error) // eslint-disable-line no-console
   .then(() => process.exit(0))

From 03862a10daa0b605d2e1defc6d4a01c756c52e06 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:20:13 +0800
Subject: [PATCH 26/55] refactor: make build-fixtures slient in CI building

---
 scripts/build-fixtures | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index b98e7be123..ec2c140392 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -48,11 +48,15 @@ for (let fixture of fixtures) {
   })
 }
 
-const concurrency = Math.min(4, cpus().length)
+const options = {
+  renderer: process.env.CI === true ? 'silent' : 'default',
+  nonTTYRenderer: 'silent',
+  concurrent: Math.min(4, cpus().length)
+}
 new Listr([{
-  title: `Build ${fixtures.length} fixtures with concurrency of ${concurrency}`,
-  task: () => new Listr(tasks, {concurrent: concurrency})
-}], { nonTTYRenderer: 'silent' })
+  title: `Build ${fixtures.length} fixtures with concurrency of ${options.concurrent}`,
+  task: () => new Listr(tasks, {concurrent: options.concurrent})
+}], options)
   .run()
   .catch(console.error) // eslint-disable-line no-console
   .then(() => process.exit(0))

From 322caa4305ac944dddca766ab91b1d70f0b34956 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:32:52 +0800
Subject: [PATCH 27/55] refactor: temporarily remove --coverage in jest

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index de77d2fc83..c54f2afa45 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   },
   "scripts": {
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test": "npm run lint && npm run build-fixtures && jest test/ --coverage",
+    "test": "npm run lint && npm run build-fixtures && jest test/",
     "test:unit": "jest",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",

From cfb44e7df5bac0ad5b1cf4bf40660b7b28ca3ba5 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:33:46 +0800
Subject: [PATCH 28/55] refactor: temporarily skip spa.test

---
 test/spa.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/spa.test.js b/test/spa.test.js
index 3bdbaf7fd2..f4a46f359b 100644
--- a/test/spa.test.js
+++ b/test/spa.test.js
@@ -13,7 +13,7 @@ const renderRoute = async _url => {
   return { window, head, html }
 }
 
-describe('spa', () => {
+describe.skip('spa', () => {
   beforeAll(async () => {
     const config = loadFixture('spa')
     nuxt = new Nuxt(config)

From eace48fb8c3ca6a176c8a7a1733300ba0f6677c2 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:37:19 +0800
Subject: [PATCH 29/55] refactor: adjust process.env.CI

---
 scripts/build-fixtures | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index ec2c140392..e64a80226d 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -49,7 +49,7 @@ for (let fixture of fixtures) {
 }
 
 const options = {
-  renderer: process.env.CI === true ? 'silent' : 'default',
+  renderer: process.env.CI ? 'silent' : 'default',
   nonTTYRenderer: 'silent',
   concurrent: Math.min(4, cpus().length)
 }

From e8013401070fdad47895c483163e9298c1898166 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 14:54:14 +0800
Subject: [PATCH 30/55] refactor: fail exit when building fixtures failed

---
 scripts/build-fixtures | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/build-fixtures b/scripts/build-fixtures
index e64a80226d..ff66ca97a7 100755
--- a/scripts/build-fixtures
+++ b/scripts/build-fixtures
@@ -58,5 +58,8 @@ new Listr([{
   task: () => new Listr(tasks, {concurrent: options.concurrent})
 }], options)
   .run()
-  .catch(console.error) // eslint-disable-line no-console
   .then(() => process.exit(0))
+  .catch((err) => {
+    console.error(err) // eslint-disable-line no-console
+    process.exit(1)
+  })

From ca1242d5ecdbb3c28e0651b132ba5631812ab92e Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 15:05:02 +0800
Subject: [PATCH 31/55] temporarily comment _getPort for tesing

---
 test/utils/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/utils/index.js b/test/utils/index.js
index 0732e8f57d..e46606e90f 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,6 +1,6 @@
 import path from 'path'
 import fs from 'fs'
-import _getPort from 'get-port'
+// import _getPort from 'get-port'
 import { defaultsDeep } from 'lodash'
 
 import { requireModule } from '../../lib/common/module'
@@ -17,6 +17,8 @@ export function loadFixture(fixture, overrides) {
   return defaultsDeep({}, overrides, config)
 }
 
+let port = 4000
+
 export function getPort() {
-  return _getPort()
+  return port++
 }

From 731ce560675cd81d2910978a78ae072e4be2a7c3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 10:46:11 +0330
Subject: [PATCH 32/55] add circleCI pipeline

---
 .circleci/config.yml | 59 +++++++++++++++++++++++++++++++++++++-------
 jest.config.js       | 13 ----------
 package.json         |  6 +----
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c670c0e0e..ec2947cf27 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,13 @@
 version: 2
+
+defaults: &defaults
+  working_directory: /usr/src/app
+  docker:
+    - image: banian/node-headless-chrome
+
 jobs:
-  build:
-    working_directory: /usr/src/app
-    docker:
-      - image: banian/node-headless-chrome
+  install:
+    <<: *defaults
     steps:
       # Checkout repository
       - checkout
@@ -23,17 +27,54 @@ jobs:
           paths:
             - "node_modules"
 
-      # Test
+  lint:
+      <<: *defaults
       - run:
-          name: Tests
-          command: NODE_ENV=test yarn test && yarn coverage
+          name: ESLint
+          command: yarn lint
 
-      # Release edge
+  build:
+      <<: *defaults
       - run:
-          name: Publish nuxt-edge
+          name: Build Fixtures
+          command: yarn build-fixtures
+
+  test:
+      <<: *defaults
+      - run:
+          name: Test
+          command: yarn jest test/
+
+  release:
+      - run:
+          name: release
           command: |
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then
               echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
               echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
               ./scripts/release-edge
             fi
+
+workflows:
+  version: 2
+  install-and-parallel-test:
+    jobs:
+      - install
+
+      - lint:
+          requires:
+            - install
+
+      - build:
+          requires:
+            - install
+
+      - test:
+          requires:
+            - build
+
+      - release:
+          requires:
+            - build
+            - lint
+            - test
diff --git a/jest.config.js b/jest.config.js
index 7478e43cdf..7f69c4dbe0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,21 +1,8 @@
 module.exports = {
   'testEnvironment': 'node',
   'coverageDirectory': './coverage/',
-  'collectCoverage': false,
   'setupTestFrameworkScriptFile': './test/utils/setup',
   'testMatch': [
     '<rootDir>/test/*.test.js'
-  ],
-  'projects': [
-    // {
-    //   'displayName': 'Lint',
-    //   'runner': 'jest-runner-eslint',
-    //   'testMatch': [
-    //     '<rootDir>/lib/*.js'
-    //   ]
-    // },
-    {
-      'displayName': 'Test'
-    }
   ]
 }
diff --git a/package.json b/package.json
index c54f2afa45..ba5e513514 100644
--- a/package.json
+++ b/package.json
@@ -42,17 +42,13 @@
   },
   "scripts": {
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test": "npm run lint && npm run build-fixtures && jest test/",
+    "test": "npm run build-fixtures && jest",
     "test:unit": "jest",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",
     "postinstall": "opencollective postinstall || exit 0"
   },
-  "jest": {
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": true
-  },
   "engines": {
     "node": ">=8.0.0",
     "npm": ">=5.0.0"

From 06756f5216cfcdedeec557b1c8dd93a2b968f3b2 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 10:48:57 +0330
Subject: [PATCH 33/55] fix circleci

---
 .circleci/config.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ec2947cf27..51bf123cb4 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,24 +29,29 @@ jobs:
 
   lint:
       <<: *defaults
-      - run:
+      steps:
+        - run:
           name: ESLint
           command: yarn lint
 
   build:
       <<: *defaults
-      - run:
-          name: Build Fixtures
-          command: yarn build-fixtures
+      steps:
+        - run:
+            name: Build Fixtures
+            command: yarn build-fixtures
 
   test:
       <<: *defaults
-      - run:
-          name: Test
-          command: yarn jest test/
+      steps:
+        - run:
+            name: Test
+            command: yarn jest test/
 
   release:
-      - run:
+      <<: *defaults
+      steps:
+        - run:
           name: release
           command: |
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then

From a22821af1b310ca9d1c8914c239b66d8e5515036 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 10:51:50 +0330
Subject: [PATCH 34/55] fix indentation

---
 .circleci/config.yml | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 51bf123cb4..818538a90a 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,37 +28,37 @@ jobs:
             - "node_modules"
 
   lint:
-      <<: *defaults
-      steps:
-        - run:
+    <<: *defaults
+    steps:
+      - run:
           name: ESLint
           command: yarn lint
 
   build:
-      <<: *defaults
-      steps:
-        - run:
-            name: Build Fixtures
-            command: yarn build-fixtures
+    <<: *defaults
+    steps:
+      - run:
+          name: Build Fixtures
+          command: yarn build-fixtures
 
   test:
-      <<: *defaults
-      steps:
-        - run:
-            name: Test
-            command: yarn jest test/
+    <<: *defaults
+    steps:
+      - run:
+          name: Test
+          command: yarn jest test/
 
   release:
-      <<: *defaults
-      steps:
-        - run:
-          name: release
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "dev" ]; then
-              echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-              echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-              ./scripts/release-edge
-            fi
+    <<: *defaults
+    steps:
+      - run:
+        name: release
+        command: |
+          if [ "${CIRCLE_BRANCH}" == "dev" ]; then
+            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+            echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+            ./scripts/release-edge
+          fi
 
 workflows:
   version: 2

From 17b01d0aa8db0b345a15a5393274c4cc1394ee7b Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 15:22:35 +0800
Subject: [PATCH 35/55] Revert "temporarily comment _getPort for tesing"

This reverts commit ca1242d5ecdbb3c28e0651b132ba5631812ab92e.
---
 test/utils/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/utils/index.js b/test/utils/index.js
index e46606e90f..0732e8f57d 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -1,6 +1,6 @@
 import path from 'path'
 import fs from 'fs'
-// import _getPort from 'get-port'
+import _getPort from 'get-port'
 import { defaultsDeep } from 'lodash'
 
 import { requireModule } from '../../lib/common/module'
@@ -17,8 +17,6 @@ export function loadFixture(fixture, overrides) {
   return defaultsDeep({}, overrides, config)
 }
 
-let port = 4000
-
 export function getPort() {
-  return port++
+  return _getPort()
 }

From 9f0bb806f55bb9d430e5fbcd3addda59b9ce28ae Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 10:57:08 +0330
Subject: [PATCH 36/55] circleci use attach_workspace

---
 .circleci/config.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 818538a90a..ab587e347b 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2
 
 defaults: &defaults
-  working_directory: /usr/src/app
+  working_directory: ~/project/nuxt
   docker:
     - image: banian/node-headless-chrome
 
@@ -27,9 +27,17 @@ jobs:
           paths:
             - "node_modules"
 
+      # Persist files
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - nuxt
+
   lint:
     <<: *defaults
     steps:
+      - attach_workspace:
+        at: ~/project
       - run:
           name: ESLint
           command: yarn lint
@@ -37,6 +45,8 @@ jobs:
   build:
     <<: *defaults
     steps:
+      - attach_workspace:
+        at: ~/project
       - run:
           name: Build Fixtures
           command: yarn build-fixtures
@@ -44,6 +54,8 @@ jobs:
   test:
     <<: *defaults
     steps:
+      - attach_workspace:
+        at: ~/project
       - run:
           name: Test
           command: yarn jest test/
@@ -51,6 +63,8 @@ jobs:
   release:
     <<: *defaults
     steps:
+      - attach_workspace:
+        at: ~/project
       - run:
         name: release
         command: |

From de2f08fad7431c6505cc409c3926ecc0c3405dab Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:00:03 +0330
Subject: [PATCH 37/55] fix indentation

---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab587e347b..03e0d608b6 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,7 +37,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace:
-        at: ~/project
+          at: ~/project
       - run:
           name: ESLint
           command: yarn lint
@@ -46,7 +46,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace:
-        at: ~/project
+          at: ~/project
       - run:
           name: Build Fixtures
           command: yarn build-fixtures
@@ -55,7 +55,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace:
-        at: ~/project
+          at: ~/project
       - run:
           name: Test
           command: yarn jest test/
@@ -64,15 +64,15 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace:
-        at: ~/project
+          at: ~/project
       - run:
-        name: release
-        command: |
-          if [ "${CIRCLE_BRANCH}" == "dev" ]; then
-            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-            echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-            ./scripts/release-edge
-          fi
+          name: release
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "dev" ]; then
+              echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+              echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+              ./scripts/release-edge
+            fi
 
 workflows:
   version: 2

From d10b6c96bfbde28983186d28195c1fec14ed0d80 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:07:52 +0330
Subject: [PATCH 38/55] persist build artifacts

---
 .circleci/config.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 03e0d608b6..56c941cd67 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ defaults: &defaults
     - image: banian/node-headless-chrome
 
 jobs:
-  install:
+  setup:
     <<: *defaults
     steps:
       # Checkout repository
@@ -50,6 +50,10 @@ jobs:
       - run:
           name: Build Fixtures
           command: yarn build-fixtures
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - nuxt
 
   test:
     <<: *defaults
@@ -76,17 +80,17 @@ jobs:
 
 workflows:
   version: 2
-  install-and-parallel-test:
+  setup-and-parallel-test:
     jobs:
-      - install
+      - setup
 
       - lint:
           requires:
-            - install
+            - setup
 
       - build:
           requires:
-            - install
+            - setup
 
       - test:
           requires:

From d780794dfdb4aabe61f15746bf3b11cd64cba5b6 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:12:56 +0330
Subject: [PATCH 39/55] pass NODE_ENV

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56c941cd67..c1935773ca 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,6 +63,8 @@ jobs:
       - run:
           name: Test
           command: yarn jest test/
+    environment:
+      - NODE_ENV: "test"
 
   release:
     <<: *defaults

From 4500abc1a88b2f6dd5514beb0db0f02b80ebe48d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:27:28 +0330
Subject: [PATCH 40/55] set maxWorkers=2 for test:unit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ba5e513514..9bd0be630d 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,9 @@
     "nuxt": "./bin/nuxt"
   },
   "scripts": {
+    "test": "npm run build-fixtures && npm run test:unit",
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test": "npm run build-fixtures && jest",
-    "test:unit": "jest",
+    "test:unit": "jest --maxWorkers=2",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",

From a4b4688f7c2af66bff144ad7a8370db9d2008141 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:52:00 +0330
Subject: [PATCH 41/55] split e2e tests

---
 .circleci/config.yml                          | 20 +++++++++++++++++--
 jest.config.js                                |  5 +----
 package.json                                  |  3 ++-
 test/{ => e2e}/basic.browser.test.js          |  0
 test/{ => e2e}/children.patch.browser.test.js |  0
 5 files changed, 21 insertions(+), 7 deletions(-)
 rename test/{ => e2e}/basic.browser.test.js (100%)
 rename test/{ => e2e}/children.patch.browser.test.js (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c1935773ca..3a487e4a24 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
       - persist_to_workspace:
           root: ~/project
           paths:
-            - nuxt
+            - nuxt/test/fixtures
 
   test:
     <<: *defaults
@@ -62,7 +62,18 @@ jobs:
           at: ~/project
       - run:
           name: Test
-          command: yarn jest test/
+          command: yarn test:unit
+    environment:
+      - NODE_ENV: "test"
+
+  test-e2e:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Test (e2e)
+          command: yarn test:e2e
     environment:
       - NODE_ENV: "test"
 
@@ -98,8 +109,13 @@ workflows:
           requires:
             - build
 
+      - test-e2e:
+          requires:
+            - build
+
       - release:
           requires:
             - build
             - lint
             - test
+            - test-e2e
diff --git a/jest.config.js b/jest.config.js
index 7f69c4dbe0..d434b79a41 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,8 +1,5 @@
 module.exports = {
   'testEnvironment': 'node',
   'coverageDirectory': './coverage/',
-  'setupTestFrameworkScriptFile': './test/utils/setup',
-  'testMatch': [
-    '<rootDir>/test/*.test.js'
-  ]
+  'setupTestFrameworkScriptFile': './test/utils/setup'
 }
diff --git a/package.json b/package.json
index 9bd0be630d..d60dd165df 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
   "scripts": {
     "test": "npm run build-fixtures && npm run test:unit",
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test:unit": "jest --maxWorkers=2",
+    "test:unit": "jest --maxWorkers=4 test/*.test.js",
+    "test:e2e": "jest --maxWorkers=1 test/e2e/*.test.js",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",
diff --git a/test/basic.browser.test.js b/test/e2e/basic.browser.test.js
similarity index 100%
rename from test/basic.browser.test.js
rename to test/e2e/basic.browser.test.js
diff --git a/test/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js
similarity index 100%
rename from test/children.patch.browser.test.js
rename to test/e2e/children.patch.browser.test.js

From be4adbd366bed8a71d05167573b61418f421df82 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 11:54:05 +0330
Subject: [PATCH 42/55] fix i,ports

---
 test/e2e/basic.browser.test.js          | 6 +++---
 test/e2e/children.patch.browser.test.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js
index ab590bd011..5d9c972cdc 100644
--- a/test/e2e/basic.browser.test.js
+++ b/test/e2e/basic.browser.test.js
@@ -1,6 +1,6 @@
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
-import * as browser from './utils/browser'
+import { Nuxt } from '../..'
+import { loadFixture, getPort } from '../utils'
+import * as browser from '../utils/browser'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js
index 0c6b924dc3..5f4b937e1a 100644
--- a/test/e2e/children.patch.browser.test.js
+++ b/test/e2e/children.patch.browser.test.js
@@ -1,6 +1,6 @@
-import { Nuxt, Utils } from '..'
-import * as browser from './utils/browser'
-import { loadFixture, getPort } from './utils'
+import { Nuxt, Utils } from '../..'
+import * as browser from '../utils/browser'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route

From dde616fbdbf64715217a0fbebbb112acb25d04e3 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 16:29:44 +0800
Subject: [PATCH 43/55] fix: avoid override of puppeteer browser

---
 test/e2e/basic.browser.test.js          |   7 +-
 test/e2e/children.patch.browser.test.js |   7 +-
 test/utils/browser.js                   | 142 ++++++++++++------------
 3 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js
index 5d9c972cdc..cd8e8a9e62 100644
--- a/test/e2e/basic.browser.test.js
+++ b/test/e2e/basic.browser.test.js
@@ -1,8 +1,9 @@
-import { Nuxt } from '../..'
-import { loadFixture, getPort } from '../utils'
-import * as browser from '../utils/browser'
+import { Nuxt } from '..'
+import Browser from './utils/browser'
+import { loadFixture, getPort } from './utils'
 
 let port
+const browser = new Browser()
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js
index 5f4b937e1a..9aa830d617 100644
--- a/test/e2e/children.patch.browser.test.js
+++ b/test/e2e/children.patch.browser.test.js
@@ -1,8 +1,9 @@
-import { Nuxt, Utils } from '../..'
-import * as browser from '../utils/browser'
-import { loadFixture, getPort } from '../utils'
+import { Nuxt, Utils } from '..'
+import Browser from './utils/browser'
+import { loadFixture, getPort } from './utils'
 
 let port
+const browser = new Browser()
 const url = route => 'http://localhost:' + port + route
 
 let nuxt = null
diff --git a/test/utils/browser.js b/test/utils/browser.js
index 8cf29162e8..2888cf8183 100644
--- a/test/utils/browser.js
+++ b/test/utils/browser.js
@@ -1,76 +1,76 @@
 import puppeteer from 'puppeteer'
 
-let browser = null
-
-export async function start(options = {}) {
-  // https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#puppeteerlaunchoptions
-  browser = await puppeteer.launch(
-    Object.assign(
-      {
-        args: ['--no-sandbox', '--disable-setuid-sandbox']
-      },
-      options
-    )
-  )
-}
-
-export async function close() {
-  if (!browser) return
-  await browser.close()
-}
-
-export async function page(url) {
-  if (!browser) throw new Error('Please call start() before page(url)')
-  const page = await browser.newPage()
-  await page.goto(url)
-  await page.waitForFunction('!!window.$nuxt')
-  page.html = () =>
-    page.evaluate(() => window.document.documentElement.outerHTML)
-  page.$text = selector => page.$eval(selector, el => el.textContent)
-  page.$$text = selector =>
-    page.$$eval(selector, els => els.map(el => el.textContent))
-  page.$attr = (selector, attr) =>
-    page.$eval(selector, (el, attr) => el.getAttribute(attr), attr)
-  page.$$attr = (selector, attr) =>
-    page.$$eval(
-      selector,
-      (els, attr) => els.map(el => el.getAttribute(attr)),
-      attr
-    )
-  page.$nuxt = await page.evaluateHandle('window.$nuxt')
-
-  page.nuxt = {
-    async navigate(path, waitEnd = true) {
-      const hook = page.evaluate(() => {
-        return new Promise(resolve =>
-          window.$nuxt.$once('routeChanged', resolve)
-        ).then(() => new Promise(resolve => setTimeout(resolve, 50)))
-      })
-      await page.evaluate(
-        ($nuxt, path) => $nuxt.$router.push(path),
-        page.$nuxt,
-        path
+export default class Browser {
+  async start(options = {}) {
+    // https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#puppeteerlaunchoptions
+    this.browser = await puppeteer.launch(
+      Object.assign(
+        {
+          args: ['--no-sandbox', '--disable-setuid-sandbox']
+        },
+        options
       )
-      if (waitEnd) await hook
-      return { hook }
-    },
-    routeData() {
-      return page.evaluate($nuxt => {
-        return {
-          path: $nuxt.$route.path,
-          query: $nuxt.$route.query
-        }
-      }, page.$nuxt)
-    },
-    loadingData() {
-      return page.evaluate($nuxt => $nuxt.$loading.$data, page.$nuxt)
-    },
-    errorData() {
-      return page.evaluate($nuxt => $nuxt.nuxt.err, page.$nuxt)
-    },
-    storeState() {
-      return page.evaluate($nuxt => $nuxt.$store.state, page.$nuxt)
-    }
+    )
+  }
+
+  async close() {
+    if (!this.browser) return
+    await this.browser.close()
+  }
+
+  async page(url) {
+    if (!this.browser) throw new Error('Please call start() before page(url)')
+    const page = await this.browser.newPage()
+    await page.goto(url)
+    await page.waitForFunction('!!window.$nuxt')
+    page.html = () =>
+      page.evaluate(() => window.document.documentElement.outerHTML)
+    page.$text = selector => page.$eval(selector, el => el.textContent)
+    page.$$text = selector =>
+      page.$$eval(selector, els => els.map(el => el.textContent))
+    page.$attr = (selector, attr) =>
+      page.$eval(selector, (el, attr) => el.getAttribute(attr), attr)
+    page.$$attr = (selector, attr) =>
+      page.$$eval(
+        selector,
+        (els, attr) => els.map(el => el.getAttribute(attr)),
+        attr
+      )
+    page.$nuxt = await page.evaluateHandle('window.$nuxt')
+
+    page.nuxt = {
+      async navigate(path, waitEnd = true) {
+        const hook = page.evaluate(() => {
+          return new Promise(resolve =>
+            window.$nuxt.$once('routeChanged', resolve)
+          ).then(() => new Promise(resolve => setTimeout(resolve, 50)))
+        })
+        await page.evaluate(
+          ($nuxt, path) => $nuxt.$router.push(path),
+          page.$nuxt,
+          path
+        )
+        if (waitEnd) await hook
+        return { hook }
+      },
+      routeData() {
+        return page.evaluate($nuxt => {
+          return {
+            path: $nuxt.$route.path,
+            query: $nuxt.$route.query
+          }
+        }, page.$nuxt)
+      },
+      loadingData() {
+        return page.evaluate($nuxt => $nuxt.$loading.$data, page.$nuxt)
+      },
+      errorData() {
+        return page.evaluate($nuxt => $nuxt.nuxt.err, page.$nuxt)
+      },
+      storeState() {
+        return page.evaluate($nuxt => $nuxt.$store.state, page.$nuxt)
+      }
+    }
+    return page
   }
-  return page
 }

From 0e0729ddffb976f48e2bebb47158e0c44bea1713 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 12:01:25 +0330
Subject: [PATCH 44/55] fix imports

---
 test/e2e/basic.browser.test.js          | 6 +++---
 test/e2e/children.patch.browser.test.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js
index cd8e8a9e62..77112533e9 100644
--- a/test/e2e/basic.browser.test.js
+++ b/test/e2e/basic.browser.test.js
@@ -1,6 +1,6 @@
-import { Nuxt } from '..'
-import Browser from './utils/browser'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../..'
+import Browser from '../utils/browser'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const browser = new Browser()
diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js
index 9aa830d617..d85c7b44d8 100644
--- a/test/e2e/children.patch.browser.test.js
+++ b/test/e2e/children.patch.browser.test.js
@@ -1,6 +1,6 @@
-import { Nuxt, Utils } from '..'
-import Browser from './utils/browser'
-import { loadFixture, getPort } from './utils'
+import { Nuxt, Utils } from '../..'
+import Browser from '../utils/browser'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const browser = new Browser()

From db637c4d32c1ddd2102ada92a3a7a5152734eef0 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 18:06:45 +0800
Subject: [PATCH 45/55] refactor: move tests to unit folder

---
 package.json                                  | 4 ++--
 test/{ => unit}/basic.config.defaults.test.js | 6 +++---
 test/{ => unit}/basic.dev.test.js             | 4 ++--
 test/{ => unit}/basic.fail.generate.test.js   | 4 ++--
 test/{ => unit}/basic.generate.test.js        | 6 +++---
 test/{ => unit}/basic.ssr.csp.test.js         | 4 ++--
 test/{ => unit}/basic.ssr.test.js             | 4 ++--
 test/{ => unit}/children.test.js              | 4 ++--
 test/{ => unit}/cli.test.js                   | 6 +++---
 test/{ => unit}/custom-dirs.test.js           | 4 ++--
 test/{ => unit}/debug.test.js                 | 4 ++--
 test/{ => unit}/deprecate.test.js             | 4 ++--
 test/{ => unit}/dynamic-routes.test.js        | 2 +-
 test/{ => unit}/error.test.js                 | 4 ++--
 test/{ => unit}/express.test.js               | 4 ++--
 test/{ => unit}/fallback.generate.test.js     | 6 +++---
 test/{ => unit}/generator.test.js             | 2 +-
 test/{ => unit}/module.test.js                | 4 ++--
 test/{ => unit}/nuxt.test.js                  | 6 +++---
 test/{ => unit}/spa.test.js                   | 4 ++--
 test/{ => unit}/ssr.test.js                   | 4 ++--
 test/{ => unit}/utils.test.js                 | 2 +-
 test/{ => unit}/with-config.test.js           | 4 ++--
 23 files changed, 48 insertions(+), 48 deletions(-)
 rename test/{ => unit}/basic.config.defaults.test.js (68%)
 rename test/{ => unit}/basic.dev.test.js (94%)
 rename test/{ => unit}/basic.fail.generate.test.js (84%)
 rename test/{ => unit}/basic.generate.test.js (97%)
 rename test/{ => unit}/basic.ssr.csp.test.js (97%)
 rename test/{ => unit}/basic.ssr.test.js (99%)
 rename test/{ => unit}/children.test.js (95%)
 rename test/{ => unit}/cli.test.js (93%)
 rename test/{ => unit}/custom-dirs.test.js (94%)
 rename test/{ => unit}/debug.test.js (97%)
 rename test/{ => unit}/deprecate.test.js (88%)
 rename test/{ => unit}/dynamic-routes.test.js (97%)
 rename test/{ => unit}/error.test.js (94%)
 rename test/{ => unit}/express.test.js (91%)
 rename test/{ => unit}/fallback.generate.test.js (92%)
 rename test/{ => unit}/generator.test.js (97%)
 rename test/{ => unit}/module.test.js (95%)
 rename test/{ => unit}/nuxt.test.js (89%)
 rename test/{ => unit}/spa.test.js (96%)
 rename test/{ => unit}/ssr.test.js (97%)
 rename test/{ => unit}/utils.test.js (99%)
 rename test/{ => unit}/with-config.test.js (98%)

diff --git a/package.json b/package.json
index d60dd165df..08621309be 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
   "scripts": {
     "test": "npm run build-fixtures && npm run test:unit",
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test:unit": "jest --maxWorkers=4 test/*.test.js",
-    "test:e2e": "jest --maxWorkers=1 test/e2e/*.test.js",
+    "test:unit": "jest --maxWorkers=4 test/unit",
+    "test:e2e": "jest --maxWorkers=1 test/e2e",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",
diff --git a/test/basic.config.defaults.test.js b/test/unit/basic.config.defaults.test.js
similarity index 68%
rename from test/basic.config.defaults.test.js
rename to test/unit/basic.config.defaults.test.js
index e3c4125b22..8962b7b002 100644
--- a/test/basic.config.defaults.test.js
+++ b/test/unit/basic.config.defaults.test.js
@@ -1,6 +1,6 @@
 import { resolve } from 'path'
-import { Nuxt, Options } from '..'
-import { version } from '../package.json'
+import { Nuxt, Options } from '../../'
+import { version } from '../../package.json'
 
 describe('basic config defaults', () => {
   test('Nuxt.version is same as package', () => {
@@ -9,7 +9,7 @@ describe('basic config defaults', () => {
 
   test('modulesDir uses /node_modules as default if not set', async () => {
     const options = Options.from({})
-    const currentNodeModulesDir = resolve(__dirname, '..', 'node_modules')
+    const currentNodeModulesDir = resolve(__dirname, '..', '..', 'node_modules')
     expect(options.modulesDir.includes(currentNodeModulesDir)).toBe(true)
   })
 })
diff --git a/test/basic.dev.test.js b/test/unit/basic.dev.test.js
similarity index 94%
rename from test/basic.dev.test.js
rename to test/unit/basic.dev.test.js
index 5f83d887d4..4aff3f27da 100644
--- a/test/basic.dev.test.js
+++ b/test/unit/basic.dev.test.js
@@ -1,5 +1,5 @@
-import { Nuxt, Builder } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt, Builder } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/basic.fail.generate.test.js b/test/unit/basic.fail.generate.test.js
similarity index 84%
rename from test/basic.fail.generate.test.js
rename to test/unit/basic.fail.generate.test.js
index dee2f50366..77310060b5 100644
--- a/test/basic.fail.generate.test.js
+++ b/test/unit/basic.fail.generate.test.js
@@ -1,5 +1,5 @@
-import { Nuxt, Generator } from '..'
-import { loadFixture } from './utils'
+import { Nuxt, Generator } from '../../'
+import { loadFixture } from '../utils'
 
 describe('basic fail generate', () => {
   test('Fail with routes() which throw an error', async () => {
diff --git a/test/basic.generate.test.js b/test/unit/basic.generate.test.js
similarity index 97%
rename from test/basic.generate.test.js
rename to test/unit/basic.generate.test.js
index 22c0a5f4ce..11a78ebe2d 100644
--- a/test/basic.generate.test.js
+++ b/test/unit/basic.generate.test.js
@@ -5,12 +5,12 @@ import { remove } from 'fs-extra'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
-import { Nuxt, Generator } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt, Generator } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
-const rootDir = resolve(__dirname, 'fixtures/basic')
+const rootDir = resolve(__dirname, '..', 'fixtures/basic')
 const distDir = resolve(rootDir, '.nuxt-generate')
 
 let nuxt = null
diff --git a/test/basic.ssr.csp.test.js b/test/unit/basic.ssr.csp.test.js
similarity index 97%
rename from test/basic.ssr.csp.test.js
rename to test/unit/basic.ssr.csp.test.js
index eba2d5fe7e..d69066aedd 100644
--- a/test/basic.ssr.csp.test.js
+++ b/test/unit/basic.ssr.csp.test.js
@@ -1,6 +1,6 @@
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/basic.ssr.test.js b/test/unit/basic.ssr.test.js
similarity index 99%
rename from test/basic.ssr.test.js
rename to test/unit/basic.ssr.test.js
index 6ae9608fac..53495bfbc4 100644
--- a/test/basic.ssr.test.js
+++ b/test/unit/basic.ssr.test.js
@@ -1,6 +1,6 @@
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/children.test.js b/test/unit/children.test.js
similarity index 95%
rename from test/children.test.js
rename to test/unit/children.test.js
index 1c9e06cb99..6523f59408 100644
--- a/test/children.test.js
+++ b/test/unit/children.test.js
@@ -1,5 +1,5 @@
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 // const url = (route) => 'http://localhost:' + port + route
diff --git a/test/cli.test.js b/test/unit/cli.test.js
similarity index 93%
rename from test/cli.test.js
rename to test/unit/cli.test.js
index 77d194b76c..2aee36223f 100644
--- a/test/cli.test.js
+++ b/test/unit/cli.test.js
@@ -2,15 +2,15 @@ import { exec, spawn } from 'child_process'
 import { resolve } from 'path'
 import { promisify } from 'util'
 import rp from 'request-promise-native'
-import { Utils } from '..'
+import { Utils } from '../../'
 
 const execify = promisify(exec)
-const rootDir = resolve(__dirname, 'fixtures/basic')
+const rootDir = resolve(__dirname, '..', 'fixtures/basic')
 
 let port
 const url = route => 'http://localhost:' + port + route
 
-const nuxtBin = resolve(__dirname, '..', 'bin', 'nuxt')
+const nuxtBin = resolve(__dirname, '..', '..', 'bin', 'nuxt')
 
 describe.skip('cli', () => {
   test('nuxt build', async () => {
diff --git a/test/custom-dirs.test.js b/test/unit/custom-dirs.test.js
similarity index 94%
rename from test/custom-dirs.test.js
rename to test/unit/custom-dirs.test.js
index 9444733a7c..99be533fa5 100644
--- a/test/custom-dirs.test.js
+++ b/test/unit/custom-dirs.test.js
@@ -1,6 +1,6 @@
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/debug.test.js b/test/unit/debug.test.js
similarity index 97%
rename from test/debug.test.js
rename to test/unit/debug.test.js
index d8f2530499..673a94cdbf 100644
--- a/test/debug.test.js
+++ b/test/unit/debug.test.js
@@ -1,6 +1,6 @@
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/deprecate.test.js b/test/unit/deprecate.test.js
similarity index 88%
rename from test/deprecate.test.js
rename to test/unit/deprecate.test.js
index ad6b5c9740..cb1651bc1b 100644
--- a/test/deprecate.test.js
+++ b/test/unit/deprecate.test.js
@@ -1,5 +1,5 @@
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 
diff --git a/test/dynamic-routes.test.js b/test/unit/dynamic-routes.test.js
similarity index 97%
rename from test/dynamic-routes.test.js
rename to test/unit/dynamic-routes.test.js
index c96b8ed506..3aa8418c72 100644
--- a/test/dynamic-routes.test.js
+++ b/test/unit/dynamic-routes.test.js
@@ -7,7 +7,7 @@ const readFile = promisify(fs.readFile)
 describe('dynamic routes', () => {
   test('Check .nuxt/router.js', () => {
     return readFile(
-      resolve(__dirname, './fixtures/dynamic-routes/.nuxt/router.js'),
+      resolve(__dirname, '..', 'fixtures/dynamic-routes/.nuxt/router.js'),
       'utf-8'
     ).then(routerFile => {
       routerFile = routerFile
diff --git a/test/error.test.js b/test/unit/error.test.js
similarity index 94%
rename from test/error.test.js
rename to test/unit/error.test.js
index d46cb8680f..3daf87c813 100644
--- a/test/error.test.js
+++ b/test/unit/error.test.js
@@ -1,6 +1,6 @@
 // import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/express.test.js b/test/unit/express.test.js
similarity index 91%
rename from test/express.test.js
rename to test/unit/express.test.js
index 5dc4a47b64..512c0a5060 100644
--- a/test/express.test.js
+++ b/test/unit/express.test.js
@@ -1,7 +1,7 @@
 import express from 'express'
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/fallback.generate.test.js b/test/unit/fallback.generate.test.js
similarity index 92%
rename from test/fallback.generate.test.js
rename to test/unit/fallback.generate.test.js
index a300c00eb7..c34196d7cc 100644
--- a/test/fallback.generate.test.js
+++ b/test/unit/fallback.generate.test.js
@@ -4,12 +4,12 @@ import { resolve } from 'path'
 import serveStatic from 'serve-static'
 import finalhandler from 'finalhandler'
 import rp from 'request-promise-native'
-import { Nuxt, Generator, Options } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt, Generator, Options } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
-const distDir = resolve(__dirname, 'fixtures/basic/.nuxt-generate-fallback')
+const distDir = resolve(__dirname, '..', 'fixtures/basic/.nuxt-generate-fallback')
 
 let nuxt = null
 let server = null
diff --git a/test/generator.test.js b/test/unit/generator.test.js
similarity index 97%
rename from test/generator.test.js
rename to test/unit/generator.test.js
index b494555338..52077043eb 100644
--- a/test/generator.test.js
+++ b/test/unit/generator.test.js
@@ -1,4 +1,4 @@
-import { Nuxt, Generator } from '..'
+import { Nuxt, Generator } from '../../'
 
 describe('generator', () => {
   test('initRoutes with routes (fn => array)', async () => {
diff --git a/test/module.test.js b/test/unit/module.test.js
similarity index 95%
rename from test/module.test.js
rename to test/unit/module.test.js
index 368803af35..4cdbf0ff75 100644
--- a/test/module.test.js
+++ b/test/unit/module.test.js
@@ -1,7 +1,7 @@
 import { normalize } from 'path'
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route
diff --git a/test/nuxt.test.js b/test/unit/nuxt.test.js
similarity index 89%
rename from test/nuxt.test.js
rename to test/unit/nuxt.test.js
index bdc53111e3..41e429fe48 100644
--- a/test/nuxt.test.js
+++ b/test/unit/nuxt.test.js
@@ -1,6 +1,6 @@
 import { resolve } from 'path'
-import { Nuxt, Builder } from '..'
-import { loadFixture } from './utils'
+import { Nuxt, Builder } from '../../'
+import { loadFixture } from '../utils'
 
 describe('nuxt', () => {
   test('Nuxt.js Class', () => {
@@ -23,7 +23,7 @@ describe('nuxt', () => {
   test('Fail to build when no pages/ directory but is in the parent', () => {
     const nuxt = new Nuxt({
       dev: false,
-      rootDir: resolve(__dirname, 'fixtures', 'empty', 'pages')
+      rootDir: resolve(__dirname, '..', 'fixtures', 'empty', 'pages')
     })
 
     return new Builder(nuxt).build().catch(err => {
diff --git a/test/spa.test.js b/test/unit/spa.test.js
similarity index 96%
rename from test/spa.test.js
rename to test/unit/spa.test.js
index f4a46f359b..626ad75c8f 100644
--- a/test/spa.test.js
+++ b/test/unit/spa.test.js
@@ -1,5 +1,5 @@
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let nuxt = null
 
diff --git a/test/ssr.test.js b/test/unit/ssr.test.js
similarity index 97%
rename from test/ssr.test.js
rename to test/unit/ssr.test.js
index 997733a3b3..ea9415c925 100644
--- a/test/ssr.test.js
+++ b/test/unit/ssr.test.js
@@ -1,7 +1,7 @@
-import { Nuxt, Utils } from '..'
+import { Nuxt, Utils } from '../../'
 import { uniq } from 'lodash'
 import rp from 'request-promise-native'
-import { loadFixture, getPort } from './utils'
+import { loadFixture, getPort } from '../utils'
 
 let port
 let nuxt = null
diff --git a/test/utils.test.js b/test/unit/utils.test.js
similarity index 99%
rename from test/utils.test.js
rename to test/unit/utils.test.js
index 1e3e59b170..e7bfa2efd9 100644
--- a/test/utils.test.js
+++ b/test/unit/utils.test.js
@@ -1,5 +1,5 @@
 import ansiHTML from 'ansi-html'
-import { Utils } from '..'
+import { Utils } from '../../'
 
 describe('utils', () => {
   test('encodeHtml', () => {
diff --git a/test/with-config.test.js b/test/unit/with-config.test.js
similarity index 98%
rename from test/with-config.test.js
rename to test/unit/with-config.test.js
index c280b57768..bb5628fce6 100644
--- a/test/with-config.test.js
+++ b/test/unit/with-config.test.js
@@ -1,6 +1,6 @@
 import rp from 'request-promise-native'
-import { Nuxt } from '..'
-import { loadFixture, getPort } from './utils'
+import { Nuxt } from '../../'
+import { loadFixture, getPort } from '../utils'
 
 let port
 const url = route => 'http://localhost:' + port + route

From b2f0e0c066c512bb1acb07028cf22ca487eaa1c3 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 18:11:04 +0800
Subject: [PATCH 46/55] fix: lint issue

---
 test/unit/ssr.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/ssr.test.js b/test/unit/ssr.test.js
index ea9415c925..189d8d0062 100644
--- a/test/unit/ssr.test.js
+++ b/test/unit/ssr.test.js
@@ -1,6 +1,6 @@
-import { Nuxt, Utils } from '../../'
 import { uniq } from 'lodash'
 import rp from 'request-promise-native'
+import { Nuxt, Utils } from '../../'
 import { loadFixture, getPort } from '../utils'
 
 let port

From ec87889133b0e1b887eb6c83c5c7ad96a7c389fe Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 18:26:57 +0800
Subject: [PATCH 47/55] ci(appveyor): not build feature branches with open pull
 requests

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 9ce63a4e85..056894b2e6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,3 +26,6 @@ test_script:
 
 # Don't actually build.
 build: off
+
+# Do not build feature branch with open Pull Requests
+skip_branch_with_pr: true

From 34c1cad8ccc9b67cab0ca392b5473cc46876d9f1 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 19:19:16 +0330
Subject: [PATCH 48/55] enable collectCoverage and codecov

---
 .circleci/config.yml | 4 ++--
 jest.config.js       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a487e4a24..314597f729 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,7 +62,7 @@ jobs:
           at: ~/project
       - run:
           name: Test
-          command: yarn test:unit
+          command: yarn test:unit && yarn coverage
     environment:
       - NODE_ENV: "test"
 
@@ -73,7 +73,7 @@ jobs:
           at: ~/project
       - run:
           name: Test (e2e)
-          command: yarn test:e2e
+          command: yarn test:e2e && yarn coverage
     environment:
       - NODE_ENV: "test"
 
diff --git a/jest.config.js b/jest.config.js
index d434b79a41..e7fa0205a2 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,5 +1,6 @@
 module.exports = {
-  'testEnvironment': 'node',
-  'coverageDirectory': './coverage/',
-  'setupTestFrameworkScriptFile': './test/utils/setup'
+  testEnvironment: 'node',
+  coverageDirectory: './coverage/',
+  collectCoverage: true,
+  setupTestFrameworkScriptFile: './test/utils/setup'
 }

From 190923e51ad950829e18fb3e4c08adeaae9a8913 Mon Sep 17 00:00:00 2001
From: Clark Du <clark.duxin@gmail.com>
Date: Mon, 19 Mar 2018 23:55:37 +0800
Subject: [PATCH 49/55] fix: extractCSS:true and dev:false break building

---
 lib/builder/webpack/client.config.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/builder/webpack/client.config.mjs b/lib/builder/webpack/client.config.mjs
index 1976350cd0..a0541846f7 100644
--- a/lib/builder/webpack/client.config.mjs
+++ b/lib/builder/webpack/client.config.mjs
@@ -124,7 +124,9 @@ export default function webpackClientConfig() {
 
   // CSS extraction
   const extractCSS = this.options.build.extractCSS
-  if (extractCSS) {
+  // TODO: Temporary disabled in dev mode for fixing source maps
+  // (We need `source-map` devtool for *.css modules)
+  if (extractCSS && !this.options.dev) {
     config.plugins.push(new ExtractTextPlugin(Object.assign({
       filename: this.getFileName('css')
 

From 79d97b2be26715cf6a3db01c98fc7bf72ce42c09 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 19:27:36 +0330
Subject: [PATCH 50/55] fix(ci): report coverage only for unit tests

jest + puppeteer: https://circleci.com/gh/nuxt/nuxt.js/581
---
 jest.config.js | 1 -
 package.json   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index e7fa0205a2..22d6ef094a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   testEnvironment: 'node',
   coverageDirectory: './coverage/',
-  collectCoverage: true,
   setupTestFrameworkScriptFile: './test/utils/setup'
 }
diff --git a/package.json b/package.json
index 08621309be..0116b8db0d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "scripts": {
     "test": "npm run build-fixtures && npm run test:unit",
     "build-fixtures": "node ./scripts/build-fixtures",
-    "test:unit": "jest --maxWorkers=4 test/unit",
+    "test:unit": "jest --maxWorkers=4 --coverage test/unit",
     "test:e2e": "jest --maxWorkers=1 test/e2e",
     "coverage": "codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",

From 3eea48899b30fda25f3d8ab500eeedf238dd146d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 19:39:22 +0330
Subject: [PATCH 51/55] update puppeteer to 1.2.0

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 0116b8db0d..d4210c221e 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "jest-runner-eslint": "^0.4.0",
     "jsdom": "^11.6.2",
     "listr": "^0.13.0",
-    "puppeteer": "^1.0.0",
+    "puppeteer": "^1.2.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "sinon": "^4.4.5"
diff --git a/yarn.lock b/yarn.lock
index 2835df7d84..7b22331621 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6004,9 +6004,9 @@ punycode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
 
-puppeteer@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.1.1.tgz#adbf25e49f5ef03443c10ab8e09a954ca0c7bfee"
+puppeteer@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.2.0.tgz#6a8a1c618af073dfcf6fc7c7e3c12e54129ffa98"
   dependencies:
     debug "^2.6.8"
     extract-zip "^1.6.5"

From 03f3ff45171daa6e5c08bdd2604df728111f1c27 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 19:50:45 +0330
Subject: [PATCH 52/55] fix: move extractText to base.config

fixes test/fixtures/ssr.
---
 lib/builder/webpack/base.config.mjs   | 17 +++++++++++++++++
 lib/builder/webpack/client.config.mjs | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/builder/webpack/base.config.mjs b/lib/builder/webpack/base.config.mjs
index 18a0fdbb3e..44e4c3668b 100644
--- a/lib/builder/webpack/base.config.mjs
+++ b/lib/builder/webpack/base.config.mjs
@@ -1,5 +1,6 @@
 import path from 'path'
 
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import FriendlyErrorsWebpackPlugin from '@nuxtjs/friendly-errors-webpack-plugin'
 import TimeFixPlugin from 'time-fix-plugin'
 import webpack from 'webpack'
@@ -156,6 +157,22 @@ export default function webpackBaseConfig({ name, isServer }) {
     new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole })
   )
 
+  // CSS extraction
+  const extractCSS = this.options.build.extractCSS
+  // TODO: Temporary disabled in dev mode for fixing source maps
+  // (We need `source-map` devtool for *.css modules)
+  if (extractCSS && !this.options.dev) {
+    config.plugins.push(new ExtractTextPlugin(Object.assign({
+      filename: this.getFileName('css')
+
+      // When using optimization.splitChunks and there are
+      // extracted chunks in the commons chunk,
+      // allChunks *must* be set to true
+      // TODO: For nuxt this makes duplicate css assets!
+      // allChunks: true
+    }, typeof extractCSS === 'object' ? extractCSS : {})))
+  }
+
   // Clone deep avoid leaking config between Client and Server
   return _.cloneDeep(config)
 }
diff --git a/lib/builder/webpack/client.config.mjs b/lib/builder/webpack/client.config.mjs
index a0541846f7..d9d56f3971 100644
--- a/lib/builder/webpack/client.config.mjs
+++ b/lib/builder/webpack/client.config.mjs
@@ -3,7 +3,6 @@ import path from 'path'
 import _ from 'lodash'
 import webpack from 'webpack'
 
-import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import HTMLPlugin from 'html-webpack-plugin'
 import StylishPlugin from 'webpack-stylish'
 import BundleAnalyzer from 'webpack-bundle-analyzer'
@@ -122,22 +121,6 @@ export default function webpackClientConfig() {
   // Create additional runtime chunk for cache boosting
   config.optimization.runtimeChunk = true
 
-  // CSS extraction
-  const extractCSS = this.options.build.extractCSS
-  // TODO: Temporary disabled in dev mode for fixing source maps
-  // (We need `source-map` devtool for *.css modules)
-  if (extractCSS && !this.options.dev) {
-    config.plugins.push(new ExtractTextPlugin(Object.assign({
-      filename: this.getFileName('css')
-
-      // When using optimization.splitChunks and there are
-      // extracted chunks in the commons chunk,
-      // allChunks *must* be set to true
-      // TODO: For nuxt this makes duplicate css assets!
-      // allChunks: true
-    }, typeof extractCSS === 'object' ? extractCSS : {})))
-  }
-
   // --------------------------------------
   // Dev specific config
   // --------------------------------------

From 984788362acc0ce6bde404db21d616fd5c206429 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 19:56:56 +0330
Subject: [PATCH 53/55] fix(renderer): setAnsiColors is not a function

---
 lib/common/utils.mjs    | 13 -------------
 lib/core/renderer.mjs   |  4 +---
 test/unit/utils.test.js |  4 ----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/lib/common/utils.mjs b/lib/common/utils.mjs
index 2559e79b16..6980bac494 100644
--- a/lib/common/utils.mjs
+++ b/lib/common/utils.mjs
@@ -42,19 +42,6 @@ export const getContext = function getContext(req, res) {
   return { req, res }
 }
 
-export const setAnsiColors = function setAnsiColors(ansiHTML) {
-  ansiHTML.setColors({
-    reset: ['efefef', 'a6004c'],
-    darkgrey: '5a012b',
-    yellow: 'ffab07',
-    green: 'aeefba',
-    magenta: 'ff84bf',
-    blue: '3505a0',
-    cyan: '56eaec',
-    red: '4e053a'
-  })
-}
-
 export const waitFor = function waitFor(ms) {
   return new Promise(resolve => setTimeout(resolve, ms || 0))
 }
diff --git a/lib/core/renderer.mjs b/lib/core/renderer.mjs
index ea2bb08f1f..988813756c 100644
--- a/lib/core/renderer.mjs
+++ b/lib/core/renderer.mjs
@@ -12,7 +12,7 @@ import Debug from 'debug'
 import connect from 'connect'
 import launchMiddleware from 'launch-editor-middleware'
 
-import { setAnsiColors, isUrl, waitFor, timeout } from '../common/utils'
+import { isUrl, waitFor, timeout } from '../common/utils'
 import defaults from '../common/nuxt.config'
 
 import MetaRenderer from './meta'
@@ -22,8 +22,6 @@ import nuxtMiddleware from './middleware/nuxt'
 const debug = Debug('nuxt:render')
 debug.color = 4 // Force blue color
 
-setAnsiColors(ansiHTML)
-
 let jsdom = null
 
 export default class Renderer {
diff --git a/test/unit/utils.test.js b/test/unit/utils.test.js
index e7bfa2efd9..6929932a02 100644
--- a/test/unit/utils.test.js
+++ b/test/unit/utils.test.js
@@ -16,10 +16,6 @@ describe('utils', () => {
     expect(ctx.res.b).toBe(2)
   })
 
-  test('setAnsiColors', () => {
-    Utils.setAnsiColors(ansiHTML)
-  })
-
   test('waitFor', async () => {
     let s = Date.now()
     await Utils.waitFor(100)

From 0f180ad39f945b7439d766ac54dd890bde4544ca Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 20:00:03 +0330
Subject: [PATCH 54/55] remove extra import

---
 lib/core/renderer.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/core/renderer.mjs b/lib/core/renderer.mjs
index 988813756c..0bf1063201 100644
--- a/lib/core/renderer.mjs
+++ b/lib/core/renderer.mjs
@@ -1,7 +1,6 @@
 import path from 'path'
 import crypto from 'crypto'
 
-import ansiHTML from 'ansi-html'
 import serialize from 'serialize-javascript'
 import serveStatic from 'serve-static'
 import compression from 'compression'

From 884200b58875d3021f461cb794e2ce14df401d4d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Mon, 19 Mar 2018 20:08:11 +0330
Subject: [PATCH 55/55] fix eslint

---
 test/unit/utils.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/unit/utils.test.js b/test/unit/utils.test.js
index 6929932a02..546df984bb 100644
--- a/test/unit/utils.test.js
+++ b/test/unit/utils.test.js
@@ -1,4 +1,3 @@
-import ansiHTML from 'ansi-html'
 import { Utils } from '../../'
 
 describe('utils', () => {