alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open254'

Browse Source
This commit is contained in:
Pete Richards
2016-07-18 11:35:43 -07:00
parent 41d0089e53 ea1780364b
commit 99ec188813
11 changed files with 212 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/notification/src/NotificationIndicatorController.js
View File

@@ -49,9 +49,6 @@ define(
//Launch the message list dialog with the models
// from the notifications
messages: notificationService.notifications
},
cancel: function () {
dialogService.dismiss();
}
});

15
platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js
View File

@@ -54,22 +54,7 @@ define(
expect(mockDialogService.getDialogResponse).toHaveBeenCalled();
expect(mockDialogService.getDialogResponse.mostRecentCall.args[0]).toBe('overlay-message-list');
expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].dialog).toBeDefined();
expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined();
//Invoke the cancel callback
mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel();
expect(mockDialogService.dismiss).toHaveBeenCalled();
});
it("provides a means of dismissing the message list", function () {
expect(mockScope.showNotificationsList).toBeDefined();
mockScope.showNotificationsList();
expect(mockDialogService.getDialogResponse).toHaveBeenCalled();
expect(mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel).toBeDefined();
//Invoke the cancel callback
mockDialogService.getDialogResponse.mostRecentCall.args[1].cancel();
expect(mockDialogService.dismiss).toHaveBeenCalled();
});
});
}
);