Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 16:12:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge renderAndGetWindow options (#3761)

Browse Source 
* feat: merge renderAndGetWindow options

* fix: typoe

* refactor: remove explicit comparison for truthy value

* fix: setup defaults correctly

* test: add custom params test
This commit is contained in:
Alexander Lichter 2018-08-22 16:14:15 +01:00 committed by Sébastien Chopin
parent 3612ecd435
commit 3e027269c0
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/renderer.js
View File

@ -403,17 +403,20 @@ export default class Renderer {
throw e throw e
} }
} }
const options = { const options = Object.assign({
resources: 'usable', // load subresources (https://github.com/tmpvar/jsdom#loading-subresources) resources: 'usable', // load subresources (https://github.com/tmpvar/jsdom#loading-subresources)
runScripts: 'dangerously', runScripts: 'dangerously',
virtualConsole: true,
beforeParse(window) { beforeParse(window) {
// Mock window.scrollTo // Mock window.scrollTo
window.scrollTo = () => {} window.scrollTo = () => {}
} }
} }, opts)
const jsdomErrHandler = (err) => { throw err } const jsdomErrHandler = (err) => { throw err }
if (opts.virtualConsole !== false) { if (options.virtualConsole) {
if (options.virtualConsole === true) {
options.virtualConsole = new jsdom.VirtualConsole().sendTo(consola) options.virtualConsole = new jsdom.VirtualConsole().sendTo(consola)
}
// throw error when window creation failed // throw error when window creation failed
options.virtualConsole.on('jsdomError', jsdomErrHandler) options.virtualConsole.on('jsdomError', jsdomErrHandler)
} }
@ -433,7 +436,7 @@ export default class Renderer {
await timeout(new Promise((resolve) => { await timeout(new Promise((resolve) => {
window._onNuxtLoaded = () => resolve(window) window._onNuxtLoaded = () => resolve(window)
}), 20000, 'Components loading in renderAndGetWindow was not completed in 20s') }), 20000, 'Components loading in renderAndGetWindow was not completed in 20s')
if (opts.virtualConsole !== false) { if (options.virtualConsole) {
// after window initialized successfully // after window initialized successfully
options.virtualConsole.removeListener('jsdomError', jsdomErrHandler) options.virtualConsole.removeListener('jsdomError', jsdomErrHandler)
} }

20
test/unit/with-config.test.js
View File

@ -1,4 +1,5 @@
import { loadFixture, getPort, Nuxt, rp } from '../utils' import jsdom from 'jsdom'
import { getPort, loadFixture, Nuxt, rp } from '../utils'
let port let port
const url = route => 'http://localhost:' + port + route const url = route => 'http://localhost:' + port + route
@ -139,6 +140,23 @@ describe('with-config', () => {
.rejects.toMatchObject({ statusCode: 404 }) .rejects.toMatchObject({ statusCode: 404 })
}) })
test('renderAndGetWindow options', async () => {
const fakeErrorLog = jest.fn()
const mockOptions = {
beforeParse: jest.fn((window) => {
// Mock window.scrollTo
window.scrollTo = () => {}
window._virtualConsole.emit('jsdomError', new Error('test'))
}),
virtualConsole: new jsdom.VirtualConsole().sendTo({error: fakeErrorLog})
}
try {
await nuxt.renderAndGetWindow(url('/test/error'), mockOptions)
} catch (e) {}
expect(mockOptions.beforeParse).toHaveBeenCalled()
expect(fakeErrorLog).toHaveBeenCalled()
})
// Close server and ask nuxt to stop listening to file changes // Close server and ask nuxt to stop listening to file changes
afterAll(async () => { afterAll(async () => {
await nuxt.close() await nuxt.close()