Merge pull request #5537 from electron/suppress-more-tests
Suppress the tests that need to call window.open on Travis CI
This commit is contained in:
commit
c540721bd3
1 changed files with 9 additions and 1 deletions
|
@ -5,7 +5,7 @@ const url = require('url')
|
||||||
const {app, session, ipcMain, BrowserWindow} = require('electron').remote
|
const {app, session, ipcMain, BrowserWindow} = require('electron').remote
|
||||||
|
|
||||||
describe('<webview> tag', function () {
|
describe('<webview> tag', function () {
|
||||||
this.timeout(10000)
|
this.timeout(20000)
|
||||||
|
|
||||||
var fixtures = path.join(__dirname, 'fixtures')
|
var fixtures = path.join(__dirname, 'fixtures')
|
||||||
var webview = null
|
var webview = null
|
||||||
|
@ -321,6 +321,10 @@ describe('<webview> tag', function () {
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('allowpopups attribute', function () {
|
describe('allowpopups attribute', function () {
|
||||||
|
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
it('can not open new window when not set', function (done) {
|
it('can not open new window when not set', function (done) {
|
||||||
var listener = function (e) {
|
var listener = function (e) {
|
||||||
assert.equal(e.message, 'null')
|
assert.equal(e.message, 'null')
|
||||||
|
@ -346,6 +350,10 @@ describe('<webview> tag', function () {
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('new-window event', function () {
|
describe('new-window event', function () {
|
||||||
|
if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
it('emits when window.open is called', function (done) {
|
it('emits when window.open is called', function (done) {
|
||||||
webview.addEventListener('new-window', function (e) {
|
webview.addEventListener('new-window', function (e) {
|
||||||
assert.equal(e.url, 'http://host/')
|
assert.equal(e.url, 'http://host/')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue