From 7db2601ea8c5fc6f30f632896308793019bc3e8a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 17 May 2016 14:59:33 -0700 Subject: [PATCH] DRY up specs --- spec/api-browser-window-spec.js | 43 ++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 46fc6a3..6178d76 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -825,25 +825,29 @@ describe('browser-window module', function () { describe('dev tool extensions', function () { describe('BrowserWindow.addDevToolsExtension', function () { + this.timeout(10000) + beforeEach(function () { BrowserWindow.removeDevToolsExtension('foo') + + var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo') + BrowserWindow.addDevToolsExtension(extensionPath) + + w.webContents.on('devtools-opened', () => { + var inputEventIntervalId = setInterval(function () { + if (w && w.devToolsWebContents) { + w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']}) + } else { + clearInterval(inputEventIntervalId) + } + }, 200) + }) + + w.loadURL('about:blank') }) describe('when the devtools is docked', function () { it('creates the extension', function (done) { - var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo') - BrowserWindow.addDevToolsExtension(extensionPath) - - w.webContents.on('devtools-opened', () => { - var inputEventIntervalId = setInterval(function () { - if (w && w.devToolsWebContents) { - w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']}) - } else { - clearInterval(inputEventIntervalId) - } - }, 250) - }) - w.loadURL('about:blank') w.webContents.openDevTools({mode: 'bottom'}) ipcMain.once('answer', function (event, message) { @@ -855,19 +859,6 @@ describe('browser-window module', function () { describe('when the devtools is undocked', function () { it('creates the extension', function (done) { - var extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo') - BrowserWindow.addDevToolsExtension(extensionPath) - - w.webContents.on('devtools-opened', () => { - var inputEventIntervalId = setInterval(function () { - if (w && w.devToolsWebContents) { - w.devToolsWebContents.sendInputEvent({type: 'keyDown', keyCode:'[', modifiers: ['meta']}) - } else { - clearInterval(inputEventIntervalId) - } - }, 250) - }) - w.loadURL('about:blank') w.webContents.openDevTools({mode: 'undocked'}) ipcMain.once('answer', function (event, message) { -- 2.7.4