uses cypress api for assertions

x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts

@@ -24,13 +24,7 @@ import {
   addsHostGeoCountryNameToHeader,
   resetFields,
 } from '../../../tasks/hosts/events';
-import {
-  elementShouldExist,
-  elementShouldEqualText,
-  elementShouldNotExist,
-  elementShouldBeChecked,
-  elementShouldNotEqualText,
-} from '../../../tasks/should';
+
 import {
   HEADER_SUBTITLE,
   INSPECT_MODAL,
@@ -39,6 +33,7 @@ import {
   HOST_GEO_CITY_NAME_HEADER,
   HOST_GEO_COUNTRY_NAME_HEADER,
 } from '../../../screens/hosts/events';
+import { DEFAULT_TIMEOUT } from '../../lib/util/helpers';
 
 const defaultHeadersInDefaultEcsCategory = [
   { id: '@timestamp' },
@@ -63,20 +58,24 @@ describe('Events Viewer', () => {
 
     afterEach(() => {
       closeFieldsBrowser();
-      elementShouldNotExist(FIELDS_BROWSER_CONTAINER);
+      cy.get(FIELDS_BROWSER_CONTAINER).should('not.exist');
     });
 
     it('renders the fields browser with the expected title when the Events Viewer Fields Browser button is clicked', () => {
-      elementShouldEqualText(FIELDS_BROWSER_TITLE, 'Customize Columns');
+      cy.get(FIELDS_BROWSER_TITLE)
+        .invoke('text')
+        .should('eq', 'Customize Columns');
     });
 
     it('displays the `default ECS` category (by default)', () => {
-      elementShouldEqualText(FIELDS_BROWSER_SELECTED_CATEGORY_TITLE, 'default ECS');
+      cy.get(FIELDS_BROWSER_SELECTED_CATEGORY_TITLE)
+        .invoke('text')
+        .should('eq', 'default ECS');
     });
 
     it('displays a checked checkbox for all of the default events viewer columns that are also in the default ECS category', () => {
       defaultHeadersInDefaultEcsCategory.forEach(header =>
-        elementShouldBeChecked(FIELDS_BROWSER_CHECKBOX(header.id))
+        cy.get(FIELDS_BROWSER_CHECKBOX(header.id)).should('be.checked')
       );
     });
   });
@@ -89,13 +88,13 @@ describe('Events Viewer', () => {
 
     after(() => {
       closeModal();
-      elementShouldNotExist(INSPECT_MODAL);
+      cy.get(INSPECT_MODAL, { timeout: DEFAULT_TIMEOUT }).should('not.exist');
     });
 
     it('launches the inspect query modal when the inspect button is clicked', () => {
       waitsForEventsToBeLoaded();
       opensInspectQueryModal();
-      elementShouldExist(INSPECT_MODAL);
+      cy.get(INSPECT_MODAL, { timeout: DEFAULT_TIMEOUT }).should('exist');
     });
   });
 
@@ -113,20 +112,20 @@ describe('Events Viewer', () => {
       const filterInput = 'host.geo.c';
 
       filterFieldsBrowser(filterInput);
-      elementShouldNotExist(HOST_GEO_CITY_NAME_HEADER);
+      cy.get(HOST_GEO_CITY_NAME_HEADER).should('not.exist');
       addsHostGeoCityNameToHeader();
       closeFieldsBrowser();
-      elementShouldExist(HOST_GEO_CITY_NAME_HEADER);
+      cy.get(HOST_GEO_CITY_NAME_HEADER).should('exist');
     });
 
     it('resets all fields in the events viewer when `Reset Fields` is clicked', () => {
       const filterInput = 'host.geo.c';
 
       filterFieldsBrowser(filterInput);
-      elementShouldNotExist(HOST_GEO_COUNTRY_NAME_HEADER);
+      cy.get(HOST_GEO_COUNTRY_NAME_HEADER).should('not.exist');
       addsHostGeoCountryNameToHeader();
       resetFields();
-      elementShouldNotExist(HOST_GEO_COUNTRY_NAME_HEADER);
+      cy.get(HOST_GEO_COUNTRY_NAME_HEADER).should('not.exist');
     });
   });
 
@@ -143,17 +142,23 @@ describe('Events Viewer', () => {
         .invoke('text')
         .then(initialNumberOfEvents => {
           filterSearchBar(filterInput);
-          elementShouldNotEqualText(HEADER_SUBTITLE, initialNumberOfEvents);
+          cy.get(HEADER_SUBTITLE)
+            .invoke('text')
+            .should('not.equal', initialNumberOfEvents);
         });
     });
 
     it('loads more events when the load more button is clicked', () => {
       const defaultNumberOfLoadedEvents = '25';
-      elementShouldEqualText(LOCAL_EVENTS_COUNT, defaultNumberOfLoadedEvents);
+      cy.get(LOCAL_EVENTS_COUNT)
+        .invoke('text')
+        .should('equal', defaultNumberOfLoadedEvents);
 
       cy.get(LOAD_MORE).click({ force: true });
 
-      elementShouldNotEqualText(LOCAL_EVENTS_COUNT, defaultNumberOfLoadedEvents);
+      cy.get(LOCAL_EVENTS_COUNT)
+        .invoke('text')
+        .should('not.equal', defaultNumberOfLoadedEvents);
     });
   });
 });