Skip to content

Commit fa2e5a3

Browse files
author
Adam Tackett
committed
fixing test, remove timeout
Signed-off-by: Adam Tackett <[email protected]>
1 parent 3104ee4 commit fa2e5a3

File tree

5 files changed

+27
-42
lines changed

5 files changed

+27
-42
lines changed

‎.cypress/integration/event_analytics_test/event_analytics.spec.js

+14-22
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
FIELD_HOST,
2626
FIELD_AGENT
2727
} from '../../utils/event_analytics/constants';
28-
import { suppressResizeObserverIssue, COMMAND_TIMEOUT_LONG } from '../../utils/constants';
2928

3029
import {
3130
querySearch,
@@ -52,7 +51,7 @@ describe('Adding sample data and visualization', () => {
5251
describe('Has working breadcrumbs', () => {
5352
it('Redirect to correct page on breadcrumb click', () => {
5453
landOnEventExplorer();
55-
cy.get('.euiBreadcrumb[href="observability-logs#/"]').click(), { timeout: COMMAND_TIMEOUT_LONG };
54+
cy.get('.euiBreadcrumb[href="observability-logs#/"]').click();
5655
cy.get('.euiTitle').contains('Logs').should('exist');
5756
});
5857
});
@@ -76,6 +75,7 @@ describe('Open flyout for a data row to see details', () => {
7675
cy.get('.observability-flyout .osdDocViewer .euiTabs span.euiTab__content')
7776
.contains('Traces')
7877
.should('be.visible');
78+
cy.get('[data-test-subj="euiFlyoutCloseButton"]').click();
7979
});
8080

8181
it('Should be able to see surrounding docs', () => {
@@ -213,12 +213,12 @@ describe('Saves a query on explorer page', () => {
213213
landOnPanels();
214214
cy.get('[data-test-subj="customPanels__createNewPanels"]').click();
215215
cy.get('input.euiFieldText').type(TESTING_PANEL);
216-
cy.get('.euiButton__text', { timeout: COMMAND_TIMEOUT_LONG })
216+
cy.get('.euiButton__text')
217217
.contains(/^Create$/)
218218
.click();
219219
landOnEventExplorer();
220220
querySearch(TEST_QUERIES[1].query, TEST_QUERIES[1].dateRangeDOM);
221-
cy.get('button[id="main-content-vis"]', { timeout: COMMAND_TIMEOUT_LONG })
221+
cy.get('button[id="main-content-vis"]')
222222
.contains('Visualizations')
223223
.click();
224224
cy.get('[data-test-subj="eventExplorer__saveManagementPopover"]').click();
@@ -238,9 +238,9 @@ describe('Saves a query on explorer page', () => {
238238
cy.get('.tab-title').contains('Events').click();
239239
cy.get('[data-test-subj="eventExplorer__saveManagementPopover"]').click();
240240
cy.get('[data-test-subj="eventExplorer__querySaveName"]').type(SAVE_QUERY1);
241-
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]', { timeout: COMMAND_TIMEOUT_LONG }).click();
241+
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]').click();
242242

243-
cy.get('.euiToastHeader__title', { timeout: COMMAND_TIMEOUT_LONG })
243+
cy.get('.euiToastHeader__title')
244244
.contains('successfully')
245245
.should('exist');
246246

@@ -256,8 +256,8 @@ describe('Saves a query on explorer page', () => {
256256
cy.get('.tab-title').contains('Events').click();
257257
cy.get('[data-test-subj="eventExplorer__saveManagementPopover"]').click();
258258
cy.get('[data-test-subj="eventExplorer__querySaveName"]').type(SAVE_QUERY4);
259-
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]', { timeout: COMMAND_TIMEOUT_LONG }).click();
260-
cy.get('.euiToastHeader__title', { timeout: COMMAND_TIMEOUT_LONG })
259+
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]').click();
260+
cy.get('.euiToastHeader__title')
261261
.contains('successfully')
262262
.should('exist');
263263

@@ -269,9 +269,7 @@ describe('Saves a query on explorer page', () => {
269269
.click();
270270

271271
cy.url().should('contain', '#/explorer');
272-
cy.get('[data-test-subj="searchAutocompleteTextArea"]', {
273-
timeout: COMMAND_TIMEOUT_LONG,
274-
}).contains(TEST_QUERIES[0].query);
272+
cy.get('[data-test-subj="searchAutocompleteTextArea"]').contains(TEST_QUERIES[0].query);
275273
});
276274
});
277275

@@ -404,10 +402,8 @@ describe('Live tail stop automatically', () => {
404402
});
405403

406404
it.skip('Click to switch to another tab', () => {
407-
cy.get('[data-test-subj="eventExplorer__addNewTab"]', {
408-
timeout: COMMAND_TIMEOUT_LONG,
409-
}).click();
410-
cy.get('[data-test-subj="eventExplorer__topLevelTabbing"]', { timeout: COMMAND_TIMEOUT_LONG })
405+
cy.get('[data-test-subj="eventExplorer__addNewTab"]').click();
406+
cy.get('[data-test-subj="eventExplorer__topLevelTabbing"]')
411407
.find('button.euiTab')
412408
.first()
413409
.click();
@@ -419,12 +415,8 @@ describe('Live tail stop automatically', () => {
419415
});
420416

421417
it.skip('Close current selected tab', () => {
422-
cy.get('[data-test-subj="eventExplorer__addNewTab"]', {
423-
timeout: COMMAND_TIMEOUT_LONG,
424-
}).click();
425-
cy.get('[data-test-subj="eventExplorer__addNewTab"]', {
426-
timeout: COMMAND_TIMEOUT_LONG,
427-
}).click();
418+
cy.get('[data-test-subj="eventExplorer__addNewTab"]').click();
419+
cy.get('[data-test-subj="eventExplorer__addNewTab"]').click();
428420
cy.get('[data-test-subj="eventExplorer__topLevelTabbing"]')
429421
.find('button.euiTab')
430422
.then((lists) => {
@@ -499,7 +491,7 @@ describe('Visualizing data', () => {
499491
.type(FIELD_AGENT);
500492
cy.get(`input[value="${FIELD_AGENT}"]`).click();
501493
cy.get('[data-test-subj="panelCloseBtn"]').click();
502-
cy.get('[data-test-subj="visualizeEditorRenderButton"]', { timeout: COMMAND_TIMEOUT_LONG }).click();
494+
cy.get('[data-test-subj="visualizeEditorRenderButton"]').click();
503495

504496
cy.get('.infolayer .legendtext').as('legandTxt');
505497
cy.get('@legandTxt').should('contain', BAR_LEG_TEXT_1);

‎.cypress/integration/metrics_analytics_test/metrics_analytics.spec.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
VIS_TYPE_LINE,
1313
TESTING_PANEL,
1414
} from '../../utils/metrics_constants';
15-
import { suppressResizeObserverIssue, COMMAND_TIMEOUT_LONG } from '../../utils/constants';
15+
import { suppressResizeObserverIssue } from '../../utils/constants';
1616
import { landOnPanels, clearQuerySearchBoxText } from '../../utils/event_analytics/helpers';
1717

1818
describe('Metrics Analytics', () => {
@@ -168,7 +168,7 @@ describe('Metrics Analytics', () => {
168168
landOnPanels();
169169
cy.get('[data-test-subj="customPanels__createNewPanels"]').click();
170170
cy.get('input.euiFieldText').type(TESTING_PANEL);
171-
cy.get('.euiButton__text', { timeout: COMMAND_TIMEOUT_LONG })
171+
cy.get('.euiButton__text')
172172
.contains(/^Create$/)
173173
.click();
174174
cy.wait(delay * 3);
@@ -186,8 +186,7 @@ describe('Metrics Analytics', () => {
186186
it('Redirect to correct page on breadcrumb click', () => {
187187
cy.get('[data-test-subj="metricsSearch"]').should('exist');
188188
cy.get('.euiTitle').contains('Metrics').should('exist');
189-
cy.get('.euiBreadcrumb[href="observability-logs#/"]').click(),
190-
{ timeout: COMMAND_TIMEOUT_LONG };
189+
cy.get('.euiBreadcrumb[href="observability-logs#/"]').click();
191190
cy.get('.euiTitle').contains('Logs').should('exist');
192191
});
193192
});
@@ -225,9 +224,7 @@ const createCustomMetric = ({ testMetricIndex }) => {
225224
.type(PPL_METRICS_NAMES[testMetricIndex], { force: true });
226225
cy.get('[data-test-subj="eventExplorer__metricSaveName"]').click({ force: true });
227226
cy.wait(delay * 10);
228-
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]', {
229-
timeout: COMMAND_TIMEOUT_LONG,
230-
}).click();
227+
cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]').click();
231228
cy.get('.euiToastHeader__title').contains('successfully').should('exist');
232229
};
233230

‎.cypress/integration/trace_analytics_test/trace_analytics_dashboard.spec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('Dump test data', () => {
7070

7171
describe('Testing dashboard table empty state', () => {
7272
beforeEach(() => {
73-
cy.visit('app/observability-traces#/', {
73+
cy.visit('app/observability-traces#/traces', {
7474
onBeforeLoad: (win) => {
7575
win.sessionStorage.clear();
7676
},
@@ -85,7 +85,7 @@ describe('Testing dashboard table empty state', () => {
8585

8686
describe('Testing dashboard table', () => {
8787
beforeEach(() => {
88-
cy.visit('app/observability-traces#/', {
88+
cy.visit('app/observability-traces#/traces', {
8989
onBeforeLoad: (win) => {
9090
win.sessionStorage.clear();
9191
},
@@ -137,7 +137,7 @@ describe('Testing dashboard table', () => {
137137

138138
describe('Testing plots', () => {
139139
beforeEach(() => {
140-
cy.visit('app/observability-traces#/', {
140+
cy.visit('app/observability-traces#/traces', {
141141
onBeforeLoad: (win) => {
142142
win.sessionStorage.clear();
143143
},
@@ -173,7 +173,7 @@ describe('Testing plots', () => {
173173

174174
describe('Latency by trace group table', () => {
175175
beforeEach(() => {
176-
cy.visit('app/observability-traces#/', {
176+
cy.visit('app/observability-traces#/traces', {
177177
onBeforeLoad: (win) => {
178178
win.sessionStorage.clear();
179179
},
@@ -267,7 +267,7 @@ describe('Latency by trace group table', () => {
267267

268268
describe('Testing filters on trace analytics page', { scrollBehavior: false }, () => {
269269
beforeEach(() => {
270-
cy.visit('app/observability-traces#/', {
270+
cy.visit('app/observability-traces#/traces', {
271271
onBeforeLoad: (win) => {
272272
win.sessionStorage.clear();
273273
},
@@ -360,7 +360,7 @@ describe('Dump jaeger test data', () => {
360360

361361
describe('Testing switch mode to jaeger', () => {
362362
beforeEach(() => {
363-
cy.visit('app/observability-traces#/', {
363+
cy.visit('app/observability-traces#/traces', {
364364
onBeforeLoad: (win) => {
365365
win.sessionStorage.clear();
366366
},

‎.cypress/utils/constants.js

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
export const COMMAND_TIMEOUT_LONG = 10000;
7-
86
//BASE Constants
97
export const BACKEND_BASE_PATH = Cypress.env('opensearch');
108
export const FONTEND_BASE_PATH = Cypress.env('opensearchDashboards');

‎.cypress/utils/event_analytics/helpers.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import { COMMAND_TIMEOUT_LONG, suppressResizeObserverIssue } from '../constants';
6+
import { suppressResizeObserverIssue } from '../constants';
77

88
export const clearQuerySearchBoxText = (testSubjectName) => {
9-
cy.get(`[data-test-subj="${testSubjectName}"]`, {
10-
timeout: COMMAND_TIMEOUT_LONG,
11-
}).clear({ force: true });
9+
cy.get(`[data-test-subj="${testSubjectName}"]`).clear({ force: true });
1210
};
1311

1412
export const querySearch = (query, rangeSelected) => {
15-
cy.get('[data-test-subj="searchAutocompleteTextArea"]', { timeout: COMMAND_TIMEOUT_LONG })
13+
cy.get('[data-test-subj="searchAutocompleteTextArea"]')
1614
.clear()
1715
.focus()
1816
.type(query);

0 commit comments

Comments
 (0)