From 83c69b56a4a72403c82620fe9e2d1552585dfa4c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 7 Dec 2015 11:10:57 -0800 Subject: [PATCH] Use ipc eval in spec --- spec/api-menu-spec.coffee | 9 ++++++--- spec/static/main.js | 7 ------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spec/api-menu-spec.coffee b/spec/api-menu-spec.coffee index c619be7..2f1f646 100644 --- a/spec/api-menu-spec.coffee +++ b/spec/api-menu-spec.coffee @@ -10,9 +10,12 @@ describe 'menu module', -> assert.equal menu.items[0].extra, 'field' it 'does not modify the specified template', -> - template = [label: 'text', submenu: [label: 'sub']] - builtTemplate = ipcRenderer.sendSync('menu-build-from-template', template) - assert.deepStrictEqual builtTemplate, template + template = ipcRenderer.sendSync 'eval', """ + var template = [{label: 'text', submenu: [{label: 'sub'}]}]; + require('electron').Menu.buildFromTemplate(template); + template; + """ + assert.deepStrictEqual template, [label: 'text', submenu: [label: 'sub']] describe 'Menu.buildFromTemplate should reorder based on item position specifiers', -> it 'should position before existing item', -> diff --git a/spec/static/main.js b/spec/static/main.js index 821c6ec..be3690c 100644 --- a/spec/static/main.js +++ b/spec/static/main.js @@ -3,7 +3,6 @@ const app = electron.app; const ipcMain = electron.ipcMain; const dialog = electron.dialog; const BrowserWindow = electron.BrowserWindow; -const Menu = electron.Menu; const path = require('path'); @@ -43,12 +42,6 @@ ipcMain.on('echo', function(event, msg) { event.returnValue = msg; }); -// Verify Menu.buildFromTemplate does not modify the specified template -ipcMain.on('menu-build-from-template', function(event, template) { - Menu.buildFromTemplate(template); - event.returnValue = template; -}) - if (process.argv[2] == '--ci') { process.removeAllListeners('uncaughtException'); process.on('uncaughtException', function(error) { -- 2.7.4