Merge pull request #55 from aem-design/develop

use docker compare only when local compare does not exist.
aem-design · Aug 16, 2021 · 8892ef7 · 8892ef7
2 parents f9cece1 + c182f49
commit 8892ef7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/aemdesign-testing/src/test/groovy/support/FunctionalSpec.groovy b/aemdesign-testing/src/test/groovy/support/FunctionalSpec.groovy
@@ -521,7 +521,7 @@ abstract class FunctionalSpec extends GebReportingSpec {
         if (System.properties.getProperty("HAS_COMPARE", "false") == "false" && System.properties.getProperty("HAS_DOCKER", "false") == "false") {
             printDebug("NO COMPARE", ["SKIPPING", System.properties.getProperty("HAS_COMPARE", false), System.properties.getProperty("HAS_DOCKER", false)])
             return VERY_DIFFERENT
-        } else if ( System.properties.getProperty("HAS_DOCKER", "false") == "true" ) {
+        } else if ( System.properties.getProperty("HAS_DOCKER", "false") == "true" && System.properties.getProperty("HAS_COMPARE", "false") == "false" ) {
             compareCmd = "compare.sh ${screenshotFilename} ${referenceFilename} ${differenceFilename}"
 //            printDebug("RUNNING COMPARE IN DOCKER", [compareCmd])
             processErrorText = getRunDockerCommandOutput(compareCmd)