Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Security Solution][Detections] Implements indicator match rule cypress test #84323

Merged
merged 11 commits into from
Dec 3, 2020
Merged

[Security Solution][Detections] Implements indicator match rule cypress test #84323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a8ae16
implemnts indicator match rule cypress test
MadameSheema Nov 23, 2020
a93d599
Merge branch 'master' into indicator-match
kibanamachine Nov 30, 2020
4040d4e
Merge branch 'master' into indicator-match
MadameSheema Nov 30, 2020
19a210d
fixes merge issue
MadameSheema Nov 30, 2020
ebe9554
fixes type check issues
MadameSheema Nov 30, 2020
a0e14b9
fixes mapping
MadameSheema Dec 2, 2020
5b8f92e
simplifies data
MadameSheema Dec 2, 2020
3885bf1
Merge branch 'master' into indicator-match
kibanamachine Dec 2, 2020
afbfcd3
fixes excpetions flakiness
MadameSheema Dec 2, 2020
4cb4fa9
Merge branch 'indicator-match' of github.com:MadameSheema/kibana into…
MadameSheema Dec 2, 2020
0d09335
fixes alerts test
MadameSheema Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
import {
NUMBER_OF_ALERTS,
ALERTS,
ALERTS_COUNT,
SELECTED_ALERTS,
SHOWING_ALERTS,
ALERTS,
TAKE_ACTION_POPOVER_BTN,
} from '../screens/alerts';

Expand Down Expand Up @@ -45,7 +45,7 @@ describe('Alerts', () => {
waitForAlertsPanelToBeLoaded();
waitForAlertsToBeLoaded();

cy.get(NUMBER_OF_ALERTS)
cy.get(ALERTS_COUNT)
.invoke('text')
.then((numberOfAlerts) => {
cy.get(SHOWING_ALERTS).should('have.text', `Showing ${numberOfAlerts} alerts`);
Expand All @@ -64,10 +64,7 @@ describe('Alerts', () => {
waitForAlerts();

const expectedNumberOfAlertsAfterClosing = +numberOfAlerts - numberOfAlertsToBeClosed;
cy.get(NUMBER_OF_ALERTS).should(
'have.text',
expectedNumberOfAlertsAfterClosing.toString()
);
cy.get(ALERTS_COUNT).should('have.text', expectedNumberOfAlertsAfterClosing.toString());

cy.get(SHOWING_ALERTS).should(
'have.text',
Expand All @@ -77,7 +74,7 @@ describe('Alerts', () => {
goToClosedAlerts();
waitForAlerts();

cy.get(NUMBER_OF_ALERTS).should('have.text', numberOfAlertsToBeClosed.toString());
cy.get(ALERTS_COUNT).should('have.text', numberOfAlertsToBeClosed.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${numberOfAlertsToBeClosed.toString()} alerts`
Expand All @@ -98,7 +95,7 @@ describe('Alerts', () => {
waitForAlerts();

const expectedNumberOfClosedAlertsAfterOpened = 2;
cy.get(NUMBER_OF_ALERTS).should(
cy.get(ALERTS_COUNT).should(
'have.text',
expectedNumberOfClosedAlertsAfterOpened.toString()
);
Expand Down Expand Up @@ -128,7 +125,7 @@ describe('Alerts', () => {
it('Closes one alert when more than one opened alerts are selected', () => {
waitForAlertsToBeLoaded();

cy.get(NUMBER_OF_ALERTS)
cy.get(ALERTS_COUNT)
.invoke('text')
.then((numberOfAlerts) => {
const numberOfAlertsToBeClosed = 1;
Expand All @@ -144,7 +141,7 @@ describe('Alerts', () => {
waitForAlerts();

const expectedNumberOfAlerts = +numberOfAlerts - numberOfAlertsToBeClosed;
cy.get(NUMBER_OF_ALERTS).should('have.text', expectedNumberOfAlerts.toString());
cy.get(ALERTS_COUNT).should('have.text', expectedNumberOfAlerts.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${expectedNumberOfAlerts.toString()} alerts`
Expand All @@ -153,7 +150,7 @@ describe('Alerts', () => {
goToClosedAlerts();
waitForAlerts();

cy.get(NUMBER_OF_ALERTS).should('have.text', numberOfAlertsToBeClosed.toString());
cy.get(ALERTS_COUNT).should('have.text', numberOfAlertsToBeClosed.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${numberOfAlertsToBeClosed.toString()} alert`
Expand All @@ -178,7 +175,7 @@ describe('Alerts', () => {
goToClosedAlerts();
waitForAlertsToBeLoaded();

cy.get(NUMBER_OF_ALERTS)
cy.get(ALERTS_COUNT)
.invoke('text')
.then((numberOfAlerts) => {
const numberOfAlertsToBeOpened = 1;
Expand All @@ -195,7 +192,7 @@ describe('Alerts', () => {
waitForAlerts();

const expectedNumberOfAlerts = +numberOfAlerts - numberOfAlertsToBeOpened;
cy.get(NUMBER_OF_ALERTS).should('have.text', expectedNumberOfAlerts.toString());
cy.get(ALERTS_COUNT).should('have.text', expectedNumberOfAlerts.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${expectedNumberOfAlerts.toString()} alerts`
Expand All @@ -204,7 +201,7 @@ describe('Alerts', () => {
goToOpenedAlerts();
waitForAlerts();

cy.get(NUMBER_OF_ALERTS).should('have.text', numberOfAlertsToBeOpened.toString());
cy.get(ALERTS_COUNT).should('have.text', numberOfAlertsToBeOpened.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${numberOfAlertsToBeOpened.toString()} alert`
Expand All @@ -228,7 +225,7 @@ describe('Alerts', () => {
waitForAlerts();
waitForAlertsToBeLoaded();

cy.get(NUMBER_OF_ALERTS)
cy.get(ALERTS_COUNT)
.invoke('text')
.then((numberOfAlerts) => {
const numberOfAlertsToBeMarkedInProgress = 1;
Expand All @@ -244,7 +241,7 @@ describe('Alerts', () => {
waitForAlertsToBeLoaded();

const expectedNumberOfAlerts = +numberOfAlerts - numberOfAlertsToBeMarkedInProgress;
cy.get(NUMBER_OF_ALERTS).should('have.text', expectedNumberOfAlerts.toString());
cy.get(ALERTS_COUNT).should('have.text', expectedNumberOfAlerts.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${expectedNumberOfAlerts.toString()} alerts`
Expand All @@ -253,10 +250,7 @@ describe('Alerts', () => {
goToInProgressAlerts();
waitForAlerts();

cy.get(NUMBER_OF_ALERTS).should(
'have.text',
numberOfAlertsToBeMarkedInProgress.toString()
);
cy.get(ALERTS_COUNT).should('have.text', numberOfAlertsToBeMarkedInProgress.toString());
cy.get(SHOWING_ALERTS).should(
'have.text',
`Showing ${numberOfAlertsToBeMarkedInProgress.toString()} alert`
Expand Down
29 changes: 19 additions & 10 deletions x-pack/plugins/security_solution/cypress/integration/alerts_detection_exceptions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import { exception } from '../objects/exception';
import { newRule } from '../objects/rule';

import { ALERTS_COUNT, NUMBER_OF_ALERTS } from '../screens/alerts';
import { RULE_STATUS } from '../screens/create_new_rule';
import { SERVER_SIDE_EVENT_COUNT } from '../screens/timeline';

import {
addExceptionFromFirstAlert,
Expand Down Expand Up @@ -52,7 +52,8 @@ describe('Exceptions', () => {
waitForAlertsToPopulate();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfInitialAlertsText) => {
cy.wrap(parseInt(numberOfInitialAlertsText, 10)).should(
Expand All @@ -77,7 +78,8 @@ describe('Exceptions', () => {
goToAlertsTab();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfAlertsAfterCreatingExceptionText, 10)).should('eql', 0);
Expand All @@ -86,7 +88,8 @@ describe('Exceptions', () => {
goToClosedAlerts();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfClosedAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfClosedAlertsAfterCreatingExceptionText, 10)).should(
Expand All @@ -99,7 +102,8 @@ describe('Exceptions', () => {
waitForTheRuleToBeExecuted();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfOpenedAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfOpenedAlertsAfterCreatingExceptionText, 10)).should('eql', 0);
Expand All @@ -113,7 +117,8 @@ describe('Exceptions', () => {
waitForAlertsToPopulate();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfAlertsAfterRemovingExceptionsText) => {
cy.wrap(parseInt(numberOfAlertsAfterRemovingExceptionsText, 10)).should(
Expand All @@ -130,7 +135,8 @@ describe('Exceptions', () => {
addsException(exception);
esArchiverLoad('auditbeat_for_exceptions2');

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfAlertsAfterCreatingExceptionText, 10)).should('eql', 0);
Expand All @@ -139,7 +145,8 @@ describe('Exceptions', () => {
goToClosedAlerts();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfClosedAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfClosedAlertsAfterCreatingExceptionText, 10)).should(
Expand All @@ -152,7 +159,8 @@ describe('Exceptions', () => {
waitForTheRuleToBeExecuted();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfOpenedAlertsAfterCreatingExceptionText) => {
cy.wrap(parseInt(numberOfOpenedAlertsAfterCreatingExceptionText, 10)).should('eql', 0);
Expand All @@ -165,7 +173,8 @@ describe('Exceptions', () => {
waitForAlertsToPopulate();
refreshPage();

cy.get(SERVER_SIDE_EVENT_COUNT)
cy.get(ALERTS_COUNT).should('exist');
cy.get(NUMBER_OF_ALERTS)
.invoke('text')
.then((numberOfAlertsAfterRemovingExceptionsText) => {
cy.wrap(parseInt(numberOfAlertsAfterRemovingExceptionsText, 10)).should(
Expand Down
Loading