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

fix: avoid override of puppeteer browser

Browse Source
This commit is contained in:
Clark Du 2018-03-19 16:29:44 +08:00
parent be4adbd366
commit dde616fbdb
No known key found for this signature in database
GPG Key ID: D0E5986AF78B86D9
3 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/basic.browser.test.js
View File

@ -1,8 +1,9 @@
import { Nuxt } from '../..' import { Nuxt } from '..'
import { loadFixture, getPort } from '../utils' import Browser from './utils/browser'
import * as browser from '../utils/browser' import { loadFixture, getPort } from './utils'
let port let port
const browser = new Browser()
const url = route => 'http://localhost:' + port + route const url = route => 'http://localhost:' + port + route
let nuxt = null let nuxt = null

7
test/e2e/children.patch.browser.test.js
View File

@ -1,8 +1,9 @@
import { Nuxt, Utils } from '../..' import { Nuxt, Utils } from '..'
import * as browser from '../utils/browser' import Browser from './utils/browser'
import { loadFixture, getPort } from '../utils' import { loadFixture, getPort } from './utils'
let port let port
const browser = new Browser()
const url = route => 'http://localhost:' + port + route const url = route => 'http://localhost:' + port + route
let nuxt = null let nuxt = null

20
test/utils/browser.js
View File

@ -1,10 +1,9 @@
import puppeteer from 'puppeteer' import puppeteer from 'puppeteer'
let browser = null export default class Browser {
async start(options = {}) {
export async function start(options = {}) {
// https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#puppeteerlaunchoptions // https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#puppeteerlaunchoptions
browser = await puppeteer.launch( this.browser = await puppeteer.launch(
Object.assign( Object.assign(
{ {
args: ['--no-sandbox', '--disable-setuid-sandbox'] args: ['--no-sandbox', '--disable-setuid-sandbox']
@ -14,14 +13,14 @@ export async function start(options = {}) {
) )
} }
export async function close() { async close() {
if (!browser) return if (!this.browser) return
await browser.close() await this.browser.close()
} }
export async function page(url) { async page(url) {
if (!browser) throw new Error('Please call start() before page(url)') if (!this.browser) throw new Error('Please call start() before page(url)')
const page = await browser.newPage() const page = await this.browser.newPage()
await page.goto(url) await page.goto(url)
await page.waitForFunction('!!window.$nuxt') await page.waitForFunction('!!window.$nuxt')
page.html = () => page.html = () =>
@ -74,3 +73,4 @@ export async function page(url) {
} }
return page return page
} }
}