Merge "Add expect clause when the test passes"

horizon/static/framework/util/q/q.extensions.spec.js

@@ -49,7 +49,7 @@
         }, {
           promise: passedPromise(),
           context: '2'
-        }]).then(onAllSettled, failTest);
+        }]).then(onAllSettled);
 
         $scope.$apply();
 
@@ -76,28 +76,26 @@
       });
 
       it('should reject the promise if condition does not evaluates to true', function() {
-        service.booleanAsPromise(false).then(failTest, angular.noop);
+        var testValues = [ false, null, {}, 'A', 7 ];
-        $scope.$apply();
+        var rejectCount = 0;
-        service.booleanAsPromise(null).then(failTest, angular.noop);
+        testValues.map(function doTest(testValue) {
-        $scope.$apply();
+          service.booleanAsPromise(testValue).then(angular.noop, function failTest() {
-        service.booleanAsPromise({}).then(failTest, angular.noop);
+            rejectCount++;
-        $scope.$apply();
+          });
-        service.booleanAsPromise('A').then(failTest, angular.noop);
-        $scope.$apply();
-        service.booleanAsPromise(7).then(failTest, angular.noop);
           $scope.$apply();
         });
+        expect(rejectCount).toEqual(testValues.length);
+      });
 
       it('should resolve the promise only if condition to true', function() {
-        service.booleanAsPromise(true).then(angular.noop, failTest);
+        var passCount = 0;
+        service.booleanAsPromise(true).then(function passTest() {
+          passCount++;
+        });
         $scope.$apply();
+        expect(passCount).toEqual(1);
       });
-
     });
-
-    function failTest() {
-      expect(false).toBeTruthy();
-    }
   });
 
 })();