New test setup

gulpfile.js

@@ -8,7 +8,6 @@ const sequence = require('run-sequence')
 const webpack = require('webpack')
 const webpackStream = require('webpack-stream')
 const del = require('del')
-const jest = require('gulp-jest')
 
 const babelOptions = JSON.parse(fs.readFileSync('.babelrc', 'utf-8'))
 
@@ -123,21 +122,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 +177,6 @@ gulp.task('default', [
   'compile',
   'build',
   'copy',
-  'test',
   'watch'
 ])
 
@@ -202,7 +185,6 @@ gulp.task('release', (cb) => {
     'compile',
     'build',
     'copy',
-    'test'
   ], cb)
 })
 

package.json

@@ -23,11 +23,10 @@
   },
   "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",
+    "pretest": "npm run lint && npm run prepublish",
+    "test": "NODE_PATH=test/lib jest test/unit/*.test.js test/isolated/*.test.js test/integration/**/test/*.test.js",
+    "testonly": "NODE_PATH=test/lib jest test/unit/*.test.js test/isolated/*.test.js test/integration/**/test/*.test.js",
+    "coverage": "npm run test -- --coverage",
     "lint": "standard 'bin/*' 'client/**/*.js' 'examples/**/*.js' 'lib/**/*.js' 'pages/**/*.js' 'server/**/*.js' 'test/**/*.js'",
     "prepublish": "gulp release",
     "precommit": "npm run lint"
@@ -81,19 +80,21 @@
   },
   "devDependencies": {
     "babel-eslint": "7.1.1",
+    "babel-jest": "^18.0.0",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "babel-preset-env": "1.1.4",
     "benchmark": "2.1.3",
+    "cheerio": "^0.22.0",
     "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": "^0.6.0",
     "gulp-notify": "2.2.0",
     "husky": "0.12.0",
     "jest": "^18.0.0",
-    "nyc": "^10.0.0",
+    "node-fetch": "^1.6.3",
+    "portfinder": "^1.0.10",
     "run-sequence": "1.2.2",
     "standard": "8.6.0",
     "webpack-stream": "3.2.0"

server/index.js

@@ -52,6 +52,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/resolve.js

@@ -30,8 +30,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')
+}

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

@@ -13,8 +13,10 @@ export default class Statefull extends Component {
   }
 
   render () {
-    return <div>
-      <p>The answer is {this.state.answer}</p>
-    </div>
+    return (
+      <div>
+        <p id='answer'>The answer is {this.state.answer}</p>
+      </div>
+    )
   }
 }

test/fixtures/basic/pages/styled-jsx.js → test/integration/basic/pages/styled-jsx.js

@@ -1,6 +1,6 @@
 export default () => (
   <div>
-    <p>This is blue</p>
+    <p id='blue-box'>This is blue</p>
     <style jsx>{`p { color: blue }`}</style>
   </div>
 )

test/integration/basic/test/index.test.js

@@ -0,0 +1,42 @@
+/* global jasmine, describe, beforeAll, afterAll */
+
+import { next, findPort } from 'next-test-utils'
+import fetch from 'node-fetch'
+import { join } from 'path'
+
+// test suits
+import xPoweredBy from './xpowered-by'
+import rendering from './rendering'
+import misc from './misc'
+
+const app = next({
+  dir: join(__dirname, '../'),
+  dev: true,
+  quiet: true
+})
+
+let appPort
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 20000
+
+describe('Basic Features', () => {
+  beforeAll(async () => {
+    await app.prepare()
+    appPort = await findPort()
+    await app.start(appPort)
+  })
+  afterAll(() => app.close())
+
+  rendering(app, 'Rendering via API', renderingViaAPI)
+  rendering(app, 'Rendering via HTTP', renderingViaHTTP)
+  xPoweredBy(app)
+  misc(app)
+})
+
+function renderingViaAPI (pathname, query = {}) {
+  return app.renderToHTML({}, {}, pathname, query)
+}
+
+function renderingViaHTTP (pathname, query = {}) {
+  const url = `http://localhost:${appPort}${pathname}`
+  return fetch(url).then((res) => res.text())
+}

test/integration/basic/test/misc.js

@@ -0,0 +1,16 @@
+/* global describe, test, expect */
+
+export default function (app) {
+  describe('Misc', () => {
+    test('finishes response', async () => {
+      const res = {
+        finished: false,
+        end () {
+          this.finished = true
+        }
+      }
+      const html = await app.renderToHTML({}, res, '/finish-response', {})
+      expect(html).toBeFalsy()
+    })
+  })
+}