Skip to content

Commit

Permalink
[SIEM] Cypress renaming (#68659)
Browse files Browse the repository at this point in the history
* updates naming in integration

* updates naming in objects

* updates naming in screens

* updates naming in support

* updates naming in tasks

* fixes failing test

Co-authored-by: Elastic Machine <[email protected]>
  • Loading branch information
MadameSheema and elasticmachine authored Jun 10, 2020
1 parent 204977c commit 028c19e
Show file tree
Hide file tree
Showing 23 changed files with 31 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
resetFields,
waitsForEventsToBeLoaded,
} from '../tasks/hosts/events';
import { clearSearchBar, kqlSearch } from '../tasks/siem_header';
import { clearSearchBar, kqlSearch } from '../tasks/security_header';

import { HOSTS_PAGE } from '../urls/navigation';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
resetFields,
} from '../tasks/fields_browser';
import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline } from '../tasks/siem_main';
import { openTimeline } from '../tasks/security_main';
import { openTimelineFieldsBrowser, populateTimeline } from '../tasks/timeline';

import { HOSTS_PAGE } from '../urls/navigation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
*/

import {
INSPECT_HOSTS_BUTTONS_IN_SIEM,
INSPECT_HOSTS_BUTTONS_IN_SECURITY,
INSPECT_MODAL,
INSPECT_NETWORK_BUTTONS_IN_SIEM,
INSPECT_NETWORK_BUTTONS_IN_SECURITY,
} from '../screens/inspect';

import { closesModal, openStatsAndTables } from '../tasks/inspect';
import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline } from '../tasks/siem_main';
import { openTimeline } from '../tasks/security_main';
import {
executeTimelineKQL,
openTimelineInspectButton,
Expand All @@ -30,7 +30,7 @@ describe('Inspect', () => {
closesModal();
});

INSPECT_HOSTS_BUTTONS_IN_SIEM.forEach((table) =>
INSPECT_HOSTS_BUTTONS_IN_SECURITY.forEach((table) =>
it(`inspects the ${table.title}`, () => {
openStatsAndTables(table);
cy.get(INSPECT_MODAL).should('be.visible');
Expand All @@ -46,7 +46,7 @@ describe('Inspect', () => {
closesModal();
});

INSPECT_NETWORK_BUTTONS_IN_SIEM.forEach((table) =>
INSPECT_NETWORK_BUTTONS_IN_SECURITY.forEach((table) =>
it(`inspects the ${table.title}`, () => {
openStatsAndTables(table);
cy.get(INSPECT_MODAL).should('be.visible');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { KQL_INPUT } from '../screens/siem_header';
import { KQL_INPUT } from '../screens/security_header';

import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { DETECTIONS, HOSTS, NETWORK, OVERVIEW, TIMELINES } from '../screens/siem_header';
import { DETECTIONS, HOSTS, NETWORK, OVERVIEW, TIMELINES } from '../screens/security_header';

import { loginAndWaitForPage } from '../tasks/login';
import { navigateFromHeaderTo } from '../tasks/siem_header';
import { navigateFromHeaderTo } from '../tasks/security_header';

import { TIMELINES_PAGE } from '../urls/navigation';

describe('top-level navigation common to all pages in the SIEM app', () => {
describe('top-level navigation common to all pages in the Security app', () => {
before(() => {
loginAndWaitForPage(TIMELINES_PAGE);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { OVERVIEW_PAGE } from '../urls/navigation';

describe('Overview Page', () => {
before(() => {
cy.stubSIEMapi('overview');
cy.stubSecurityApi('overview');
loginAndWaitForPage(OVERVIEW_PAGE);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { openAuthentications, openUncommonProcesses } from '../tasks/hosts/main'
import { waitForUncommonProcessesToBeLoaded } from '../tasks/hosts/uncommon_processes';
import { loginAndWaitForPage } from '../tasks/login';
import { goToFirstPage, goToThirdPage } from '../tasks/pagination';
import { refreshPage } from '../tasks/siem_header';
import { refreshPage } from '../tasks/security_header';

import { HOSTS_PAGE_TAB_URLS } from '../urls/navigation';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '../tasks/hosts/all_hosts';

import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline } from '../tasks/siem_main';
import { openTimeline } from '../tasks/security_main';
import { createNewTimeline } from '../tasks/timeline';

import { HOSTS_PAGE } from '../urls/navigation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TIMELINE_FLYOUT_HEADER, TIMELINE_NOT_READY_TO_DROP_BUTTON } from '../sc

import { dragFirstHostToTimeline, waitForAllHostsToBeLoaded } from '../tasks/hosts/all_hosts';
import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline, openTimelineIfClosed } from '../tasks/siem_main';
import { openTimeline, openTimelineIfClosed } from '../tasks/security_main';
import { createNewTimeline } from '../tasks/timeline';

import { HOSTS_PAGE } from '../urls/navigation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { SERVER_SIDE_EVENT_COUNT } from '../screens/timeline';

import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline } from '../tasks/siem_main';
import { openTimeline } from '../tasks/security_main';
import { executeTimelineKQL } from '../tasks/timeline';

import { HOSTS_PAGE } from '../urls/navigation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from '../screens/timeline';

import { loginAndWaitForPage } from '../tasks/login';
import { openTimeline } from '../tasks/siem_main';
import { openTimeline } from '../tasks/security_main';
import {
checkIdToggleField,
createNewTimeline,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '../screens/date_picker';
import { HOSTS_NAMES } from '../screens/hosts/all_hosts';
import { ANOMALIES_TAB } from '../screens/hosts/main';
import { BREADCRUMBS, HOSTS, KQL_INPUT, NETWORK } from '../screens/siem_header';
import { BREADCRUMBS, HOSTS, KQL_INPUT, NETWORK } from '../screens/security_header';
import { SERVER_SIDE_EVENT_COUNT, TIMELINE_TITLE } from '../screens/timeline';

import { loginAndWaitForPage, loginAndWaitForPageWithoutDateRange } from '../tasks/login';
Expand All @@ -29,8 +29,8 @@ import { openFirstHostDetails, waitForAllHostsToBeLoaded } from '../tasks/hosts/
import { openAllHosts } from '../tasks/hosts/main';

import { waitForIpsTableToBeLoaded } from '../tasks/network/flows';
import { clearSearchBar, kqlSearch, navigateFromHeaderTo } from '../tasks/siem_header';
import { openTimeline } from '../tasks/siem_main';
import { clearSearchBar, kqlSearch, navigateFromHeaderTo } from '../tasks/security_header';
import { openTimeline } from '../tasks/security_main';
import {
addDescriptionToTimeline,
addNameToTimeline,
Expand Down Expand Up @@ -243,7 +243,7 @@ describe('url state', () => {
cy.wrap(intCount).should('be.above', 0);
});

const timelineName = 'SIEM';
const timelineName = 'Security';
addNameToTimeline(timelineName);
addDescriptionToTimeline('This is the best timeline of the world');
cy.wait(5000);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/cypress/screens/inspect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface InspectButtonMetadata {
tabId?: string;
}

export const INSPECT_HOSTS_BUTTONS_IN_SIEM: InspectButtonMetadata[] = [
export const INSPECT_HOSTS_BUTTONS_IN_SECURITY: InspectButtonMetadata[] = [
{
id: '[data-test-subj="stat-hosts"]',
title: 'Hosts Stat',
Expand Down Expand Up @@ -50,7 +50,7 @@ export const INSPECT_HOSTS_BUTTONS_IN_SIEM: InspectButtonMetadata[] = [
},
];

export const INSPECT_NETWORK_BUTTONS_IN_SIEM: InspectButtonMetadata[] = [
export const INSPECT_NETWORK_BUTTONS_IN_SECURITY: InspectButtonMetadata[] = [
{
id: '[data-test-subj="stat-networkEvents"]',
title: 'Network events Stat',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// -- This is will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

Cypress.Commands.add('stubSIEMapi', function (dataFileName) {
Cypress.Commands.add('stubSecurityApi', function (dataFileName) {
cy.on('window:before:load', (win) => {
// @ts-ignore no null, this is a temp hack see issue above
win.fetch = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

declare namespace Cypress {
interface Chainable<Subject> {
stubSIEMapi(dataFileName: string): Chainable<Subject>;
stubSecurityApi(dataFileName: string): Chainable<Subject>;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
URL,
USERNAME,
} from '../screens/configure_cases';
import { MAIN_PAGE } from '../screens/siem_main';
import { MAIN_PAGE } from '../screens/security_main';

import { Connector } from '../objects/case';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
ALERTS,
ALERT_CHECKBOX,
} from '../screens/detections';
import { REFRESH_BUTTON } from '../screens/siem_header';
import { REFRESH_BUTTON } from '../screens/security_header';

export const closeFirstAlert = () => {
cy.get(OPEN_CLOSE_ALERT_BTN).first().click({ force: true });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { AUTHENTICATIONS_TABLE } from '../../screens/hosts/authentications';
import { REFRESH_BUTTON } from '../../screens/siem_header';
import { REFRESH_BUTTON } from '../../screens/security_header';

export const waitForAuthenticationsToBeLoaded = () => {
cy.get(AUTHENTICATIONS_TABLE).should('exist');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { UNCOMMON_PROCESSES_TABLE } from '../../screens/hosts/uncommon_processes';
import { REFRESH_BUTTON } from '../../screens/siem_header';
import { REFRESH_BUTTON } from '../../screens/security_header';

export const waitForUncommonProcessesToBeLoaded = () => {
cy.get(UNCOMMON_PROCESSES_TABLE).should('exist');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { KQL_INPUT, REFRESH_BUTTON } from '../screens/siem_header';
import { KQL_INPUT, REFRESH_BUTTON } from '../screens/security_header';

export const clearSearchBar = () => {
cy.get(KQL_INPUT).clear().type('{enter}');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { MAIN_PAGE, TIMELINE_TOGGLE_BUTTON } from '../screens/siem_main';
import { MAIN_PAGE, TIMELINE_TOGGLE_BUTTON } from '../screens/security_main';

export const openTimeline = () => {
cy.get(TIMELINE_TOGGLE_BUTTON).click();
Expand Down

0 comments on commit 028c19e

Please sign in to comment.