chore: Separate test goals (#1428)

* chore: Separate test goals * Update main.js
wireapp · May 8, 2018 · 917afa9 · 917afa9
1 parent 7afbde6
commit 917afa9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/electron/main.js b/electron/main.js
@@ -29,7 +29,7 @@ const {BrowserWindow, Menu, app, ipcMain, session, shell} = require('electron');
 // Paths
 const APP_PATH = app.getAppPath();
 
-// Local files defines
+// Local files
 const ABOUT_HTML = fileUrl(path.join(APP_PATH, 'html', 'about.html'));
 const ABOUT_WINDOW_WHITELIST = [
   ABOUT_HTML,

diff --git a/package.json b/package.json
@@ -75,7 +75,9 @@
     "staging": "npm run prestart && electron electron --inspect --devtools --enable-logging --env=https://wire-webapp-staging.zinfra.io",
     "start": "electron electron --inspect --devtools --enable-logging",
     "test:js": "eslint -c .eslintrc.json --ignore-path .gitignore --ignore-path .eslintignore \"**/*.js\"",
+    "test:main": "electron-mocha --reporter spec tests/main",
     "test:other": "npm run prettier -- --list-different",
-    "test": "npm run test:other && npm run test:js && npm run jest && electron-mocha tests"
+    "test:react": "jest",
+    "test": "npm run test:other && npm run test:js && npm run test:react && npm run test:main"
   }
 }
diff --git a/tests/trayTest.js → tests/main/trayTest.js b/tests/trayTest.js → tests/main/trayTest.js
@@ -20,28 +20,27 @@
 'use strict';
 
 const {BrowserWindow, app} = require('electron');
-const environment = require('../electron/js/environment');
+const environment = require('../../electron/js/environment');
 
 const assert = require('assert');
 const path = require('path');
 
-const tray = require('../electron/js/menu/tray');
+const tray = require('../../electron/js/menu/tray');
 
 describe('tray', () => {
-  describe('#updateBadgeIcon()', () => {
-    it('should update badge according to window title', done => {
+  describe('"updateBadgeIcon"', () => {
+    it('updates badge according to window title', done => {
       const window = new BrowserWindow();
-
       window.loadURL(`file://${path.join(__dirname, 'fixtures', 'badge.html')}`);
-      window.webContents.on('dom-ready', () => {
-        tray.updateBadgeIcon(window, 10);
-
-        if (environment.platform.IS_MAC_OS) {
+      if (environment.platform.IS_MAC_OS) {
+        window.webContents.on('dom-ready', () => {
+          tray.updateBadgeIcon(window, 10);
           assert.equal(app.getBadgeCount(), 10);
-        }
-
+          done();
+        });
+      } else {
         done();
-      });
+      }
     });
   });
 });