From ee2a5704ca37007b626b43b2e9a4d63b6b52e2ac Mon Sep 17 00:00:00 2001
From: Gloria Hornero <snootchie.boochies@gmail.com>
Date: Wed, 25 Nov 2020 22:43:19 +0100
Subject: [PATCH] fixes CI issue

---
 .../alerts_detection_exceptions.spec.ts       |   9 ---------
 .../cypress/objects/exception.ts              |   4 ++--
 .../cypress/screens/exceptions.ts             |   2 +-
 .../cypress/tasks/rule_details.ts             |   5 +++++
 .../auditbeat_for_exceptions/data.json.gz     | Bin 1105 -> 1112 bytes
 .../auditbeat_for_exceptions2/data.json.gz    | Bin 1107 -> 1113 bytes
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
index a43ba1581773d..b1d7163ac70e0 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
@@ -52,7 +52,6 @@ describe('Exceptions', () => {
     waitForAlertsToPopulate();
     refreshPage();
 
-    cy.scrollTo('bottom');
     cy.get(SERVER_SIDE_EVENT_COUNT)
       .invoke('text')
       .then((numberOfInitialAlertsText) => {
@@ -78,7 +77,6 @@ describe('Exceptions', () => {
       goToAlertsTab();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfAlertsAfterCreatingExceptionText) => {
@@ -88,7 +86,6 @@ describe('Exceptions', () => {
       goToClosedAlerts();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfClosedAlertsAfterCreatingExceptionText) => {
@@ -102,7 +99,6 @@ describe('Exceptions', () => {
       waitForTheRuleToBeExecuted();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfOpenedAlertsAfterCreatingExceptionText) => {
@@ -117,7 +113,6 @@ describe('Exceptions', () => {
       waitForAlertsToPopulate();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfAlertsAfterRemovingExceptionsText) => {
@@ -135,7 +130,6 @@ describe('Exceptions', () => {
       addsException(exception);
       esArchiverLoad('auditbeat_for_exceptions2');
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfAlertsAfterCreatingExceptionText) => {
@@ -145,7 +139,6 @@ describe('Exceptions', () => {
       goToClosedAlerts();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfClosedAlertsAfterCreatingExceptionText) => {
@@ -159,7 +152,6 @@ describe('Exceptions', () => {
       waitForTheRuleToBeExecuted();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfOpenedAlertsAfterCreatingExceptionText) => {
@@ -173,7 +165,6 @@ describe('Exceptions', () => {
       waitForAlertsToPopulate();
       refreshPage();
 
-      cy.scrollTo('bottom');
       cy.get(SERVER_SIDE_EVENT_COUNT)
         .invoke('text')
         .then((numberOfAlertsAfterRemovingExceptionsText) => {
diff --git a/x-pack/plugins/security_solution/cypress/objects/exception.ts b/x-pack/plugins/security_solution/cypress/objects/exception.ts
index 2182a5b6fa6d2..775a83dee2543 100644
--- a/x-pack/plugins/security_solution/cypress/objects/exception.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/exception.ts
@@ -12,6 +12,6 @@ export interface Exception {
 
 export const exception: Exception = {
   field: 'host.name',
-  operator: 'is one of',
-  values: ['siem-kibana', 'suricata-iowa', 'siem-es', 'jessie', 'siem'],
+  operator: 'is',
+  values: ['suricata-iowa'],
 };
diff --git a/x-pack/plugins/security_solution/cypress/screens/exceptions.ts b/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
index fc871237c3f4f..4e263903a34a6 100644
--- a/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/exceptions.ts
@@ -21,4 +21,4 @@ export const LOADING_SPINNER = '[data-test-subj="loading-spinner"]';
 export const OPERATOR_INPUT = '[data-test-subj="operatorAutocompleteComboBox"]';
 
 export const VALUES_INPUT =
-  '[data-test-subj="valuesAutocompleteMatchAny"] [data-test-subj="comboBoxInput"]';
+  '[data-test-subj="valuesAutocompleteMatch"] [data-test-subj="comboBoxInput"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
index 0b418af541dea..9dd23a1dfa71f 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
@@ -24,8 +24,13 @@ import {
 } from '../screens/rule_details';
 
 export const activatesRule = () => {
+  cy.server();
+  cy.route('PATCH', '**/api/detection_engine/rules/_bulk_update').as('bulk_update');
   cy.get(RULE_SWITCH).should('be.visible');
   cy.get(RULE_SWITCH).click();
+  cy.wait('@bulk_update').then((response) => {
+    cy.wrap(response.status).should('eql', 200);
+  });
 };
 
 export const deactivatesRule = () => {
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/data.json.gz b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions/data.json.gz
index 6c0d4b234fe4b54652206010741d5ac63cc8a7d3..4139fd9d28f46afe02883236ac50d20fdd697ce5 100644
GIT binary patch
literal 1112
zcmV-e1gHBSiwFqq?!aFF17u-zVJ>QOZ*Bm+R!wi)I1s((R|G!o0+m9_`ZTb>B1jL#
zqUfPr6v$#B(B#PBS|SCCvf~!{?<FPMAteRdQ+=>4&IgBY-aP92&F$?<pITULZdXjw
z)jPXzAa!q7zMBX0$eFd4@c2G$j`yG1ul(T%pY?q?x?2yy;MqFCGlf=jDY_sJQHX*F
z;UYwNxJCgop9o(<I@v4wx`|o&Q}YHoO`6tbicn-iiU8p+2yJ4#L1~C^_IQpr{$vM2
zI|<AZv`^50B6T^|oZ_5DMG8TZR9O%g1O<7HvH)c{GX{zf%dQDc{FCgoAkBbA$Ds-K
zd`kpzUB<*L%?O2<1{9}x5GPR<kab)HSr#J}L%}NIMO`2!J>z-{M7zcVsLnuU?E`45
zv+3n}R9f@dS+^$*omq;JTit*iMj?)Dsw>=su_bg5+QwjaRVtf#oyT#$u(9l!zb`ou
zUXv}axjvQOq!`ZCcL6mO8su@{!zD~dh1X~Y#ym5d;uPT|PNM{;MVvUn#%-w?SNn^z
zPebSv7qe|HxC<QEIv7zbh?X<7O8y5_FBb|m=`^Q-t>ew`181PD_l~yn9x}siE{GmG
zz0k;Lp^<43MoAo=e}B4}Iht(`wDY%hScgNr#5y?4NJr?o{*?fIlxkmAwLH3YQKDfd
z)yefSyr?QpT{lKF=|B&?mG&f_u~!$Iiahsl0l`Lfz=f|4Nth(bqnl;VN8j-nE>|S$
z>ycKcPMd~0Hp7wu!MAsq!89P?p+sfV)}ZYc6{$OL@>hlewOQAyhgqhbl6~u^8tI4J
z5-&5Mq}20jtb|Q^rp#z)L+xG-anE^LrXH856q=anQT!XQg`z!K>=idXCIOen1!07=
z$_qrQHBL#C6cM6Df{j#GG)}h_RI4e+|8a+HS-320kfY5eMhI^Vl{Uj8PF^SRUtbEQ
zdE;nfA`#h`F!Xlh|DI9$Gc-WQ;1b4oN9Ck$((rni1qNGAgm2x05@6Y|N`}i4BfJi*
zcr0q*-`ig3-nX?i(Unxqpur1vcgW2>9N+%-V2iwc;9@6#ca&_#qx0-8OI3<I_B2f|
z>}@bo0B?5tkAI16_L+Z;zGMgdQN4e<zw17I*xh~j!<%!i;3_Dx*IU_}kzEwI$h}Mz
z5#3qoR@#H>D)_uT#Pi`WB2A&|rt`7uri8icJ9W3^;;udECn?rGs#ohy%3Temxh3ho
z?DlXh8G*)}XOUi1nTsDB{mO%=_<~a-Et_O*1Ri<%1<ycxO}3*{O)CnsB~6$V<Y75<
zCySC9Djlf9aB=<eOUdrcCoc!r7M{g<9yEP({8cYQ=Yo9l*cZB~D4cIJf7Nz$H}n9#
zn=JQ>%gfGOXrmhD4cEKBQRq|jDlVn1r6i20k@qX~T$xW^#c7<bQ%Dh-2A->N7GG|r
e|6W1qyD4>k_R6}se81eh-24D#-rx9%3;+P03Laws

literal 1105
zcmV-X1g`rZiwFoUvA$mb17u-zVJ>QOZ*Bm+R!xuFHW0n<uUPoh0+E)K^=Y6$vDh4f
zBFG^r0&GzTG&%CJmPmo5>~(_u?<FPMD@s~4y~GFG;(T!U=FOwN-`w7=%&CRd=61y-
zUA=P)2U2%#<-2{bkDNJc36Jm7=6L_9{mLJX@Y&p#gS+z(44$16JX2^5mqG`5h(Z)Z
z2p1vB!!-(!{Y3Z@qGhM(>n3*Pcf%XdhBU3q6rsq56am6t5Zc6egVGS;?C~6L{mBl5
z86~hw&^|!}iqz#$bBc2s6)6NsQe{D05ESG&$^w+-%o->{EW0MO@lR44L7E;7-6>9q
zApw_1GIknLvos?VVj57K=0Ti9SwPlt5oB46SPTWLh!=GMnRJYsEf6y{9zbaenzQ$?
zt<I*G>tSilXQ$ns3~0L)qj7aTdKiT`a;dI>_r{jcJs1~*$E#Ag%<DXk^M#FN$NYWC
zf$*AadCkqK{3b<zu1*KkR%o%ufe)9kJr!Q7M=<7@-4v$?Cvh4jI4$C26l~p=+i~@H
z8ST^%`ozU-qYLr^2d)xE6bqu|46Ty?05!{{LQS;cG|(KHH^UE{fpXqE+RnSkEWf!R
zX6W@oE2D*0rbQSfad`gy;dbU|wmneoZ#&{04)GH2;4q^dq38Nn0?bjWeOcA=IIhd~
z33gJQ#y*xARmJJpjoEf;FnxEWJBerP)CH#^&pli~ut6bk;VVQECQ0%*&a&r&?{JJU
zS0wA|fmkPPY(qyj%aR_!w|AJq)Fa@bL}k;~VB8iJsWpu9SC#^`T{o(OS*D$mUF)YB
z=!eE7UZz4xY39{98JqM>+0ihT+MVj-p7XR!JuXox46)Or_%~n+MgI?JgtW>FM5;AT
zNt6^3qD6wOSXMMnw-r>YDaZdB58JYIIoKdan@x-m-dHMa`bV6+PU7Fb6ioBR(Z)t1
zvaw<4?a2Q;qx5H}hmOG|jB!onq;Asix}OCGTTX;;-GdU~*sx0a3lk%}4xD%_s^Fj7
zPMFTOwKXx7R86nK3-<Al+q*cv{pG<GdHcY{PX0PlvKf!gv%4%+De~CUG@Wqw!9W4L
z+3i36A-36P{x$lN9q>o>{^|ZsfBLYy`|z7L=Ul;6P-JJeva=(*D00#GI#opIv(l}M
z2iH~bd3%WG!(m05g4Wad*y$-@?mDgRwp`q`C-Wr5+DG+j-ATEtp|tlT-Isa~$C43f
z?0FXHMU}n!VWeMq5EWl=YNch9tgXN!Pru+9XlKZFkg91#VYZ|RlY%@f`|e~>GDAg!
zI`kLUPrsDh&V2HEaBbmPoaaH)x5uCLI&?0`Cy#rjn~K8uM)Ox)M|XV>(7VZUx469Q
z%!RS4Vc&AS`x}KmMX%ygx>`!Ym>PJ$LeG``<W-!;={kiJp=sc`n$hCR&Gg?ZD4m{C
X=SQ!so6Gmh&CAWdBSXxTjSK()4HP#*

diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/data.json.gz b/x-pack/test/security_solution_cypress/es_archives/auditbeat_for_exceptions2/data.json.gz
index ad234f460965e471682c638a2cc935e378601f10..0fdcb7d783ea67d71a6286e74d7392c593cd6f41 100644
GIT binary patch
delta 1055
zcmV+)1mOGA2-ye+ABzYGh3>$S2P1#&fMO{6&<q7K3<gaeIh-X@ASpX;k^eqYzJ!z%
ztWWiWZSh=q_?_>3)c2d)+l4uHuvpzLn52t$ZedTF-mQGM5B8BWXI;bNhrB)9f9}5W
z_Xqf5?$>_|?#@Fncy><kOrbMe3LTX(icypxT*au2mncH^li*8;mc62{o7jJq-wkg;
z8`5?zQ-Ts3Qbh<qAhb&H3gt1v#p5~N`jagP<0Y_5&^<v5iZts}%{eY<Qsoe3SzSbF
zMNm|hsEANeGHaj+vErK0#y?4I1Zf8}G>10Y@eL8gcR3|yc|j<oG@>{!qcls3h%D18
zDvA`b6e?DeAnF1!=@~a0AjW?;?m=k_nX?a|EzYKw>rrXLCuiLp4QRWRBEPx;JB(tS
zxKvlT2V+O*4vdSz{;E_i^Ri6Sa%N-Mvv6OsC%hpW-f(kVf0JT3SFa;#E40YtD1=Mc
zj*6hs9*kvSH^n)^S(+yq&Z{)@g00(JGp_a*Z=aUXCoU%2TyPgSa&><&qF9v7XXupt
z7pR#p6dIxpr;)4U&G0>Epq%%XcGDg*%WW=*Idyubk;zOW^D0iVG(P|Sa5GCZ*&e74
zxAj<uV?4(?*iT4D=(+xd0CSLPx2_v`@av+)z*efG?_+sU*PQxpj2NQ9484`^B!RJ4
z7o4iH3~&L#PU?WGP#qPrILop}Kg*7vd{4*lxguHLoM?5_lRg40e?&jzmw1^8C8e2G
z<0Nd<Gi67^SZeobh<h&cbslhuN@0kd9>u=_n<+Yw#a?mSV-j(Bm=Q+E>#{<mUgDf2
zS(PAKW!Oq(P1Af+L%kSt{BM8Q=7r0_1|?dpQiSlzQfW0j;_P)2{|TjFoHtEYHWHDQ
z4MT57{_h!OI70(;e+({RjB6@Kb(5Ai!z?h^a3VtM4wL}LhDA19mKfn><iulE1OM9e
z!t|l7Ylx|(Y6lITvHL@A@8R_Jm-nv7+xJ{-<*%NSO?Y&k-Fd0XQNW(I?S;DyP87ha
z?e5c`VpDwKUz3Mok3XpoPxp8F^T+Mo$KQfE=L)WZB73uuf4v>qS&>Wp%Ty7e&q}v2
z0bEzX=iNS?4u=(K3R;inW2?u6x$CvM+i-E$9nF&z%MjJ8bt~nzfwjFQ>29rea9A?}
ztv$~yy{NJmKY038MoIO6b1N;YY-t4^1^NZgKzl<rC#f1&6c=-vFe)g(a_CNxWD`_0
zsQqwp{q#%8b?wYYF9+8ap2c|@G=6jZSuaE9f<p4R7rL=1oNu&n)pc|`^Z>mZE%&p_
z^Uhots~YwVH@Lr198&ZuE^AlInlPqLykDT_+J4G9&C`6DLypim@LY|z_;NG;_X<j{
Z$JF`JE9>U+{c`hi^B=620&$59007$H1p@#8

delta 1049
zcmV+!1m^qM2-64$ABzYGr?I|~2P1#!fMO{6&<q7K3<gaeIh-X@ASpX(k^f#&zJ!z%
ztb3^+Y>Vf@!|#0OqrP2TUoXsa2aDD9f=Rk~=N9&)>D|gV`(PhAbJjIHywBUi?WgVw
zzdOKZbG!ayaCaVp!IN`>Ckmb6Qs}6RQH-Jl;VMRDyhIVQp9G&nwCojq-Nb*c{BC#)
z+K{$$nG%%PkSap>9-&o=S16AWE*?(t)}L%a7%zccg6<JoP^4KOYtC^=lPZTO%jzOZ
zD}ti3L`8&(l34>qh!vNFHvUm+BS<@-p?k$CF(l&hKzyfTYL*v-LP{fw^D;`aq=?8e
zt)ikx5lf+BH3_25Ad{YPvjKl%eB&OJwxBut0NdhZdbu2yHhgm0&9eb*mr~?cH=u`6
zj1!mY0{CF;2;G5kG1y;~%4J@bX<E)~EPEF2OZJ2}WWyV7p4VTc7|zw}h}sG*_BaaR
z61JxzXtf7pS=dc+j&PRdNrv+(&AediHs6km$BVa9OXwpPla0>E3mkvBN*GZrO6D_k
zO8yJf%$Euc(T3AVb7<cT-*X1ad2eYq?IN@M=7N}GuV-4B%(ODE;v`Gs)9(+rvqY2a
zf$DHuk9Ro6bG(E7gm#3U>R$*j2dQ@Jx{(LJF54&AO7-mfSZ35Ur@kAr?bKj~?n-x(
zz}TxZPE}b3xPV|sg}@k9s1RA4W!ZzDWyg=c$7A?hk*sfy#Cq0~I|3|!NI&G4c%BL+
zrI}XaWNg$kWk<tUYWHf0dn)sF9&m|DVThd`#lHfZDf)j%Bjj~iAyO}KPLixj5Unz7
z#j>VpzNw*Jj5+?dKWy{T<zRyntyU>Qcx9=y8Xj@>I*I>;QZUY&CMz3>$jXMHw<G`a
zj53^|0XhcfFvc~Nqq<3d%bQ^q7;HEZp>+pJfMdfV8!k+Y@G^4ZF{^@qZF*t)(AG7?
z)KayB3eVX6A-8vNdi~3tEAsk|i>>_CQ?dz<PP02NRXGaS)3&{E_rZ|@c(vVq{8Ma-
z&-_brU+nQm_5ShpMt}OSz4`E4Fy~ysMNnjKHnO)PJ1cUDf1N6SBJ@e=7AAn}BKW-9
zr_<rEB27W-@qBFcm@qfJRyP|iZn|glD8({F^<v#hxou!=?@78_>m3}{j6iG8GfOY3
z?9~sRew9&D-Q(O!%PL!1fk%OU!4uHlkj+u5#udfIoF<G43a}iyQzY306%A@XTwFi>
zQgS=<(d)sbg(q=ro(7HI9)H&B(5ax1JnoflEDEO^EnIaS-3~oK??%i0?DD)b7sjfF
zeaj8*Zxn|Vy@<=&)v_jxsUz<f=&81!vQG0fU*?b_G!8sf<1M~ijsLxZ((5sGe)P(^
TI)A@hy<B|<Hq<acjSK();@=Ak