Merge pull request #39 from TestHaters/features/support-alternative-s…

…electors Support Alternative Selector
TestHaters · Mar 3, 2024 · a204105 · a204105
2 parents 388a796 + 8fbb486
commit a204105
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/dnd-ui/webview-ui/src/compilers/cypress/CheckboxNodeCompiler.ts b/dnd-ui/webview-ui/src/compilers/cypress/CheckboxNodeCompiler.ts
@@ -8,8 +8,13 @@ export class CheckboxNodeCompiler {
   }
 
   static compile(nodeData: any): string {
+    let selectors = [nodeData.inPorts.field];
+    if (typeof nodeData.inPorts.alternative_selectors === 'object') {
+      selectors = selectors.concat(nodeData.inPorts.alternative_selectors);
+    }
+
     return `
-    cy.get('${nodeData.inPorts.field}').click()
+      cy.get('${selectors.join(', ')}').first().click()
     `;
   }
 }
diff --git a/dnd-ui/webview-ui/src/compilers/cypress/ContainsNodeCompiler.ts b/dnd-ui/webview-ui/src/compilers/cypress/ContainsNodeCompiler.ts
@@ -8,8 +8,13 @@ export class ContainsNodeCompiler {
   }
 
   static compile(nodeData: any): string {
+    let selectors = [nodeData.inPorts.field];
+    if (typeof nodeData.inPorts.alternative_selectors === 'object') {
+      selectors = selectors.concat(nodeData.inPorts.alternative_selectors);
+    }
+
     return `
-      cy.get('${nodeData.inPorts.field}').contains("${nodeData.inPorts.value}")
+      cy.get('${selectors.join(', ')}').first().contains("${nodeData.inPorts.value}")
     `;
   }
 }
diff --git a/dnd-ui/webview-ui/src/compilers/cypress/TextInputNodeCompiler.ts b/dnd-ui/webview-ui/src/compilers/cypress/TextInputNodeCompiler.ts
@@ -8,8 +8,13 @@ export class TextInputNodeCompiler {
   }
 
   static compile(nodeData: any): string {
+    let selectors = [nodeData.inPorts.field];
+    if (typeof nodeData.inPorts.alternative_selectors === 'object') {
+      selectors = selectors.concat(nodeData.inPorts.alternative_selectors);
+    }
+
     return `
-    cy.get('${nodeData.inPorts.field}').type('${nodeData.inPorts.value}')
+    cy.get('${selectors.join(', ')}').first().type('${nodeData.inPorts.value}')
     `;
   }
 }
diff --git a/dnd-ui/webview-ui/src/compilers/cypress/buttonNodeCompiler.ts b/dnd-ui/webview-ui/src/compilers/cypress/buttonNodeCompiler.ts
@@ -10,8 +10,14 @@ export class ButtonNodeCompiler {
   static compile(nodeData: any): string {
     // cy.contains("${nodeData.inPorts.field}").click()
     // cy.wait(500)
+
+    let selectors = [nodeData.inPorts.field];
+    if (typeof nodeData.inPorts.alternative_selectors === 'object') {
+      selectors = selectors.concat(nodeData.inPorts.alternative_selectors);
+    }
+
     return `
-      cy.get('${nodeData.inPorts.field}').click()
+      cy.get('${selectors.join(', ')}').first().click()
     `;
   }
 }