Add wait-for-property-false command

GuillaumeGomez · Sep 27, 2024 · 82d021c · 82d021c
1 parent 8783863
commit 82d021c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/commands.js b/src/commands.js
@@ -110,6 +110,7 @@ const ORDERS = {
     'wait-for-position': commands.parseWaitForPosition,
     'wait-for-position-false': commands.parseWaitForPositionFalse,
     'wait-for-property': commands.parseWaitForProperty,
+    'wait-for-property-false': commands.parseWaitForPropertyFalse,
     'wait-for-size': commands.parseWaitForSize,
     'wait-for-text': commands.parseWaitForText,
     'wait-for-window-property': commands.parseWaitForWindowProperty,
@@ -158,6 +159,7 @@ const FATAL_ERROR_COMMANDS = [
     'wait-for-count',
     'wait-for-count-false',
     'wait-for-property',
+    'wait-for-property-false',
     'wait-for-text',
     'write',
     'write-into',

diff --git a/src/commands/all.js b/src/commands/all.js
@@ -118,6 +118,7 @@ module.exports = {
     'parseWaitForPosition': wait.parseWaitForPosition,
     'parseWaitForPositionFalse': wait.parseWaitForPositionFalse,
     'parseWaitForProperty': wait.parseWaitForProperty,
+    'parseWaitForPropertyFalse': wait.parseWaitForPropertyFalse,
     'parseWaitForSize': wait.parseWaitForSize,
     'parseWaitForText': wait.parseWaitForText,
     'parseWaitForWindowProperty': wait.parseWaitForWindowProperty,

diff --git a/src/commands/wait.js b/src/commands/wait.js
@@ -788,6 +788,17 @@ ${indentString(incr, 1)}
 //
 // * ("selector", {"property name": "expected property value"})
 function parseWaitForProperty(parser) {
+    return parseWaitForPropertyInner(parser, false);
+}
+
+// Possible inputs:
+//
+// * ("selector", {"property name": "expected property value"})
+function parseWaitForPropertyFalse(parser) {
+    return parseWaitForPropertyInner(parser, true);
+}
+
+function parseWaitForPropertyInner(parser, waitFalse) {
     const identifiers = ['ALL', 'CONTAINS', 'ENDS_WITH', 'NEAR', 'STARTS_WITH'];
     const ret = validator(parser, {
         kind: 'tuple',
@@ -895,10 +906,17 @@ the check will be performed on the element itself`);
         warnings.push(`Special checks (${k.join(', ')}) will be ignored for \`null\``);
     }
 
+    let comp = '===';
+    let errorMessage = '"The following properties still don\'t match: [" + props + "]"';
+    if (waitFalse) {
+        comp = '!==';
+        errorMessage = '"All properties still match"';
+    }
+
     const [init, looper] = waitForElement(selector, varName, {checkAll: enabledChecks.has('ALL')});
     const incr = incrWait(`\
 const props = nonMatchingProps.join(", ");
-throw new Error("The following properties still don't match: [" + props + "]");`);
+throw new Error(${errorMessage});`);
 
     const instructions = `\
 async function checkPropForElem(elem) {
@@ -940,7 +958,7 @@ ${init}
 while (true) {
 ${indentString(looper, 1)}
 ${indentString(checker, 1)}
-    if (nonMatchingProps.length === 0) {
+    if (nonMatchingProps.length ${comp} 0) {
         break;
     }
 ${indentString(incr, 1)}
@@ -1283,6 +1301,7 @@ module.exports = {
     'parseWaitForPosition': parseWaitForPosition,
     'parseWaitForPositionFalse': parseWaitForPositionFalse,
     'parseWaitForProperty': parseWaitForProperty,
+    'parseWaitForPropertyFalse': parseWaitForPropertyFalse,
     'parseWaitForText': parseWaitForText,
     'parseWaitForWindowProperty': parseWaitForWindowProperty,
     'parseWaitForWindowPropertyFalse': parseWaitForWindowPropertyFalse,