Browse Source

test: make before-input-event test more robust

Cheng Zhao 6 years ago
parent
commit
b11b4f2235
2 changed files with 7 additions and 7 deletions
  1. 6 7
      spec/api-web-contents-spec.js
  2. 1 0
      spec/static/main.js

+ 6 - 7
spec/api-web-contents-spec.js

@@ -159,17 +159,16 @@ describe('webContents module', () => {
 
   describe('before-input-event event', () => {
     it('can prevent document keyboard events', (done) => {
-      w.loadFile(path.join(fixtures, 'pages', 'key-events.html'))
+      ipcMain.once('keydown', (event, key) => {
+        assert.strictEqual(key, 'b')
+        done()
+      })
       w.webContents.once('did-finish-load', () => {
-        ipcMain.once('keydown', (event, key) => {
-          assert.strictEqual(key, 'b')
-          done()
-        })
-
-        ipcRenderer.send('prevent-next-input-event', 'a', w.webContents.id)
+        ipcRenderer.sendSync('prevent-next-input-event', 'a', w.webContents.id)
         w.webContents.sendInputEvent({ type: 'keyDown', keyCode: 'a' })
         w.webContents.sendInputEvent({ type: 'keyDown', keyCode: 'b' })
       })
+      w.loadFile(path.join(fixtures, 'pages', 'key-events.html'))
     })
 
     it('has the correct properties', (done) => {

+ 1 - 0
spec/static/main.js

@@ -212,6 +212,7 @@ app.on('ready', function () {
     webContents.fromId(id).once('before-input-event', (event, input) => {
       if (key === input.key) event.preventDefault()
     })
+    event.returnValue = null
   })
 
   ipcMain.on('executeJavaScript', function (event, code, hasCallback) {