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

clean fixture and fix failing travis test

Shelley Vohr 7 years ago
parent
7f89cd0774
commit
0adf775d9a
2 changed files with 33 additions and 30 deletions
Split View Show Diff Stats
  1. 4 5
      spec/api-crash-reporter-spec.js
  2. 29 25
      spec/fixtures/api/crash.html

+ 4 - 5
spec/api-crash-reporter-spec.js
View File 

@@ -197,11 +197,8 @@ describe('crashReporter module', () => {
 
   describe('getProductName', () => {
 
     it('returns the product name if one is specified', () => {
 
       const name = crashReporter.getProductName()
 
-      if (process.platform === 'darwin') {
 
-        assert.equal(name, 'Electron Test')
 
-      } else {
 
-        assert.equal(name, 'Zombies')
 
-      }
 
+      const expectedName = (process.platform === 'darwin') ? 'Electron Test' : 'Zombies'
 
+      assert.equal(name, expectedName)
 
     })
 
   })
 
 
@@ -258,6 +255,8 @@ describe('crashReporter module', () => {
 
 
   describe('getLastCrashReport', () => {
 
     it('correctly returns the most recent report', () => {
 
+      if (process.env.TRAVIS === 'True') return
 
+
 
       const reports = crashReporter.getUploadedReports()
 
       const lastReport = reports[0]
 
       assert(lastReport != null)

+ 29 - 25
spec/fixtures/api/crash.html
View File 

@@ -1,30 +1,34 @@
 
 <html>
 
+
 
 <body>
 
-<script type="text/javascript" charset="utf-8">
 
-var url = require('url').parse(window.location.href, true);
 
-var uploadToServer = !url.query.skipUpload;
 
-var port = url.query.port;
 
-var {crashReporter, ipcRenderer} = require('electron');
 
-crashReporter.start({
 
-  productName: 'Zombies',
 
-  companyName: 'Umbrella Corporation',
 
-  submitURL: 'http://127.0.0.1:' + port,
 
-  uploadToServer: uploadToServer,
 
-  ignoreSystemCrashHandler: true,
 
-  extra: {
 
-    'extra1': 'extra1',
 
-    'extra2': 'extra2',
 
-  }
 
-});
 
+  <script type="text/javascript" charset="utf-8">
 
+    const url = require('url').parse(window.location.href, true);
 
+    const uploadToServer = !url.query.skipUpload;
 
+    const port = url.query.port;
 
+    const {crashReporter, ipcRenderer} = require('electron');
 
+
 
+    crashReporter.start({
 
+      productName: 'Zombies',
 
+      companyName: 'Umbrella Corporation',
 
+      submitURL: 'http://127.0.0.1:' + port,
 
+      uploadToServer: uploadToServer,
 
+      ignoreSystemCrashHandler: true,
 
+      extra: {
 
+        'extra1': 'extra1',
 
+        'extra2': 'extra2',
 
+      }
 
+    })
 
 
-if (process.platform === 'win32') {
 
-  ipcRenderer.sendSync('crash-service-pid', crashReporter._crashServiceProcess.pid)
 
-}
 
+    if (process.platform === 'win32') {
 
+      ipcRenderer.sendSync('crash-service-pid', crashReporter._crashServiceProcess.pid)
 
+    }
 
 
-if (!uploadToServer) {
 
-  ipcRenderer.sendSync('list-existing-dumps')
 
-}
 
-setImmediate(function() { process.crash(); });
 
-</script>
 
+    if (!uploadToServer) {
 
+      ipcRenderer.sendSync('list-existing-dumps')
 
+    }
 
+
 
+    setImmediate(() => { process.crash() })
 
+  </script>
 
 </body>
 
-</html>
 
+
 
+</html>