Adding message page, for better content sharing

src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj

@@ -82,6 +82,7 @@
     <Content Include="tests\js\jasmine_test_example_tests.js" />
     <Content Include="tests\js\angular-mocks.js" />
     <Content Include="tests\js\views\failed_groups\controller.spec.js" />
+    <Content Include="tests\js\views\message\controller.spec.js" />
     <Content Include="tests\js\views\pending_retries\controller.spec.js" />
     <Content Include="tests\js\views\redirect\edit\controller.spec.js" />
     <Content Include="tests\js\_references.js" />

src/ServicePulse.Host.Tests/SpecsRunner.html

@@ -10,11 +10,6 @@
     <script src="scripts/jasmine/jasmine-html.js"></script>
     <script src="scripts/jasmine/boot.js"></script>
 
-    <script src="tests/js/angular.js"></script>
-
-
-    <script src="tests/js/angular-mocks.js"></script>
-
     <!-- Vendor -->
     <script src="../servicepulse.host/app/lib/jQuery/jquery.min.js"></script>
     <script src="../servicepulse.host/app/lib/jQuery/jquery.signalR-1.1.3.min.js"></script>
@@ -33,6 +28,8 @@
     <script src="../servicepulse.host/app/lib/moment.min.js"></script>
     <script src="../servicepulse.host/app/lib/angular/angular-momentjs.js"></script>
     <script src="../servicepulse.host/app/lib/angular-ui-select/select.js"></script>
+
+    <script src="tests/js/angular-mocks.js"></script> <!--Needs to be loaded after angular.js-->
 
     <!-- App -->
     <script src="../servicepulse.host/app/js/app.js"></script>
@@ -129,13 +126,18 @@
     <script src="../servicepulse.host/app/js/views/pending_retries/controller.js"></script>
     <script src="../servicepulse.host/app/js/views/pending_retries/route.js"></script>
     <script src="../servicepulse.host/app/js/views/pending_retries/service.js"></script>
-
+
+    <!-- Message -->
+    <script src="../servicepulse.host/app/js/views/message/controller.js"></script>
+    <script src="../servicepulse.host/app/js/views/message/route.js"></script>
+
     <!-- test files -->
     <script src="tests/js/configuration/configuration.spec.js"></script>
     <script src="tests/js/services/services.spec.js"></script>
 
     <script src="tests/js/views/redirect/edit/controller.spec.js"></script>
     <script src="tests/js/views/pending_retries/controller.spec.js"></script>
+    <script src="tests/js/views/message/controller.spec.js"></script>
     <script src="tests/js/views/failed_groups/controller.spec.js"></script>
 
 </head>

src/ServicePulse.Host.Tests/tests/js/_references.js

@@ -85,7 +85,11 @@
 /// <reference path="../../../servicepulse.host/app/js/views/configuration/configuration.service.js" />
 /// <!-- Redirects -->
 /// <reference path="../../../servicepulse.host/app/js/views/redirect/controller.js" />
-/// <reference path="../../../servicepulse.host/app/js/views/views/redirect/route.js" />
-/// <reference path="../../../servicepulse.host/app/js/views/views/redirect/service.js" />
+/// <reference path="../../../servicepulse.host/app/js/views/redirect/route.js" />
+/// <reference path="../../../servicepulse.host/app/js/views/redirect/service.js" />
 /// <reference path="../../../servicepulse.host/app/js/views/redirect/edit/controller.js" />
+/// <!-- Message -->
+/// <reference path="../../../servicepulse.host/app/js/views/message/controller.js" />
+/// <reference path="../../../servicepulse.host/app/js/views/message/route.js" />
+
 /// <reference path="angular-mocks.js" />

src/ServicePulse.Host.Tests/tests/js/views/message/controller.spec.js

@@ -0,0 +1,192 @@
+describe('messagesController', function () {
+
+    beforeEach(function () {
+        module('sc');
+    });
+
+    var $controller;
+
+    beforeEach(inject(function (_$controller_) {
+        $controller = _$controller_;
+    }));
+
+    describe('when retrying a message', function () {
+        var controller, serviceControlService, root, q;
+
+        beforeEach(inject(function ($rootScope, $q) {
+            root = $rootScope;
+            q = $q;
+
+            serviceControlService = {
+                retryFailedMessages: function() {},
+                getFailedMessageById: function() {
+                    return $q.defer().promise;
+                }
+            };
+
+            controller = $controller("messagesController", {
+                $scope: $rootScope.$new(),
+                $routeParams: { messageId: "some-message-id" },
+                scConfig: null,
+                toastService: { showInfo: function () {} },
+                serviceControlService: serviceControlService,
+                archivedMessageService: null,
+                notifyService: function () { return { subscribe: function () { } } },
+                sharedDataService: {
+                    getConfiguration () {
+                        return { data_retention: { error_retention_period: 7 } };
+                    }
+                }
+            });
+        }));
+
+        it('and the retry succeeds, the message is marked as resolved', function () {
+            var deferred = q.defer();
+            spyOn(serviceControlService, 'retryFailedMessages').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, retried: false };
+            controller.retryMessage();
+
+            root.$apply(function () { deferred.resolve('Remote call result') });
+
+            expect(controller.message.retried).toEqual(true);
+            expect(serviceControlService.retryFailedMessages).toHaveBeenCalled();
+        });
+
+        it('and the retry fails, the message is not marked as resolved', function () {
+            var deferred = q.defer();
+            spyOn(serviceControlService, 'retryFailedMessages').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, retried: false };
+            controller.retryMessage();
+
+            root.$apply(function () { deferred.reject('Remote call result') });
+
+            expect(controller.message.retried).toEqual(false);
+            expect(serviceControlService.retryFailedMessages).toHaveBeenCalled();
+        });
+    });
+
+    describe('when archiving a message', function () {
+        var controller, serviceControlService, root;
+
+        beforeEach(inject(function ($rootScope, $q) {
+            root = $rootScope;
+
+            serviceControlService = {
+                archiveFailedMessages: function () { },
+                getFailedMessageById: function () {
+                    return $q.defer().promise;
+                }
+            };
+            controller = $controller('messagesController', {
+                $scope: {},
+                $routeParams: { messageId: "some-message-id" },
+                scConfig: null,
+                toastService: { showInfo: function () { } },
+                serviceControlService: serviceControlService,
+                archivedMessageService: null,
+                notifyService: function () { return { subscribe: function () { } } },
+                sharedDataService: {
+                    getConfiguration () {
+                        return { data_retention: { error_retention_period: 7 } };
+                    }
+                }
+            });
+        }));
+
+        it('and the archive succeeds, the message is marked as archived', inject(function ($q) {
+            var deferred = $q.defer();
+            spyOn(serviceControlService, 'archiveFailedMessages').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, archived: false };
+            controller.archiveMessage();
+
+            root.$apply(function () { deferred.resolve('Remote call result') });
+
+            expect(controller.message.archived).toEqual(true);
+            expect(serviceControlService.archiveFailedMessages).toHaveBeenCalled();
+        }));
+
+        it('and the archive failed, the message is not marked as archived', inject(function ($q) {
+            var deferred = $q.defer();
+            spyOn(serviceControlService, 'archiveFailedMessages').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, archived: false };
+            controller.archiveMessage();
+
+            root.$apply(function () { deferred.reject('Remote call result') });
+
+            expect(controller.message.archived).toEqual(false);
+            expect(serviceControlService.archiveFailedMessages).toHaveBeenCalled();
+        }));
+    });
+
+    describe('when unarchiving a message', function () {
+        var controller, serviceControlService, root, archivedMessageService, q;
+
+        beforeEach(inject(function ($rootScope, $q) {
+            root = $rootScope;
+            q = $q;
+            serviceControlService = {
+                getFailedMessageById: function () {
+                    return $q.defer().promise;
+                }
+            };
+            archivedMessageService = { restoreMessageFromArchive: function () { } };
+
+            controller = $controller('messagesController', {
+                $scope: {},
+                $routeParams: { messageId: "some-message-id" },
+                scConfig: null,
+                toastService: { showInfo: function () { } },
+                serviceControlService: serviceControlService,
+                archivedMessageService: archivedMessageService,
+                notifyService: function () { return { subscribe: function () { } } },
+                sharedDataService: {
+                    getConfiguration () {
+                        return { data_retention: { error_retention_period: 7 } };
+                    }
+                }
+            });
+        }));
+
+        it('and the unarchive succeeds, the message is not marked as archived', function () {
+            var deferred = q.defer();
+            spyOn(archivedMessageService, 'restoreMessageFromArchive').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, archived: true };
+            controller.unarchiveMessage();
+
+            root.$apply(function () { deferred.resolve('Remote call result') });
+
+            expect(controller.message.archived).toEqual(false);
+            expect(archivedMessageService.restoreMessageFromArchive).toHaveBeenCalled();
+        });
+
+        it('and the unarchive fails, the message is still marked as archived', function () {
+            var deferred = q.defer();
+            spyOn(archivedMessageService, 'restoreMessageFromArchive').and.callFake(function () {
+                return deferred.promise;
+            });
+
+            controller.message = { message_id: 1, archived: true };
+            controller.unarchiveMessage();
+
+            root.$apply(function () { deferred.reject('Remote call result') });
+
+            expect(controller.message.archived).toEqual(true);
+            expect(archivedMessageService.restoreMessageFromArchive).toHaveBeenCalled();
+        });
+    });
+});

src/ServicePulse.Host/ServicePulse.Host.csproj

@@ -111,6 +111,9 @@
     <Content Include="app\js\services\factory.listener.js" />
     <Content Include="app\js\services\factory.notifier.js" />
     <Content Include="app\js\services\service.toast.js" />
+    <Content Include="app\js\views\message\controller.js" />
+    <Content Include="app\js\views\message\route.js" />
+    <Content Include="app\js\views\message\messages-view.html" />
     <Content Include="app\js\views\pending_retries\service.js" />
     <Content Include="app\js\views\redirect\controller.js" />
     <Content Include="app\js\views\redirect\edit\controller.js" />