Merge pull request #537 from notriddle/notriddle/wait-for-property

GuillaumeGomez · web-flow · commit ed5c6c594918 · 2023-09-18T21:03:57.000+02:00
Fix crash when wait-for-property fails
diff --git a/src/commands/wait.js b/src/commands/wait.js
@@ -752,7 +752,7 @@ function parseWaitForProperty(parser) {
     const varValue = varName + 'Value';
 
     const { checks, hasSpecialChecks } = makeExtendedChecks(
-        enabledChecks, false, 'nonMatchingAttrs', 'property', 'prop', varKey, varValue);
+        enabledChecks, false, 'nonMatchingProps', 'property', 'prop', varKey, varValue);
 
     let checker;
     if (!enabledChecks['ALL']) {
diff --git a/tests/test-js/api-output/parseWaitForProperty/basic-1.toml b/tests/test-js/api-output/parseWaitForProperty/basic-1.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/basic-2.toml b/tests/test-js/api-output/parseWaitForProperty/basic-2.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/basic-3.toml b/tests/test-js/api-output/parseWaitForProperty/basic-3.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/color-1.toml b/tests/test-js/api-output/parseWaitForProperty/color-1.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/extra-1.toml b/tests/test-js/api-output/parseWaitForProperty/extra-1.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/extra-2.toml b/tests/test-js/api-output/parseWaitForProperty/extra-2.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (!prop.includes(parseWaitForPropValue)) {
-                nonMatchingAttrs.push(\"property `\" + parseWaitForPropKey + \"` (`\" + prop + \"`) doesn't contain `\" + parseWaitForPropValue + \"` (for CONTAINS check)\");
+                nonMatchingProps.push(\"property `\" + parseWaitForPropKey + \"` (`\" + prop + \"`) doesn't contain `\" + parseWaitForPropValue + \"` (for CONTAINS check)\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/extra-3.toml b/tests/test-js/api-output/parseWaitForProperty/extra-3.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (!prop.includes(parseWaitForPropValue)) {
-                nonMatchingAttrs.push(\"property `\" + parseWaitForPropKey + \"` (`\" + prop + \"`) doesn't contain `\" + parseWaitForPropValue + \"` (for CONTAINS check)\");
+                nonMatchingProps.push(\"property `\" + parseWaitForPropKey + \"` (`\" + prop + \"`) doesn't contain `\" + parseWaitForPropValue + \"` (for CONTAINS check)\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/pseudo-1.toml b/tests/test-js/api-output/parseWaitForProperty/pseudo-1.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/xpath-2.toml b/tests/test-js/api-output/parseWaitForProperty/xpath-2.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/test-js/api-output/parseWaitForProperty/xpath-3.toml b/tests/test-js/api-output/parseWaitForProperty/xpath-3.toml
@@ -18,7 +18,7 @@ instructions = [
             }
             const prop = e[parseWaitForPropKey];
             if (prop !== parseWaitForPropValue) {
-                nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
+                nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
             }
         }
         return nonMatchingProps;
diff --git a/tests/ui-tests/wait-for-property-3.goml b/tests/ui-tests/wait-for-property-3.goml
@@ -0,0 +1,6 @@
+// This test ensures that the `wait-for-property` command is behaving like expected.
+go-to: "file://" + |CURRENT_DIR| + "/" + |DOC_PATH| + "/elements.html"
+set-timeout: 500
+// Try a property with a different type.
+// This should give a failure, not an internal error.
+wait-for-property: ("html", {"offsetLeft": "0"})
diff --git a/tests/ui-tests/wait-for-property-3.output b/tests/ui-tests/wait-for-property-3.output
@@ -0,0 +1,7 @@
+=> Starting doc-ui tests...
+
+wait-for-property-3... FAILED
+[ERROR] (line 6) Error: The following properties still don't match: [expected `0` for property `offsetLeft`, found `0`]: for command `wait-for-property: ("html", {"offsetLeft": "0"})`
+
+
+<= doc-ui tests done: 0 succeeded, 1 failed

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ instructions = [`
`18`	`18`	`}`
`19`	`19`	`const prop = e[parseWaitForPropKey];`
`20`	`20`	`if (prop !== parseWaitForPropValue) {`
`21`		- nonMatchingAttrs.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
	`21`	+ nonMatchingProps.push(\"expected `\" + parseWaitForPropValue + \"` for property `\" + parseWaitForPropKey + \"`, found `\" + prop + \"`\");
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`return nonMatchingProps;`