Merge pull request #2172 from CodeNow/SAN-6094

SAN-6094 Don't run the tests if they have a valid state.

Author: damienrunnable

client/directives/components/lists/branchTestList/branchTestListController.js

@@ -24,7 +24,7 @@ function BranchTestListController(
 
   fetchInstanceTestHistory(BTLC.instance.attrs.id)
     .then(function(tests) {
-      return calculateHistoricalTestResult(tests);
+      return calculateHistoricalTestResult.addResults(tests);
     })
     .then(function(tests) {
       var testHash = {};

client/directives/components/lists/branchTestSelector/branchTestSelectorController.js

@@ -10,7 +10,8 @@ function BranchTestSelectorController(
   keypather,
   loading,
   fetchCommitData,
-  updateInstanceWithNewAcvData
+  updateInstanceWithNewAcvData,
+  calculateHistoricalTestResult
 ) {
   var BTSC = this;
   BTSC.appCodeVersion = BTSC.instance.contextVersion.getMainAppCodeVersion();
@@ -37,7 +38,11 @@ function BranchTestSelectorController(
 
   BTSC.selectCommit = function (commit) {
     BTSC.commit = commit;
-    BTSC.updateInstance();
+
+    if (!calculateHistoricalTestResult.isValidState(BTSC.commit.test)) {
+      BTSC.updateInstance();
+    }
+
     $scope.$emit('test-commit::selected', commit);
     $rootScope.$broadcast('close-popovers');
   };
@@ -58,6 +63,7 @@ function BranchTestSelectorController(
   };
 
   BTSC.hasTest = function(commit) {
-    return commit.test === 'passed' || commit.test === 'failed';
+    return calculateHistoricalTestResult.isPassed(commit.test) ||
+      calculateHistoricalTestResult.isFailed(commit.test);
   };
 }

client/services/calculateHistoricalTestResults.js

@@ -3,30 +3,44 @@
 require('app')
   .factory('calculateHistoricalTestResult', calculateHistoricalTestResult);
 
+var PASSED = 'passed';
+var FAILED = 'failed';
+var UNKNOWN = 'unknown';
+var jesusBirthday = '0001-01-01T00:00:00Z';
+
 function calculateHistoricalTestResult(
   keypather
 ) {
-  return function (tests) {
-    var TEST_STATES = {
-      PASSED: 'passed',
-      FAILED: 'failed',
-      UNKNOWN: 'unknown'
-    };
+  return {
+    isPassed: function(state) {
+      return state === PASSED;
+    },
+    isFailed: function(state) {
+      return state === FAILED;
+    },
+    isUnknown: function(state) {
+      return state === UNKNOWN;
+    },
+    isValidState: function(state) {
+      return state === PASSED || state === FAILED || state === UNKNOWN;
+    },
+    addResults: function (tests) {
+      tests.forEach(function(test) {
+        if (keypather.get(test, 'build.stop') !== jesusBirthday) {
+          if (keypather.get(test, 'build.failed') || keypather.get(test, 'application.exitCode') > 0) {
+            test.testState = FAILED;
+            return;
+          }
 
-    tests.forEach(function(test) {
-      if (test && keypather.get(test, 'build.stop.valueOf()') !== new Date(0).valueOf()) {
-        if (keypather.get(test, 'build.failed') || keypather.get(test, 'application.exitCode') > 0) {
-          test.testState = TEST_STATES.FAILED;
-        } else if (keypather.get(test,'application.exitCode') === 0 && keypather.get(test,'application.stop.valueOf()') !== new Date(0).valueOf()) {
-          test.testState =  TEST_STATES.PASSED;
+          if (keypather.get(test,'application.exitCode') === 0 && keypather.get(test,'application.stop') !== jesusBirthday) {
+            test.testState =  PASSED;
+            return;
+          }
         }
-      }
-
-      if (!test.testState) {
-        test.testState = TEST_STATES.UNKNOWN;
-      }
-    });
+        test.testState = UNKNOWN;
+      });
 
-    return tests;
+      return tests;
+    }
   };
 }

test/unit/directives/components/lists/branchTestListController.unit.js

@@ -18,6 +18,8 @@ describe('BranchTestListController'.bold.underline.blue, function () {
   var newCommit;
   var appCodeVersion;
 
+  var jesusBirthday = '0001-01-01T00:00:00Z';
+
   function initialize() {
     appCodeVersion = {
       attrs: {
@@ -74,7 +76,7 @@ describe('BranchTestListController'.bold.underline.blue, function () {
       {
         commitSha: '1',
         build: {
-          stop: new Date(0),
+          stop: jesusBirthday,
           failed: false
         }
       },
@@ -103,7 +105,7 @@ describe('BranchTestListController'.bold.underline.blue, function () {
         },
         application: {
           exitCode: 0,
-          stop: new Date(0)
+          stop: jesusBirthday
         }
       },
       {
@@ -178,13 +180,13 @@ describe('BranchTestListController'.bold.underline.blue, function () {
       $scope.$digest();
       // No test found
       expect(branch.commits.models[0].test).to.equal(null);
-      // Test found but build exit time of epoch
+      // Test found but build exit time of jesus birthday
       expect(branch.commits.models[1].test).to.equal('unknown');
       // Build failed is true
       expect(branch.commits.models[2].test).to.equal('failed');
       // // Build passed but exit code > 0
       expect(branch.commits.models[3].test).to.equal('failed');
-      // Application stop is epoch
+      // Application stop is jesus birthday
       expect(branch.commits.models[4].test).to.equal('unknown');
       expect(branch.commits.models[5].test).to.equal('passed');
     });

test/unit/services/calculateHistoricalTestResults.unit.js

@@ -0,0 +1,102 @@
+'use strict';
+
+describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
+  var calculateHistoricalTestResult;
+  var keypather;
+  var jesusBirthday = '0001-01-01T00:00:00Z';
+
+  function setup() {
+    angular.mock.module('app');
+    angular.mock.inject(function (
+      _keypather_,
+      _calculateHistoricalTestResult_
+    ) {
+      calculateHistoricalTestResult = _calculateHistoricalTestResult_;
+      keypather = _keypather_;
+    });
+  }
+
+  beforeEach(setup);
+
+  describe('calculateHistoricalTestResult', function () {
+    it('addResults build stop epoch', function () {
+      var tests = [{
+        build: {
+          stop: jesusBirthday,
+          failed: false
+        },
+        application: {
+          exitCode: 0,
+          stop: new Date()
+        }
+      }];
+      calculateHistoricalTestResult.addResults(tests);
+
+      expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.true;
+    });
+
+    it('addResults build failed', function () {
+      var tests = [{
+        build: {
+          stop: new Date(),
+          failed: true
+        },
+        application: {
+          exitCode: 0,
+          stop: new Date()
+        }
+      }];
+      calculateHistoricalTestResult.addResults(tests);
+
+      expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.true;
+    });
+
+    it('addResults exit code not 0', function () {
+      var tests = [{
+        build: {
+          stop: new Date(),
+          failed: false
+        },
+        application: {
+          exitCode: 10,
+          stop: new Date()
+        }
+      }];
+      calculateHistoricalTestResult.addResults(tests);
+
+      expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.true;
+    });
+
+    it('addResults application stop epoch', function () {
+      var tests = [{
+        build: {
+          stop: new Date(),
+          failed: false
+        },
+        application: {
+          exitCode: 0,
+          stop: jesusBirthday
+        }
+      }];
+      calculateHistoricalTestResult.addResults(tests);
+
+      expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.true;
+    });
+
+    it('addResults passed', function () {
+      var tests = [{
+        build: {
+          stop: new Date(),
+          failed: false
+        },
+        application: {
+          exitCode: 0,
+          stop: new Date()
+        }
+      }];
+      calculateHistoricalTestResult.addResults(tests);
+
+      expect(calculateHistoricalTestResult.isPassed(tests[0].testState)).to.be.true;
+    });
+  });
+});