diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js index be398c3014ca..b3bb716b9491 100644 --- a/spec/api-app-spec.js +++ b/spec/api-app-spec.js @@ -163,8 +163,6 @@ describe('app module', function () { describe('app.importCertificate', function () { if (process.platform !== 'linux') return - this.timeout(5000) - var w = null var certPath = path.join(__dirname, 'fixtures', 'certificates') var options = { diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 8203e0bdf1f9..dad48d5497aa 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -211,7 +211,6 @@ describe('browser-window module', function () { }) it('does not crash in did-fail-provisional-load handler', function (done) { - this.timeout(10000) w.webContents.once('did-fail-provisional-load', function () { w.loadURL('http://127.0.0.1:11111') done() @@ -284,7 +283,6 @@ describe('browser-window module', function () { }) it('emits when window is shown', function (done) { - this.timeout(10000) w.once('show', function () { assert.equal(w.isVisible(), true) done() @@ -310,7 +308,6 @@ describe('browser-window module', function () { }) it('emits when window is hidden', function (done) { - this.timeout(10000) w.show() w.once('hide', function () { assert.equal(w.isVisible(), false) @@ -1002,7 +999,6 @@ describe('browser-window module', function () { }) it('emits when link with target is called', function (done) { - this.timeout(10000) w.webContents.once('new-window', function (e, url, frameName) { e.preventDefault() assert.equal(url, 'http://host/') @@ -1019,7 +1015,6 @@ describe('browser-window module', function () { } it('emits when window is maximized', function (done) { - this.timeout(10000) w.once('maximize', function () { done() }) @@ -1034,7 +1029,6 @@ describe('browser-window module', function () { } it('emits when window is unmaximized', function (done) { - this.timeout(10000) w.once('unmaximize', function () { done() }) @@ -1050,7 +1044,6 @@ describe('browser-window module', function () { } it('emits when window is minimized', function (done) { - this.timeout(10000) w.once('minimize', function () { done() }) @@ -1063,8 +1056,6 @@ describe('browser-window module', function () { // This test is too slow, only test it on CI. if (!isCI) return - this.timeout(20000) - it('subscribes to frame updates', function (done) { let called = false w.loadURL('file://' + fixtures + '/api/frame-subscriber.html') @@ -1513,7 +1504,6 @@ describe('browser-window module', function () { describe('dev tool extensions', function () { describe('BrowserWindow.addDevToolsExtension', function () { let showPanelIntevalId - this.timeout(10000) beforeEach(function () { BrowserWindow.removeDevToolsExtension('foo') @@ -1595,8 +1585,6 @@ describe('browser-window module', function () { }) it('works when used with partitions', function (done) { - this.timeout(10000) - if (w != null) { w.destroy() } @@ -1747,8 +1735,6 @@ describe('browser-window module', function () { }) describe('offscreen rendering', function () { - this.timeout(10000) - beforeEach(function () { if (w != null) w.destroy() w = new BrowserWindow({ diff --git a/spec/api-ipc-spec.js b/spec/api-ipc-spec.js index 3cd10e971e8f..bc286dd17c37 100644 --- a/spec/api-ipc-spec.js +++ b/spec/api-ipc-spec.js @@ -434,8 +434,6 @@ describe('ipc module', function () { }) it('does not crash when reply is not sent and browser is destroyed', function (done) { - this.timeout(10000) - w = new BrowserWindow({ show: false }) diff --git a/spec/api-net-spec.js b/spec/api-net-spec.js index 9ddc11986c31..45741b5f1318 100644 --- a/spec/api-net-spec.js +++ b/spec/api-net-spec.js @@ -26,7 +26,6 @@ const kOneKiloByte = 1024 const kOneMegaByte = kOneKiloByte * kOneKiloByte describe('net module', function () { - // this.timeout(0) describe('HTTP basics', function () { let server beforeEach(function (done) { diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js index ff27d0ecbe22..611ef16f232d 100644 --- a/spec/chromium-spec.js +++ b/spec/chromium-spec.js @@ -28,8 +28,6 @@ describe('chromium feature', function () { describe('sending request of http protocol urls', function () { it('does not crash', function (done) { - this.timeout(5000) - var server = http.createServer(function (req, res) { res.end() server.close() @@ -78,8 +76,6 @@ describe('chromium feature', function () { xdescribe('navigator.webkitGetUserMedia', function () { it('calls its callbacks', function (done) { - this.timeout(5000) - navigator.webkitGetUserMedia({ audio: true, video: false @@ -279,8 +275,6 @@ describe('chromium feature', function () { }) describe('window.opener', function () { - this.timeout(10000) - let url = 'file://' + fixtures + '/pages/window-opener.html' let w = null @@ -312,8 +306,6 @@ describe('chromium feature', function () { }) describe('window.opener access from BrowserWindow', function () { - this.timeout(10000) - const scheme = 'other' let url = `${scheme}://${fixtures}/pages/window-opener-location.html` let w = null @@ -363,8 +355,6 @@ describe('chromium feature', function () { }) describe('window.opener access from ', function () { - this.timeout(10000) - const scheme = 'other' const srcPath = `${fixtures}/pages/webview-opener-postMessage.html` const pageURL = `file://${fixtures}/pages/window-opener-location.html` diff --git a/spec/static/index.html b/spec/static/index.html index 336274a71076..c89fe55fea39 100644 --- a/spec/static/index.html +++ b/spec/static/index.html @@ -55,6 +55,7 @@ var mocha = new Mocha(); mocha.ui('bdd').reporter(isCi ? 'tap' : 'html'); + mocha.timeout(isCi ? 30000 : 10000) var query = Mocha.utils.parseQuery(window.location.search || ''); if (query.grep) mocha.grep(query.grep);