adjust test helper

tomsonpl · tomsonpl · commit 62474eea8296 · 2023-07-31T10:37:48.000+02:00
diff --git a/x-pack/plugins/osquery/cypress/support/e2e.ts b/x-pack/plugins/osquery/cypress/support/e2e.ts
@@ -33,6 +33,7 @@ declare global {
   namespace Cypress {
     interface Chainable {
       getBySel(...args: Parameters<Cypress.Chainable['get']>): Chainable<JQuery<HTMLElement>>;
+      findBySel(...args: Parameters<Cypress.Chainable['get']>): Chainable<JQuery<HTMLElement>>;
       getBySelContains(
         ...args: Parameters<Cypress.Chainable['get']>
       ): Chainable<JQuery<HTMLElement>>;
@@ -50,6 +51,10 @@ Cypress.Commands.add('getBySelContains', (selector, ...args) =>
   cy.get(`[data-test-subj^="${selector}"]`, ...args)
 );
 
+Cypress.Commands.add('findBySel', (selector, ...args) =>
+  cy.find(`[data-test-subj="${selector}"]`, ...args)
+);
+
 Cypress.Commands.add(
   'clickOutside',
   () => cy.get('body').click(0, 0) // 0,0 here are the x and y coordinates
diff --git a/x-pack/plugins/osquery/cypress/tasks/live_query.ts b/x-pack/plugins/osquery/cypress/tasks/live_query.ts
@@ -49,12 +49,7 @@ export const checkResults = () => {
 export const typeInECSFieldInput = (text: string, index = 0) =>
   cy.getBySel('ECS-field-input').eq(index).type(text);
 export const typeInOsqueryFieldInput = (text: string, index = 0) =>
-  cy
-    .react('OsqueryColumnFieldComponent')
-    .eq(index)
-    .within(() => {
-      cy.getBySel('comboBoxInput').type(text);
-    });
+  cy.react('OsqueryColumnFieldComponent').eq(index).findBySel('comboBoxInput').type(text);
 
 export const getOsqueryFieldTypes = (value: 'Osquery value' | 'Static value', index = 0) => {
   cy.getBySel(`osquery-result-type-select-${index}`).click();
