Merge ~blake-rouse/maas:fix-service-status-card into maas:master

[Blake Rouse]

Fixes LP: #1763147 - Fix controller status watcher to be recursive.

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/controller_status.js b/src/maasserver/static/js/angular/directives/controller_status.js
index e72607b..2100fb3 100644
--- a/src/maasserver/static/js/angular/directives/controller_status.js
+++ b/src/maasserver/static/js/angular/directives/controller_status.js
@@ -89,7 +89,7 @@ angular.module('MAAS').directive('maasControllerStatus', [
                 // Watch the services array and the services on the controller,
                 // if any changes then update the status.
                 $scope.$watch("controller.service_ids", updateStatusClass);
-                $scope.$watchCollection("services", updateStatusClass);
+                $scope.$watch("services", updateStatusClass, true);
 
                 // Update on creation.
                 updateStatusClass();
diff --git a/src/maasserver/static/js/angular/directives/tests/test_controller_status.js b/src/maasserver/static/js/angular/directives/tests/test_controller_status.js
index 3e77bff..20999e9 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_controller_status.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_controller_status.js
@@ -146,4 +146,19 @@ describe("maasControllerStatus", function() {
         var directive = compileDirective();
         expect(directive.isolateScope().serviceClass).toBe("success");
     });
+
+    it("update service status updates service class", function() {
+        var services = [
+            makeService("dead")
+        ];
+        ServicesManager._items.push.apply(
+            ServicesManager._items, services);
+        $scope.controller = makeController(services);
+        var directive = compileDirective();
+        expect(directive.isolateScope().serviceClass).toBe("power-error");
+
+        services[0].status = "running";
+        $scope.$digest();
+        expect(directive.isolateScope().serviceClass).toBe("success");
+    });
 });