#207 - Click on notification(1) goes straight to GitHub

src/js/__tests__/utils/notifications.js

@@ -1,13 +1,17 @@
 import { expect } from 'chai';
 import sinon from 'sinon';
 import NotificationsUtils from '../../utils/notifications';
+import Helpers from '../../utils/helpers';
+
 const ipcRenderer = window.require('electron').ipcRenderer;
+const shell = window.require('electron').shell;
 
 
 describe('utils/notifications.js', () => {
 
   beforeEach(function() {
     ipcRenderer.send.reset();
+    shell.openExternal.reset();
     sinon.spy(NotificationsUtils, 'raiseNativeNotification');
     sinon.spy(NotificationsUtils, 'raiseSoundNotification');
   });
@@ -160,12 +164,13 @@ describe('utils/notifications.js', () => {
 
   });
 
-  it('should click on a native notification', () => {
+  it('should click on a native notification (with 1 notification)', () => {
 
     const notification = {
       subject: {
         title: 'Hello. This is a notification',
-        type: 'Issue'
+        type: 'Issue',
+        url: 'https://api.github.com/repos/ekonstantinidis/notifications-test/issues/3'
       },
       repository: {
         full_name: 'ekonstantinidis/gitify'
@@ -177,6 +182,46 @@ describe('utils/notifications.js', () => {
 
     const nativeNotification = NotificationsUtils.raiseNativeNotification([notification]);
     nativeNotification.onclick();
+
+    const newUrl = Helpers.generateGitHubUrl(notification.subject.url);
+    expect(shell.openExternal).to.have.been.calledOnce;
+    expect(shell.openExternal).to.have.been.calledWith(newUrl);
+
+    // Put the spy back
+    sinon.spy(NotificationsUtils, 'raiseNativeNotification');
+  });
+
+  it('should click on a native notification (with more than 1 notification)', () => {
+
+    const notifications = [
+      {
+        subject: {
+          title: 'Hello. This is a notification',
+          type: 'Issue',
+          url: 'https://api.github.com/repos/ekonstantinidis/notifications-test/issues/3'
+        },
+        repository: {
+          full_name: 'ekonstantinidis/gitify'
+        }
+      },
+      {
+        subject: {
+          title: 'Hello. This is another notification',
+          type: 'Issue',
+          url: 'https://api.github.com/repos/ekonstantinidis/notifications-test/issues/3'
+        },
+        repository: {
+          full_name: 'ekonstantinidis/gitify'
+        }
+      },
+    ];
+
+    // Restore functionality so we can test further
+    NotificationsUtils.raiseNativeNotification.restore();
+
+    const nativeNotification = NotificationsUtils.raiseNativeNotification(notifications);
+    nativeNotification.onclick();
+
     expect(ipcRenderer.send).to.have.been.calledOnce;
     expect(ipcRenderer.send).to.have.been.calledWith('reopen-window');
 

src/js/components/notification.js

@@ -4,6 +4,8 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { markNotification } from '../actions';
+import Helpers from '../utils/helpers';
+
 
 export class SingleNotification extends React.Component {
 
@@ -16,10 +18,7 @@ export class SingleNotification extends React.Component {
   }
 
   openBrowser() {
-    var url = this.props.notification.subject.url.replace('api.github.com/repos', 'www.github.com');
-    if (url.indexOf('/pulls/') !== -1) {
-      url = url.replace('/pulls/', '/pull/');
-    }
+    var url = Helpers.generateGitHubUrl(this.props.notification.subject.url);
     shell.openExternal(url);
   }
 

src/js/utils/helpers.js

@@ -7,5 +7,13 @@ export default {
     } else {
       ipcRenderer.send('update-icon', 'TrayIdle');
     }
+  },
+
+  generateGitHubUrl(url) {
+    var newUrl = url.replace('api.github.com/repos', 'www.github.com');
+    if (newUrl.indexOf('/pulls/') !== -1) {
+      newUrl = newUrl.replace('/pulls/', '/pull/');
+    }
+    return newUrl;
   }
 };

src/js/utils/notifications.js

@@ -1,4 +1,7 @@
 const ipcRenderer = window.require('electron').ipcRenderer;
+const shell = window.require('electron').shell;
+
+import Helpers from '../utils/helpers';
 
 export default {
   setup(notifications, settings) {
@@ -46,7 +49,12 @@ export default {
     });
 
     nativeNotification.onclick = function () {
-      ipcRenderer.send('reopen-window');
+      if (newCount === 1) {
+        var url = Helpers.generateGitHubUrl(notifications[0].subject.url);
+        shell.openExternal(url);
+      } else {
+        ipcRenderer.send('reopen-window');
+      }
     };
 
     return nativeNotification;