Browse Source

Split test HTML file into separate ones

Ryohei Ikegami 8 years ago
parent
commit
edeac2f59e

+ 3 - 3
spec/api-browser-window-spec.js

@@ -1099,14 +1099,14 @@ describe('BrowserWindow module', function () {
           assert.equal(content, 'Hello')
           done()
         })
-        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open.html#blank'))
+        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open-blank.html'))
       })
       it('opens window of same domain with cross-scripting enabled', (done) => {
         ipcMain.once('answer', (event, content) => {
           assert.equal(content, 'Hello')
           done()
         })
-        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open.html#file'))
+        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open-file.html'))
       })
       it('loads native addons correctly after reload', (done) => {
         ipcMain.once('answer', (event, content) => {
@@ -1117,7 +1117,7 @@ describe('BrowserWindow module', function () {
           })
           w.reload()
         })
-        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open.html#native-addon'))
+        w.loadURL('file://' + path.join(fixtures, 'api', 'native-window-open-native-addon.html'))
       })
     })
   })

+ 11 - 0
spec/fixtures/api/native-window-open-blank.html

@@ -0,0 +1,11 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer} = require("electron");
+  const popup = window.open();
+  popup.document.write('<h1>Hello</h1>');
+  const content = popup.document.querySelector('h1').innerText;
+  ipcRenderer.send('answer', content);
+</script>
+</body>
+</html>

+ 12 - 0
spec/fixtures/api/native-window-open-file.html

@@ -0,0 +1,12 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer} = require("electron");
+  const popup = window.open('native-window-open-child.html');
+  popup.onload = () => {
+    const content = popup.document.querySelector('h1').innerText;
+    ipcRenderer.send('answer', content);
+  };
+</script>
+</body>
+</html>

+ 9 - 0
spec/fixtures/api/native-window-open-native-addon.html

@@ -0,0 +1,9 @@
+<html>
+<body>
+<script type="text/javascript" charset="utf-8">
+  const {ipcRenderer} = require("electron");
+  const runas = require('runas');
+  ipcRenderer.send('answer', typeof runas);
+</script>
+</body>
+</html>

+ 0 - 30
spec/fixtures/api/native-window-open.html

@@ -1,30 +0,0 @@
-<html>
-<body>
-<script type="text/javascript" charset="utf-8">
-  const {ipcRenderer} = require("electron");
-  const tests = {
-    'blank': () => {
-      const popup = window.open();
-      popup.document.write('<h1>Hello</h1>');
-      const content = popup.document.querySelector('h1').innerText;
-      ipcRenderer.send('answer', content);
-    },
-    'file': () => {
-      const popup = window.open('native-window-open-child.html');
-      popup.onload = () => {
-        const content = popup.document.querySelector('h1').innerText;
-        ipcRenderer.send('answer', content);
-      };
-    },
-    'native-addon': () => {
-      const runas = require('runas');
-      ipcRenderer.send('answer', typeof runas);
-    }
-  }
-  const test = location.hash.slice(1);
-  if (tests.hasOwnProperty(test)) {
-    tests[test]();
-  }
-</script>
-</body>
-</html>