From a85a52ccc0280eb7a84305e3b267e747760fa980 Mon Sep 17 00:00:00 2001
From: Amardeepsingh Siglani <amardeep7194@gmail.com>
Date: Wed, 4 Oct 2023 21:46:22 -0700
Subject: [PATCH] fixed cypress tests

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
---
 cypress/integration/2_rules.spec.js    | 12 +++++++-----
 cypress/integration/3_alerts.spec.js   |  2 +-
 cypress/integration/4_findings.spec.js |  2 +-
 cypress/support/helpers.js             |  5 ++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cypress/integration/2_rules.spec.js b/cypress/integration/2_rules.spec.js
index fde8195c6..89544f177 100644
--- a/cypress/integration/2_rules.spec.js
+++ b/cypress/integration/2_rules.spec.js
@@ -11,7 +11,7 @@ const SAMPLE_RULE = {
   logType: 'windows',
   description: 'This is a rule used to test the rule creation workflow.',
   detectionLine: ['condition: Selection_1', 'Selection_1:', 'FieldKey|contains:', '- FieldValue'],
-  severity: 'critical',
+  severity: 'Critical',
   tags: ['attack.persistence', 'attack.privilege_escalation', 'attack.t1543.003'],
   references: 'https://nohello.com',
   falsePositive: 'unknown',
@@ -31,7 +31,7 @@ const YAML_RULE_LINES = [
   `- ${SAMPLE_RULE.tags[2]}`,
   `falsepositives:`,
   `- ${SAMPLE_RULE.falsePositive}`,
-  `level: ${SAMPLE_RULE.severity}`,
+  `level: ${SAMPLE_RULE.severity.toLowerCase()}`,
   `status: ${SAMPLE_RULE.status}`,
   `references:`,
   `- '${SAMPLE_RULE.references}'`,
@@ -67,7 +67,9 @@ const checkRulesFlyout = () => {
       cy.get('[data-test-subj="rule_flyout_rule_source"]').contains('Custom');
 
       // Validate severity
-      cy.get('[data-test-subj="rule_flyout_rule_severity"]').contains(SAMPLE_RULE.severity);
+      cy.get('[data-test-subj="rule_flyout_rule_severity"]').contains(
+        SAMPLE_RULE.severity.toLowerCase()
+      );
 
       // Validate tags
       SAMPLE_RULE.tags.forEach((tag) =>
@@ -159,7 +161,7 @@ const fillCreateForm = () => {
   getAuthorField().type(`${SAMPLE_RULE.author}`);
 
   // rule details
-  getLogTypeField().type(SAMPLE_RULE.logType);
+  getLogTypeField().selectComboboxItem(SAMPLE_RULE.logType);
   getRuleLevelField().selectComboboxItem(SAMPLE_RULE.severity);
 
   // rule detection
@@ -548,7 +550,7 @@ describe('Rules', () => {
       SAMPLE_RULE.logType = 'dns';
       YAML_RULE_LINES[2] = `product: ${SAMPLE_RULE.logType}`;
       YAML_RULE_LINES[3] = `title: ${SAMPLE_RULE.name}`;
-      getLogTypeField().type(SAMPLE_RULE.logType).type('{enter}');
+      getLogTypeField().selectComboboxItem(SAMPLE_RULE.logType);
       getLogTypeField().containsValue(SAMPLE_RULE.logType).contains(SAMPLE_RULE.logType);
 
       SAMPLE_RULE.description += ' edited';
diff --git a/cypress/integration/3_alerts.spec.js b/cypress/integration/3_alerts.spec.js
index 3476d78e0..81341897f 100644
--- a/cypress/integration/3_alerts.spec.js
+++ b/cypress/integration/3_alerts.spec.js
@@ -118,7 +118,7 @@ describe('Alerts', () => {
         expect($tr, `timestamp`).to.contain(date);
         expect($tr, `rule name`).to.contain('Cypress USB Rule');
         expect($tr, `detector name`).to.contain(testDetector.name);
-        expect($tr, `log type`).to.contain('windows');
+        expect($tr, `log type`).to.contain('System Activity: Windows');
       });
 
       // Close the flyout
diff --git a/cypress/integration/4_findings.spec.js b/cypress/integration/4_findings.spec.js
index 59114b36a..a2a2787bb 100644
--- a/cypress/integration/4_findings.spec.js
+++ b/cypress/integration/4_findings.spec.js
@@ -52,7 +52,7 @@ describe('Findings', () => {
     cy.contains('No items found').should('not.exist');
 
     // Check for expected findings
-    cy.contains('windows');
+    cy.contains('System Activity: Windows');
     cy.contains('High');
   });
 
diff --git a/cypress/support/helpers.js b/cypress/support/helpers.js
index c3b990892..33779103e 100644
--- a/cypress/support/helpers.js
+++ b/cypress/support/helpers.js
@@ -62,7 +62,10 @@ Cypress.Commands.add(
       items = [items];
     }
     Cypress.log({ message: `Select combobox items: ${items.join(' | ')}` });
-    items.map((item) => cy.wrap(subject).type(item).type('{enter}'));
+    items.map((item) => {
+      cy.wrap(subject).type(item);
+      cy.get(`[title="${item}"]`).click({ force: true });
+    });
   }
 );