New test setup

.babelrc

@@ -5,5 +5,10 @@
     "transform-object-rest-spread",
     "transform-class-properties",
     "transform-runtime"
-  ]
+  ],
+  "env": {
+    "test": {
+      "plugins": ["istanbul"]
+    }
+  }
 }

.travis.yml

@@ -1,14 +1,23 @@
+sudo: required
+dist: trusty
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
 language: node_js
 node_js:
-  - "node"
-  - "6"
   - "4"
+  - "6"
 cache:
-  yarn: true
   directories:
     - node_modules
-install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn --ignore-engines
+before_install:
+  - rm yarn.lock
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3
+script:
+  - echo "No need to use npm test since it's done in the install section via 'npm prepublish'"
 after_script: npm run coveralls

gulpfile.js

@@ -8,8 +8,9 @@ const sequence = require('run-sequence')
 const webpack = require('webpack')
 const webpackStream = require('webpack-stream')
 const del = require('del')
-const jest = require('gulp-jest')
+const childProcess = require('child_process')
 
+const isWindows = /^win/.test(process.platform)
 const babelOptions = JSON.parse(fs.readFileSync('.babelrc', 'utf-8'))
 
 gulp.task('compile', [
@@ -123,21 +124,6 @@ gulp.task('build-prefetcher', ['compile-lib', 'compile-client'], () => {
   .pipe(notify('Built release prefetcher'))
 })
 
-gulp.task('test', ['compile'], () => {
-  return gulp.src('./test')
-  .pipe(jest.default({
-    coverage: true,
-    verbose: true,
-    config: {
-      rootDir: './test',
-      testEnvironment: 'node',
-      coveragePathIgnorePatterns: [
-        'test/.*'
-      ]
-    }
-  }))
-})
-
 gulp.task('bench', ['compile', 'copy', 'compile-bench', 'copy-bench-fixtures'], () => {
   return gulp.src('dist/bench/*.js', {read: false})
   .pipe(benchmark({
@@ -193,7 +179,6 @@ gulp.task('default', [
   'compile',
   'build',
   'copy',
-  'test',
   'watch'
 ])
 
@@ -202,10 +187,36 @@ gulp.task('release', (cb) => {
     'compile',
     'build',
     'copy',
-    'test'
   ], cb)
 })
 
+// We run following task inside a NPM script chain and it runs chromedriver
+// inside a child process tree.
+// Even though we kill this task's process, chromedriver exists throughout
+// the lifetime of the original npm script.
+
+gulp.task('start-chromedriver', ['stop-chromedriver'], (cb) => {
+  const processName =  isWindows? 'chromedriver.cmd' : 'chromedriver'
+  const chromedriver = childProcess.spawn(processName, { stdio: 'inherit' })
+
+  const timeoutHandler = setTimeout(() => {
+    // We need to do this, otherwise this task's process will keep waiting.
+    process.exit(0)
+  }, 2000)
+})
+
+gulp.task('stop-chromedriver', () => {
+  try {
+    if (isWindows) {
+      childProcess.execSync('taskkill /im chromedriver* /t /f', { stdio: 'ignore' })
+    } else {
+      childProcess.execSync('pkill chromedriver', { stdio: 'ignore' })
+    }
+  } catch(ex) {
+    // Do nothing
+  }
+})
+
 // avoid logging to the console
 // that we created a notification
 notify_.logLevel(0)

package.json

@@ -23,13 +23,15 @@
   },
   "scripts": {
     "build": "gulp",
-    "pretest": "npm run lint",
-    "test": "gulp test",
-    "html-report": "nyc report --temp-directory=./coverage --reporter=html",
-    "jest": "jest --coverage",
-    "coveralls": "nyc report --temp-directory=./coverage --reporter=text-lcov | coveralls",
+    "release": "gulp release",
+    "pretestonly": "gulp start-chromedriver",
+    "testonly": "cross-env NODE_PATH=test/lib jest \\.test.js",
+    "posttestonly": "gulp stop-chromedriver",
+    "pretest": "npm run lint && cross-env NODE_ENV=test npm run release",
+    "test": "npm run testonly -- --coverage --forceExit",
+    "coveralls": "nyc --instrument=false --source-map=false report --temp-directory=./coverage --reporter=text-lcov | coveralls",
     "lint": "standard 'bin/*' 'client/**/*.js' 'examples/**/*.js' 'lib/**/*.js' 'pages/**/*.js' 'server/**/*.js' 'test/**/*.js'",
-    "prepublish": "gulp release",
+    "prepublish": "npm run test && npm run release",
     "precommit": "npm run lint"
   },
   "standard": {
@@ -84,24 +86,34 @@
   },
   "devDependencies": {
     "babel-eslint": "7.1.1",
+    "babel-jest": "^18.0.0",
+    "babel-plugin-istanbul": "^3.0.0",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "babel-preset-env": "1.1.8",
     "benchmark": "2.1.3",
+    "cheerio": "^0.22.0",
+    "chromedriver": "^2.26.1",
     "coveralls": "2.11.15",
     "gulp": "3.9.1",
     "gulp-babel": "6.1.2",
     "gulp-benchmark": "1.1.1",
     "gulp-cached": "1.1.1",
-    "gulp-jest": "^1.0.0",
     "gulp-notify": "2.2.0",
     "husky": "0.12.0",
-    "jest": "^18.0.0",
+    "jest-cli": "^18.0.0",
+    "node-fetch": "^1.6.3",
     "nyc": "^10.0.0",
+    "portfinder": "^1.0.10",
     "run-sequence": "1.2.2",
     "standard": "8.6.0",
-    "webpack-stream": "3.2.0"
+    "wd": "^1.1.1",
+    "webpack-stream": "3.2.0",
+    "cross-env": "^3.1.4"
   },
   "jest": {
-    "testEnvironment": "node"
+    "testEnvironment": "node",
+    "testPathDirs": [
+      "test/"
+    ]
   }
 }

server/index.js

@@ -55,6 +55,15 @@ export default class Server {
     if (this.hotReloader) {
       await this.hotReloader.stop()
     }
+
+    if (this.http) {
+      await new Promise((resolve, reject) => {
+        this.http.close((err) => {
+          if (err) return reject(err)
+          return resolve()
+        })
+      })
+    }
   }
 
   defineRoutes () {

server/render.js

@@ -161,6 +161,7 @@ export async function serveStaticWithGzip (req, res, path) {
     // we don't add gzipped files at runtime.
     await fs.stat(gzipPath)
   } catch (ex) {
+    // Handles the error thrown by fs.stat
     if (ex.code === 'ENOENT') {
       // Seems like there's no gzipped file. Let's serve the uncompressed file.
       return serveStatic(req, res, path)

server/resolve.js

@@ -31,8 +31,8 @@ function getPaths (id) {
 
   if (i[i.length - 1] === sep) {
     return [
-      i + 'index.json',
-      i + 'index.js'
+      i + 'index.js',
+      i + 'index.json'
     ]
   }
 

test/integration/basic/pages/async-props.js

@@ -0,0 +1,18 @@
+import React from 'react'
+
+export default class AsyncProps extends React.Component {
+  static async getInitialProps () {
+    return await fetchData()
+  }
+
+  render () {
+    return <p>{this.props.name}</p>
+  }
+}
+
+function fetchData () {
+  const p = new Promise(resolve => {
+    setTimeout(() => resolve({ name: 'Diego Milito' }), 10)
+  })
+  return p
+}

test/fixtures/basic/pages/css.js → test/integration/basic/pages/css.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import style from 'next/css'
 
-export default () => <div className={styles}>This is red</div>
+export default () => <div id='red-box' className={styles}>This is red</div>
 
 const styles = style({ color: 'red' })

test/integration/basic/pages/error.js

@@ -0,0 +1,3 @@
+export default () => {
+  throw new Error('This is an expected error')
+}