Merge branch 'master' into fix-positioning

Author: ekonstantinidis

images/notifications/commit.png

@@ -71,11 +71,44 @@ describe('Tests for SoundNotificationStore', function () {
  }];
 
  SoundNotificationStore.onIsNewNotification(payload);
-
  expect(SoundNotificationStore.showNotification).toHaveBeenCalled();
 
  });
 
+ it('Should test notifications type/icon', function () {
+
+ spyOn(SoundNotificationStore, 'newNotification');
+
+ var latestNotification = {
+ 'title': 'Greetings', 'url': 'https://api.github.com/repos/octokit/octokit.rb/issues/123', 'type': 'Commit'
+ };
+ SoundNotificationStore.showNotification(1, latestNotification);
+ expect(SoundNotificationStore.newNotification).toHaveBeenCalled();
+
+ var latestNotification = {
+ 'title': 'Greetings', 'url': 'https://api.github.com/repos/octokit/octokit.rb/issues/123', 'type': 'Issue'
+ };
+ SoundNotificationStore.showNotification(1, latestNotification);
+ expect(SoundNotificationStore.newNotification).toHaveBeenCalled();
+
+ var latestNotification = {
+ 'title': 'Greetings', 'url': 'https://api.github.com/repos/octokit/octokit.rb/issues/123', 'type': 'PullRequest'
+ };
+ SoundNotificationStore.showNotification(1, latestNotification);
+ expect(SoundNotificationStore.newNotification).toHaveBeenCalled();
+
+ var latestNotification = {
+ 'title': 'Greetings', 'url': 'https://api.github.com/repos/octokit/octokit.rb/issues/123', 'type': 'AnotherType'
+ };
+ SoundNotificationStore.showNotification(1, latestNotification);
+ expect(SoundNotificationStore.newNotification).toHaveBeenCalled();
+
+ var latestNotification = {};
+ SoundNotificationStore.showNotification(2, latestNotification);
+ expect(SoundNotificationStore.newNotification).toHaveBeenCalled();
+
+ });
+
  it('Should reopen gitify when a notification is clicked', function () {
  var nativeNotification = SoundNotificationStore.newNotification('Test', 'Hello, world!');
 

images/notifications/gitify.png

@@ -18,24 +18,42 @@ var SoundNotificationStore = Reflux.createStore({
  audio.play();
  },
 
- newNotification: function (title, body) {
+ newNotification: function (title, body, icon) {
  var nativeNotification = new Notification(title, {
- body: body
+ body: body,
+ icon: icon || false
  });
  nativeNotification.onclick = function () {
  ipcRenderer.send('reopen-window');
  };
  return nativeNotification;
  },
 
- showNotification: function (countNew, response, latestNotification) {
+ showNotification: function (countNew, latestNotification) {
  var title = (countNew == 1 ?
  'Gitify - ' + latestNotification.full_name :
  'Gitify');
  var body = (countNew == 1 ?
  latestNotification.subject :
  'You\'ve got ' + countNew + ' notifications.');
- this.newNotification(title, body);
+
+ var icon;
+ if (countNew == 1) {
+ switch (latestNotification.type) {
+ case 'Issue':
+ icon = 'images/notifications/issue.png';
+ break;
+ case 'Commit':
+ icon = 'images/notifications/commit.png';
+ break;
+ case 'PullRequest':
+ icon = 'images/notifications/pull-request.png';
+ break;
+ default:
+ icon = 'images/notifications/gitify.png';
+ }
+ }
+ this.newNotification(title, body, icon);
  },
 
  onIsNewNotification: function (response) {
@@ -56,9 +74,10 @@ var SoundNotificationStore = Reflux.createStore({
  self.playSound();
  }
  if (showNotifications) {
- this.showNotification(newNotifications.length, response, {
+ this.showNotification(newNotifications.length, {
  full_name: newNotifications[0].repository.full_name,
- subject: newNotifications[0].subject.title
+ subject: newNotifications[0].subject.title,
+ type: newNotifications[0].subject.type
  });
  }
  }