Skip to content

Commit fb116a7

Browse files
SAN-6094 Code review comments
1 parent ea7e34a commit fb116a7

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ function BranchTestSelectorController(
3939
BTSC.selectCommit = function (commit) {
4040
BTSC.commit = commit;
4141

42-
if (!calculateHistoricalTestResult.isPassed(BTSC.commit.test) &&
43-
!calculateHistoricalTestResult.isFailed(BTSC.commit.test) &&
44-
!calculateHistoricalTestResult.isUnknown(BTSC.commit.test)) {
42+
if (!calculateHistoricalTestResult.isValidState(BTSC.commit.test)) {
4543
BTSC.updateInstance();
4644
}
4745

client/services/calculateHistoricalTestResults.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ function calculateHistoricalTestResult(
2121
isUnknown: function(state) {
2222
return state === UNKNOWN;
2323
},
24+
isValidState: function(state) {
25+
return state === PASSED || state === FAILED || state === UNKNOWN;
26+
},
2427
addResults: function (tests) {
2528
tests.forEach(function(test) {
2629
if (test && keypather.get(test, 'build.stop') !== jesusBirthday) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ describe('BranchTestListController'.bold.underline.blue, function () {
180180
$scope.$digest();
181181
// No test found
182182
expect(branch.commits.models[0].test).to.equal(null);
183-
// Test found but build exit time of jessus birthday
183+
// Test found but build exit time of jesus birthday
184184
expect(branch.commits.models[1].test).to.equal('unknown');
185185
// Build failed is true
186186
expect(branch.commits.models[2].test).to.equal('failed');
187187
// // Build passed but exit code > 0
188188
expect(branch.commits.models[3].test).to.equal('failed');
189-
// Application stop is jessus birthday
189+
// Application stop is jesus birthday
190190
expect(branch.commits.models[4].test).to.equal('unknown');
191191
expect(branch.commits.models[5].test).to.equal('passed');
192192
});

test/unit/services/calculateHistoricalTestResults.unit.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
3232
}];
3333
calculateHistoricalTestResult.addResults(tests);
3434

35-
expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.truthy;
35+
expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.true;
3636
});
3737

3838
it('addResults build failed', function () {
@@ -48,7 +48,7 @@ describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
4848
}];
4949
calculateHistoricalTestResult.addResults(tests);
5050

51-
expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.truthy;
51+
expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.true;
5252
});
5353

5454
it('addResults exit code not 0', function () {
@@ -64,7 +64,7 @@ describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
6464
}];
6565
calculateHistoricalTestResult.addResults(tests);
6666

67-
expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.truthy;
67+
expect(calculateHistoricalTestResult.isFailed(tests[0].testState)).to.be.true;
6868
});
6969

7070
it('addResults application stop epoch', function () {
@@ -80,7 +80,7 @@ describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
8080
}];
8181
calculateHistoricalTestResult.addResults(tests);
8282

83-
expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.truthy;
83+
expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.true;
8484
});
8585

8686
it('addResults passed', function () {
@@ -96,7 +96,7 @@ describe('calculateHistoricalTestResult'.bold.underline.blue, function () {
9696
}];
9797
calculateHistoricalTestResult.addResults(tests);
9898

99-
expect(calculateHistoricalTestResult.isUnknown(tests[0].testState)).to.be.truthy;
99+
expect(calculateHistoricalTestResult.isPassed(tests[0].testState)).to.be.true;
100100
});
101101
});
102102
});

0 commit comments

Comments
 (0)