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

Add explicit spec for removing preload from webview

Kevin Sawicki 8 years ago
parent
9e88d337ec
commit
fd782706b2
4 changed files with 28 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      spec/fixtures/module/preload-set-global.js
  2. 7 0
      spec/fixtures/pages/webview-stripped-preload.html
  3. 8 0
      spec/static/main.js
  4. 12 0
      spec/webview-spec.js

+ 1 - 0
spec/fixtures/module/preload-set-global.js
View File 

@@ -0,0 +1 @@
 
+window.foo = 'bar'

+ 7 - 0
spec/fixtures/pages/webview-stripped-preload.html
View File 

@@ -0,0 +1,7 @@
 
+<html>
 
+<body>
 
+<script type="text/javascript" charset="utf-8">
 
+  console.log(typeof window.foo);
 
+</script>
 
+</body>
 
+</html>

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

@@ -277,6 +277,14 @@ ipcMain.on('disable-node-on-next-will-attach-webview', (event, id) => {
 
   })
 
 })
 
 
+ipcMain.on('disable-preload-on-next-will-attach-webview', (event, id) => {
 
+  event.sender.once('will-attach-webview', (event, webPreferences, params) => {
 
+    params.src = `file://${path.join(__dirname, '..', 'fixtures', 'pages', 'webview-stripped-preload.html')}`
 
+    delete webPreferences.preload
 
+    delete webPreferences.preloadURL
 
+  })
 
+})
 
+
 
 ipcMain.on('try-emit-web-contents-event', (event, id, eventName) => {
 
   const consoleWarn = console.warn
 
   let warningMessage = null

+ 12 - 0
spec/webview-spec.js
View File 

@@ -1140,6 +1140,18 @@ describe('<webview> tag', function () {
 
       webview.src = 'file://' + fixtures + '/pages/c.html'
 
       document.body.appendChild(webview)
 
     })
 
+
 
+    it('supports removing the preload script', (done) => {
 
+      ipcRenderer.send('disable-preload-on-next-will-attach-webview')
 
+      webview.addEventListener('console-message', (event) => {
 
+        assert.equal(event.message, 'undefined')
 
+        done()
 
+      })
 
+      webview.setAttribute('nodeintegration', 'yes')
 
+      webview.setAttribute('preload', path.join(fixtures, 'module', 'preload-set-global.js'))
 
+      webview.src = 'file://' + fixtures + '/pages/a.html'
 
+      document.body.appendChild(webview)
 
+    })
 
   })
 
 
   it('loads devtools extensions registered on the parent window', function (done) {