Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Assert remote event names

Kevin Sawicki 8 years ago
parent
b04db2e546
commit
45986405b8
4 changed files with 28 additions and 9 deletions
Split View Show Diff Stats
  1. 1 1
      lib/browser/rpc-server.js
  2. 14 6
      spec/api-ipc-spec.js
  3. 3 2
      spec/fixtures/api/remote-event-handler.html
  4. 10 0
      spec/static/main.js

+ 1 - 1
lib/browser/rpc-server.js
View File 

@@ -161,7 +161,7 @@ const rendererMissingErrorMessage = (meta, args, callIntoRenderer) => {
 
   })
 
 
   if (remoteEvents.length > 0) {
 
-    message += `\nRemote event names: ${remoteEvents.join(' ')}`
 
+    message += `\nRemote event names: ${remoteEvents.join(', ')}`
 
   }
 
 
   return message

+ 14 - 6
spec/api-ipc-spec.js
View File 

@@ -499,12 +499,20 @@ describe('ipc module', function () {
 
       w = new BrowserWindow({
 
         show: false
 
       })
 
-      w.loadURL('file://' + path.join(fixtures, 'api', 'reload-page.html'))
 
-      setTimeout(() => {
 
-        assert.throws(() => w.webContents.emit('remote-handler'),
 
-          /Attempting to call a function in a renderer window that has been closed or released./)
 
-        done()
 
-      }, 400)
 
+      w.webContents.once('did-finish-load', () => {
 
+        w.webContents.once('did-finish-load', () => {
 
+          const expectedMessage = [
 
+            'Attempting to call a function in a renderer window that has been closed or released.',
 
+            'Function provided here: remote-event-handler.html:11:33',
 
+            'Remote event names: remote-handler, other-remote-handler'
 
+          ].join('\n')
 
+          const errorMessage = ipcRenderer.sendSync('try-emit-web-contents-event', w.webContents.id, 'remote-handler')
 
+          assert.equal(errorMessage, expectedMessage)
 
+          done()
 
+        })
 
+        w.webContents.reload()
 
+      })
 
+      w.loadURL('file://' + path.join(fixtures, 'api', 'remote-event-handler.html'))
 
     })
 
   })

+ 3 - 2
spec/fixtures/api/reload-page.html → spec/fixtures/api/remote-event-handler.html
View File 

@@ -7,8 +7,9 @@
 
       const {remote} = require('electron')
 
       const browserWindow = remote.getCurrentWindow()
 
 
-      browserWindow.webContents.on('remote-handler', () => { })
 
-      browserWindow.reload()
 
+      const handler = () => {}
 
+      browserWindow.webContents.on('remote-handler', handler)
 
+      browserWindow.webContents.on('other-remote-handler', handler)
 
     </script>
 
   </head>
 
   <body>

+ 10 - 0
spec/static/main.js
View File 

@@ -249,3 +249,13 @@ ipcMain.on('create-window-with-options-cycle', (event) => {
 
 ipcMain.on('prevent-next-new-window', (event, id) => {
 
   webContents.fromId(id).once('new-window', event => event.preventDefault())
 
 })
 
+
 
+ipcMain.on('try-emit-web-contents-event', (event, id, eventName) => {
 
+  const contents = webContents.fromId(id)
 
+  try {
 
+    contents.emit(eventName, {sender: contents})
 
+    event.returnValue = null
 
+  } catch (error) {
 
+    event.returnValue = error.message
 
+  }
 
+})