Merge pull request #403 from Cognifide/feature/conditional-test-accep…

…tance Feature/conditional test acceptance
wttech · Oct 19, 2018 · 271dc56 · 271dc56
2 parents 36b8e04 + bdf70e9
commit 271dc56
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to AET will be documented in this file.
 
 ## Unreleased
 **List of changes that are finished but not yet released in any final version.**
+- [PR-403](https://github.com/Cognifide/aet/pull/403) Conditionally passed tests can be accepted ([#400](https://github.com/Cognifide/aet/issues/400))
 - [PR-387](https://github.com/Cognifide/aet/pull/387) Set max allowed page screenshot height to 35k pixels.
 
 ## Version 3.0.1

diff --git a/...-api/src/main/java/com/cognifide/aet/communication/api/metadata/ComparatorStepResult.java b/...-api/src/main/java/com/cognifide/aet/communication/api/metadata/ComparatorStepResult.java
@@ -23,6 +23,8 @@ public class ComparatorStepResult extends StepResult {
 
   private final boolean rebaseable;
 
+  private final boolean acceptable;
+
   public ComparatorStepResult(String artifactId, Status status) {
     this(artifactId, status, false);
   }
@@ -31,6 +33,8 @@ public ComparatorStepResult(String artifactId, Status status, Boolean rebaseable
     super(artifactId);
     this.status = status;
     this.rebaseable = rebaseable;
+    this.acceptable = rebaseable &&
+        (Status.FAILED.equals(status) || Status.CONDITIONALLY_PASSED.equals(status));
   }
 
   @Override
@@ -46,6 +50,10 @@ public boolean isRebaseable() {
     return rebaseable;
   }
 
+  public boolean isAcceptable() {
+    return acceptable;
+  }
+
   public enum Status {
     PASSED,
     FAILED,

diff --git a/report/src/main/webapp/app/layout/main/url/caseFactory.service.js b/report/src/main/webapp/app/layout/main/url/caseFactory.service.js
@@ -108,8 +108,7 @@ define(['angularAMD', 'artifactsService', 'suiteInfoService'],
           var stepResult = comparator.stepResult;
           caseModel.showAcceptButton =
               stepResult &&
-              stepResult.rebaseable &&
-              stepResult.status === 'FAILED';
+              stepResult.acceptable;
           if (suiteInfoService.getInfo().patternCorrelationId) {
             caseModel.usesCrossSuitePattern = true;
           }

diff --git a/report/src/main/webapp/app/services/metadata.service.js b/report/src/main/webapp/app/services/metadata.service.js
@@ -215,6 +215,7 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
             _.forEach(decoratedObject.comparators, function (comparator) {
               if (hasStepComparatorChangesToAccept(comparator)) {
                 comparator.stepResult.previousStatus = comparator.stepResult.status;
+                comparator.stepResult.wasAcceptable = comparator.stepResult.acceptable;
                 comparator.stepResult.status = 'REBASED';
                 acceptedPatterns++;
               }
@@ -245,8 +246,7 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
 
         function hasStepComparatorChangesToAccept(comparator) {
           return comparator && comparator.stepResult &&
-              comparator.stepResult.rebaseable &&
-              comparator.stepResult.status === 'FAILED';
+              comparator.stepResult.acceptable;
         }
 
         function hasStepComparatorAcceptedChanges(comparator) {
@@ -324,10 +324,12 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
                 passed();
                 break;
               case 'CONDITIONALLY_PASSED':
+                if (stepResult.rebaseable) {
+                  updatePatternsToAccept(1);
+                }
                 conditionallyPassed();
                 break;
               case 'FAILED':
-                // if `rebaseable` comparator, increment acceptable patterns counter
                 if (stepResult.rebaseable) {
                   updatePatternsToAccept(1);
                 }

diff --git a/report/src/main/webapp/app/services/patterns.service.js b/report/src/main/webapp/app/services/patterns.service.js
@@ -138,8 +138,7 @@ define(['angularAMD', 'metadataService', 'metadataAccessService'],
 
           if (isCollectorWithPattern(step) && isStepComparatorRebaseable(
                   comparator)) {
-            result = comparator.stepResult.previousStatus === 'FAILED';
-            if (result) {
+            if (comparator.stepResult.wasAcceptable) {
               step.revertPatternStatistics();
               step.pattern = step.oldPattern;
               delete step.oldPattern;