From 495c46040be5f676cc7a830fe9bafa362d1ad844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Wed, 7 Dec 2016 18:37:19 +0100
Subject: [PATCH] Update ava test

---
 examples/with-ava/test/index.test.js | 47 +++++-----------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/examples/with-ava/test/index.test.js b/examples/with-ava/test/index.test.js
index 0f178ac9e7..8b8013a569 100755
--- a/examples/with-ava/test/index.test.js
+++ b/examples/with-ava/test/index.test.js
@@ -10,54 +10,21 @@ let nuxt = null
 let server = null
 
 // Init nuxt.js and create server listening on localhost:4000
-test.before('Init nuxt.js', (t) => {
+test.before('Init Nuxt.js', (t) => {
   const Nuxt = require('../../../')
   const options = {
     rootDir: resolve(__dirname, '..'),
     dev: false
   }
-  return new Nuxt(options)
-  .then(function (_nuxt) {
-    nuxt = _nuxt
+  nuxt = new Nuxt(options)
+  return nuxt.build()
+  .then(function (lol) {
+    console.log(lol)
     server = createServer((req, res) => nuxt.render(req, res))
-    return new Promise((resolve, reject) => {
-      server.listen(4000, 'localhost', () => {
-        resolve()
-      })
-    })
+    server.listen(4000, 'localhost')
   })
 })
 
-// Function used to do dom checking via jsdom
-async function renderAndGetWindow (route) {
-  const virtualConsole = jsdom.createVirtualConsole().sendTo(console)
-  return new Promise((resolve, reject) => {
-    const url = 'http://localhost:4000' + route
-    jsdom.env({
-      url: url,
-      features: {
-        FetchExternalResources: ['script', 'link'],
-        ProcessExternalResources: ['script']
-      },
-      virtualConsole,
-      done (err, window) {
-        if (err) return reject(err)
-        // If Nuxt could not be loaded (error from the server-side)
-        if (!window.__NUXT__) {
-          return reject({
-            message: 'Could not load the nuxt app',
-            body: window.document.getElementsByTagName('body')[0].innerHTML
-          })
-        }
-        // Used by nuxt.js to say when the components are loaded and the app ready
-        window.onNuxtReady(() => {
-          resolve(window)
-        })
-      }
-    })
-  })
-}
-
 /*
 ** Example of testing only the html
 */
@@ -73,7 +40,7 @@ test('Route / exits and render HTML', async t => {
 ** Example of testing via dom checking
 */
 test('Route / exits and render HTML', async t => {
-  const window = await renderAndGetWindow('/')
+  const window = await nuxt.renderAndGetWindow(jsdom, 'http://localhost:4000/')
   const element = window.document.querySelector('.red-color')
   t.not(element, null)
   t.is(element.textContent, 'Hello world!')