Merge branch 'main' into issue-move-autocomplete-to-unified-search

elastic · Apr 21, 2022 · bec9740 · bec9740
2 parents 2c0b86e + 58acda6
commit bec9740
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...k/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts b/...k/plugins/security_solution/cypress/integration/detection_rules/custom_query_rule.spec.ts
@@ -26,12 +26,12 @@ import {
   SHOWING_RULES_TEXT,
 } from '../../screens/alerts_detection_rules';
 import {
-  ABOUT_CONTINUE_BTN,
-  ABOUT_EDIT_BUTTON,
+  // ABOUT_CONTINUE_BTN,
+  // ABOUT_EDIT_BUTTON,
   ACTIONS_THROTTLE_INPUT,
   CUSTOM_QUERY_INPUT,
-  DEFINE_CONTINUE_BUTTON,
-  DEFINE_EDIT_BUTTON,
+  // DEFINE_CONTINUE_BUTTON,
+  // DEFINE_EDIT_BUTTON,
   DEFINE_INDEX_INPUT,
   DEFAULT_RISK_SCORE_INPUT,
   RULE_DESCRIPTION_INPUT,
@@ -134,6 +134,7 @@ describe('Custom query rules', () => {
       fillAboutRuleAndContinue(this.rule);
       fillScheduleRuleAndContinue(this.rule);
 
+      /* Commenting this piece of code due to the following issue: https://github.com/elastic/kibana/issues/130767
       // expect define step to repopulate
       cy.get(DEFINE_EDIT_BUTTON).click();
       cy.get(CUSTOM_QUERY_INPUT).should('have.value', this.rule.customQuery);
@@ -144,7 +145,7 @@ describe('Custom query rules', () => {
       cy.get(ABOUT_EDIT_BUTTON).click();
       cy.get(RULE_NAME_INPUT).invoke('val').should('eql', this.rule.name);
       cy.get(ABOUT_CONTINUE_BTN).should('exist').click({ force: true });
-      cy.get(ABOUT_CONTINUE_BTN).should('not.exist');
+      cy.get(ABOUT_CONTINUE_BTN).should('not.exist');  */
 
       createAndEnableRule();
 

diff --git a/...lugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts b/...lugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts
@@ -177,11 +177,14 @@ describe('indicator match', () => {
           visitWithoutDateRange(RULE_CREATION);
           selectIndicatorMatchType();
         });
-        it('Has a default set of *:*', () => {
+
+        // Unskip once https://github.com/elastic/kibana/issues/130770 is fixed
+        it.skip('Has a default set of *:*', () => {
           getCustomQueryInput().should('have.text', '*:*');
         });
 
-        it('Shows invalidation text if text is removed', () => {
+        // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+        it.skip('Shows invalidation text if text is removed', () => {
           getCustomQueryInput().type('{selectall}{del}');
           getCustomQueryInvalidationText().should('exist');
         });
@@ -398,7 +401,8 @@ describe('indicator match', () => {
       });
 
       describe('Schedule', () => {
-        it('IM rule has 1h time interval and lookback by default', () => {
+        // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+        it.skip('IM rule has 1h time interval and lookback by default', () => {
           visitWithoutDateRange(RULE_CREATION);
           selectIndicatorMatchType();
           fillDefineIndicatorMatchRuleAndContinue(getNewThreatIndicatorRule());
@@ -417,7 +421,8 @@ describe('indicator match', () => {
         deleteAlertsAndRules();
       });
 
-      it('Creates and enables a new Indicator Match rule', () => {
+      // Unskip once https://github.com/elastic/kibana/issues/1307707 is fixed
+      it.skip('Creates and enables a new Indicator Match rule', () => {
         visitWithoutDateRange(RULE_CREATION);
         selectIndicatorMatchType();
         fillDefineIndicatorMatchRuleAndContinue(getNewThreatIndicatorRule());