Windows/Linux "About" window

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Fixed critical dependency warning @okwme
 * Fixed theme bg bug @okwme
 * Fixed sorting bug on staking page @okwme
+* "About Cosmos Voyager" menu item is now responsive on Windows and Linux @mappum
 * Fixed preference page style bug @okwme
 * Fixed missing node-ip in connection indicator @faboweb
 * Launch sequence for dev improved @okwme

app/src/main/index.js

@@ -171,7 +171,7 @@ function createWindow() {
 
   // addMenu overwrites the default menu to only hold copy/paste actions to not confuse the user
   // In development mode we want all the options including switching the devtools
-  if (!DEV) addMenu()
+  if (!DEV) addMenu(mainWindow)
 }
 
 function startProcess(name, args, env) {

app/src/main/menu.js

@@ -1,13 +1,14 @@
 const { app, Menu } = require("electron")
 
-module.exports = function() {
+module.exports = function(mainWindow) {
   let template = [
     {
       label: "Cosmos Voyager",
       submenu: [
         {
           label: "About Cosmos Voyager",
-          selector: "orderFrontStandardAboutPanel:"
+          selector: "orderFrontStandardAboutPanel:",
+          click: () => openAboutMenu(mainWindow)
         },
         { type: "separator" },
         {
@@ -42,3 +43,8 @@ module.exports = function() {
   let menu = Menu.buildFromTemplate(template)
   Menu.setApplicationMenu(menu)
 }
+
+function openAboutMenu(mainWindow) {
+  if (process.platform === "darwin") return
+  mainWindow.webContents.send("open-about-menu")
+}

app/src/renderer/main.js

@@ -64,6 +64,10 @@ async function main() {
     console.log(hash)
     store.commit("setNodeApprovalRequired", hash)
   })
+  ipcRenderer.on("open-about-menu", event => {
+    // TODO: create an about page
+    router.push("/preferences")
+  })
 
   let firstStart = true
   ipcRenderer.on("connected", (event, nodeIP) => {
@@ -89,7 +93,7 @@ async function main() {
 
   ipcRenderer.send("booted")
 
-  new Vue({
+  return new Vue({
     router,
     ...App,
     store

test/unit/specs/App.spec.js

@@ -113,6 +113,32 @@ describe("App without analytics", () => {
     expect(store.state.node.approvalRequired).toBe("THISISSOMEHASH")
   })
 
+  it("triggers navigation to About on IPC message", async () => {
+    jest.resetModules()
+
+    let mockPush = jest.fn()
+    jest.mock(
+      "vue-router",
+      () =>
+        function() {
+          if (this == null) return
+          this.push = mockPush
+        }
+    )
+
+    const { ipcRenderer } = require("electron")
+    ipcRenderer.on = (type, cb) => {
+      if (type === "open-about-menu") {
+        cb(null)
+      }
+    }
+
+    let app = require("renderer/main.js")
+    expect(mockPush.mock.calls[0][0]).toBe("/preferences")
+
+    jest.resetModules()
+  })
+
   it("sends a message to the main thread, that the app has loaded", () => {
     const { ipcRenderer } = require("electron")
     ipcRenderer.send = jest.fn()

test/unit/specs/__snapshots__/menu.spec.js.snap

@@ -0,0 +1,56 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`App Menu should create the app menu 1`] = `
+Array [
+  Array [
+    Array [
+      Object {
+        "label": "Cosmos Voyager",
+        "submenu": Array [
+          Object {
+            "click": [Function],
+            "label": "About Cosmos Voyager",
+            "selector": "orderFrontStandardAboutPanel:",
+          },
+          Object {
+            "type": "separator",
+          },
+          Object {
+            "accelerator": "Command+Q",
+            "click": [Function],
+            "label": "Quit",
+          },
+        ],
+      },
+      Object {
+        "label": "Edit",
+        "submenu": Array [
+          Object {
+            "accelerator": "CmdOrCtrl+X",
+            "label": "Cut",
+            "selector": "cut:",
+          },
+          Object {
+            "accelerator": "CmdOrCtrl+C",
+            "label": "Copy",
+            "selector": "copy:",
+          },
+          Object {
+            "accelerator": "CmdOrCtrl+V",
+            "label": "Paste",
+            "selector": "paste:",
+          },
+        ],
+      },
+    ],
+  ],
+]
+`;
+
+exports[`App Menu should create the app menu 2`] = `
+Array [
+  Array [
+    undefined,
+  ],
+]
+`;

test/unit/specs/menu.spec.js

@@ -0,0 +1,74 @@
+const { join } = require("path")
+
+let mainWindow
+describe("App Menu", () => {
+  beforeEach(() => {
+    jest.resetModules()
+    jest.unmock("electron")
+
+    mainWindow = {
+      webContents: { send: jest.fn() }
+    }
+
+    jest.mock("electron", () => ({
+      Menu: {
+        buildFromTemplate: jest.fn(menu => {
+          menu
+        }),
+        setApplicationMenu: jest.fn()
+      },
+      app: {
+        quit: jest.fn()
+      }
+    }))
+
+    let createMenu = require("../../../app/src/main/menu.js")
+
+    createMenu(mainWindow)
+  })
+
+  it("should create the app menu", function() {
+    expect(
+      require("electron").Menu.buildFromTemplate.mock.calls
+    ).toMatchSnapshot()
+    expect(
+      require("electron").Menu.setApplicationMenu.mock.calls
+    ).toMatchSnapshot()
+  })
+
+  it("should quit app when clicking Quit menu item", function() {
+    let menu = require("electron").Menu.buildFromTemplate.mock.calls[0][0]
+    let quitItem = menu
+      .find(({ label }) => label === "Cosmos Voyager")
+      .submenu.find(({ label }) => label === "Quit")
+
+    expect(require("electron").app.quit.mock.calls.length).toBe(0)
+    quitItem.click()
+    expect(require("electron").app.quit.mock.calls.length).toBe(1)
+  })
+
+  it("should send 'open-about-menu' when clicking 'About'", function() {
+    process.platform = "linux"
+    let menu = require("electron").Menu.buildFromTemplate.mock.calls[0][0]
+    let aboutItem = menu
+      .find(({ label }) => label === "Cosmos Voyager")
+      .submenu.find(({ label }) => label === "About Cosmos Voyager")
+
+    expect(mainWindow.webContents.send.mock.calls.length).toBe(0)
+    aboutItem.click()
+    expect(mainWindow.webContents.send.mock.calls.length).toBe(1)
+    expect(mainWindow.webContents.send.mock.calls[0][0]).toBe("open-about-menu")
+  })
+
+  it("should not send 'open-about-menu' when clicking 'About' on mac", function() {
+    process.platform = "darwin"
+    let menu = require("electron").Menu.buildFromTemplate.mock.calls[0][0]
+    let aboutItem = menu
+      .find(({ label }) => label === "Cosmos Voyager")
+      .submenu.find(({ label }) => label === "About Cosmos Voyager")
+
+    expect(mainWindow.webContents.send.mock.calls.length).toBe(0)
+    aboutItem.click()
+    expect(mainWindow.webContents.send.mock.calls.length).toBe(0)
+  })
+})