Skip to content

Commit 3630cfd

Browse files
committed
Improve cypress tests
1 parent ba2a556 commit 3630cfd

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ describe('persistent timeline', () => {
2626
});
2727

2828
it('persist the deletion of a column', () => {
29-
const numberOfTimelineColumns = 9;
29+
cy.get(DRAGGABLE_HEADER).then((header) => {
30+
const currentNumberOfTimelineColumns = header.length;
31+
const expectedNumberOfTimelineColumns = currentNumberOfTimelineColumns - 1;
3032

31-
cy.get(DRAGGABLE_HEADER)
32-
.eq(TABLE_COLUMN_EVENTS_MESSAGE)
33-
.invoke('text')
34-
.should('equal', 'message');
33+
cy.wrap(header).eq(TABLE_COLUMN_EVENTS_MESSAGE).invoke('text').should('equal', 'message');
34+
removeColumn(TABLE_COLUMN_EVENTS_MESSAGE);
3535

36-
cy.get(DRAGGABLE_HEADER).should('have.length', numberOfTimelineColumns);
36+
cy.get(DRAGGABLE_HEADER).should('have.length', expectedNumberOfTimelineColumns);
3737

38-
removeColumn(TABLE_COLUMN_EVENTS_MESSAGE);
39-
reload(waitsForEventsToBeLoaded);
38+
reload(waitsForEventsToBeLoaded);
4039

41-
cy.get(DRAGGABLE_HEADER).should('have.length', numberOfTimelineColumns - 1);
42-
cy.get(DRAGGABLE_HEADER).each(($el) => {
43-
expect($el.text()).not.equal('message');
40+
cy.get(DRAGGABLE_HEADER).should('have.length', expectedNumberOfTimelineColumns);
41+
cy.get(DRAGGABLE_HEADER).each(($el) => {
42+
expect($el.text()).not.equal('message');
43+
});
4444
});
4545
});
4646
});

x-pack/plugins/security_solution/cypress/tasks/timeline.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,9 @@ export const dragAndDropIdToggleFieldToTimeline = () => {
105105
);
106106
};
107107

108-
export const waitForTimelineActionToFinish = () => {
109-
cy.get(TIMELINE_COLUMN_SPINNER).should('exist');
110-
cy.get(TIMELINE_COLUMN_SPINNER).should('not.exist');
111-
};
112-
113108
export const removeColumn = (column: number) => {
114109
cy.get(REMOVE_COLUMN).first().should('exist');
115110
cy.get(REMOVE_COLUMN).eq(column).click({ force: true });
116-
waitForTimelineActionToFinish();
117111
};
118112

119113
export const resetFields = () => {

0 commit comments

Comments
 (0)