Skip to content

Have supported browsers reject promises if a request takes too long #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
missyjcat wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Have supported browsers reject promises if a request takes too long #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0bab69
Have supported browsers reject promises if a request takes too long
missyjcat Jul 20, 2017
20bc31c
remove yarn-error.log
missyjcat Jul 20, 2017
15e9bc5
version bump
missyjcat Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ghostjs-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghostjs",
"version": "1.11.0",
"version": "1.12.0",
"description": "Modern web integration test runner",
"main": "src/ghostjs.js",
"author": "Kevin Grandon <kevingrandon@yahoo.com>",
Expand All @@ -21,7 +21,7 @@
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-0": "^6.16.0",
"babel-register": "^6.18.0",
"chrome-remote-interface": "^0.22.0",
"chrome-remote-interface": "0.24.2",
"debug": "^2.2.0",
"mocha": "^3.0.0",
"mocha-emoji-reporter": "^1.1.2",
Expand Down
7 changes: 6 additions & 1 deletion ghostjs-core/src/chrome/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const fs = require('fs')
const events = require('events')
const path = require('path')

const PAGE_NAVIGATE_TIMEOUT = 20000

class ChromePageObject {
constructor ({ targetId, viewportSize } = {}) {
this.targetId = targetId
Expand Down Expand Up @@ -120,7 +122,10 @@ class ChromePageObject {
}

await Emulation.setDeviceMetricsOverride(deviceMetrics)
await Page.navigate({url: url})
const navigateTimeoutId = setTimeout(() => {
cb(new Error(`Page request to ${url} timed out after ${PAGE_NAVIGATE_TIMEOUT}ms.`), null)
}, PAGE_NAVIGATE_TIMEOUT)
await Page.navigate({url: url}).then(() => { clearTimeout(navigateTimeoutId) })
await Page.loadEventFired(() => {
cb(null, url)
})
Expand Down
9 changes: 7 additions & 2 deletions ghostjs-core/src/ghostjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class Ghost {
* Injects javascript and other things we need.
*/
onOpen () {
console.log('on open called')
Copy link
Owner

@KevinGrandon KevinGrandon Jul 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove for the time being? I would like a way for more verbose logs, but I want to allow people to opt into it.

// Inject any client scripts
this.clientScripts.forEach(script => {
this.page.injectJs(script)
Expand All @@ -148,18 +149,19 @@ class Ghost {
debug('open url', url, 'options', options)
// If we already have a page object, just navigate it.
if (this.page) {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
this.page.open(url, (err, status) => {
if (err) {
console.error(err)
reject(err)
}
this.onOpen()
resolve(status)
})
})
}

return new Promise(resolve => {
return new Promise((resolve, reject) => {
let driverEngine = driver

if (this.testRunner.match(/chrome/)) {
Expand All @@ -169,11 +171,13 @@ class Ghost {
driverEngine.create(this.driverOpts, (err, browser) => {
if (err) {
console.error(err)
reject(err)
}
this.browser = browser
browser.createPage((err, page) => {
if (err) {
console.error(err)
reject(err)
}
this.page = page

Expand Down Expand Up @@ -231,6 +235,7 @@ class Ghost {
page.open(url, (err, status) => {
if (err) {
console.error(err)
reject(err)
}
this.onOpen()
resolve(status)
Expand Down
Loading