Skip to content

Commit a405a48

Browse files
flash1293flash1293
committed
stabilize tests more
1 parent ae8dbc2 commit a405a48

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎test/functional/apps/visualize/_area_chart.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -310,25 +310,25 @@ export default function ({ getService, getPageObjects }) {
310310
await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
311311
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
312312
await PageObjects.visEditor.clickGo();
313-
const labels = await PageObjects.visChart.getYAxisLabels();
314-
const minLabel = '2';
315-
const maxLabel = '8,000';
313+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
314+
const minLabel = 2;
315+
const maxLabel = 5000;
316316
const numberOfLabels = 10;
317317
expect(labels.length).to.be.greaterThan(numberOfLabels);
318318
expect(labels[0]).to.eql(minLabel);
319-
expect(labels[labels.length - 1]).to.eql(maxLabel);
319+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
320320
});
321321

322322
it('should show filtered ticks on selecting log scale', async () => {
323323
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
324324
await PageObjects.visEditor.clickGo();
325-
const labels = await PageObjects.visChart.getYAxisLabels();
326-
const minLabel = '2';
327-
const maxLabel = '8,000';
325+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
326+
const minLabel = 2;
327+
const maxLabel = 5000;
328328
const numberOfLabels = 10;
329329
expect(labels.length).to.be.greaterThan(numberOfLabels);
330330
expect(labels[0]).to.eql(minLabel);
331-
expect(labels[labels.length - 1]).to.eql(maxLabel);
331+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
332332
});
333333

334334
it('should show ticks on selecting square root scale', async () => {

‎test/functional/apps/visualize/_line_chart.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,25 +191,25 @@ export default function ({ getService, getPageObjects }) {
191191
await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
192192
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
193193
await PageObjects.visEditor.clickGo();
194-
const labels = await PageObjects.visChart.getYAxisLabels();
195-
const minLabel = '2';
196-
const maxLabel = '8,000';
194+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
195+
const minLabel = 2;
196+
const maxLabel = 5000;
197197
const numberOfLabels = 10;
198198
expect(labels.length).to.be.greaterThan(numberOfLabels);
199199
expect(labels[0]).to.eql(minLabel);
200-
expect(labels[labels.length - 1]).to.eql(maxLabel);
200+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
201201
});
202202

203203
it('should show filtered ticks on selecting log scale', async () => {
204204
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
205205
await PageObjects.visEditor.clickGo();
206-
const labels = await PageObjects.visChart.getYAxisLabels();
207-
const minLabel = '2';
208-
const maxLabel = '8,000';
206+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
207+
const minLabel = 2;
208+
const maxLabel = 5000;
209209
const numberOfLabels = 10;
210210
expect(labels.length).to.be.greaterThan(numberOfLabels);
211211
expect(labels[0]).to.eql(minLabel);
212-
expect(labels[labels.length - 1]).to.eql(maxLabel);
212+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
213213
});
214214

215215
it('should show ticks on selecting square root scale', async () => {

‎test/functional/apps/visualize/_vertical_bar_chart.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,25 +363,25 @@ export default function ({ getService, getPageObjects }) {
363363
await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
364364
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
365365
await PageObjects.visEditor.clickGo();
366-
const labels = await PageObjects.visChart.getYAxisLabels();
367-
const minLabel = '2';
368-
const maxLabel = '8,000';
366+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
367+
const minLabel = 2;
368+
const maxLabel = 5000;
369369
const numberOfLabels = 10;
370370
expect(labels.length).to.be.greaterThan(numberOfLabels);
371371
expect(labels[0]).to.eql(minLabel);
372-
expect(labels[labels.length - 1]).to.eql(maxLabel);
372+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
373373
});
374374

375375
it('should show filtered ticks on selecting log scale', async () => {
376376
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
377377
await PageObjects.visEditor.clickGo();
378-
const labels = await PageObjects.visChart.getYAxisLabels();
379-
const minLabel = '2';
380-
const maxLabel = '8,000';
378+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
379+
const minLabel = 2;
380+
const maxLabel = 5000;
381381
const numberOfLabels = 10;
382382
expect(labels.length).to.be.greaterThan(numberOfLabels);
383383
expect(labels[0]).to.eql(minLabel);
384-
expect(labels[labels.length - 1]).to.eql(maxLabel);
384+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
385385
});
386386

387387
it('should show ticks on selecting square root scale', async () => {

‎test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,25 @@ export default function ({ getService, getPageObjects }) {
138138
await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
139139
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
140140
await PageObjects.visEditor.clickGo();
141-
const labels = await PageObjects.visChart.getYAxisLabels();
142-
const minLabel = '2';
143-
const maxLabel = '8,000';
141+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
142+
const minLabel = 2;
143+
const maxLabel = 5000;
144144
const numberOfLabels = 10;
145145
expect(labels.length).to.be.greaterThan(numberOfLabels);
146146
expect(labels[0]).to.eql(minLabel);
147-
expect(labels[labels.length - 1]).to.eql(maxLabel);
147+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
148148
});
149149

150150
it('should show filtered ticks on selecting log scale', async () => {
151151
await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
152152
await PageObjects.visEditor.clickGo();
153-
const labels = await PageObjects.visChart.getYAxisLabels();
154-
const minLabel = '2';
155-
const maxLabel = '8,000';
153+
const labels = await PageObjects.visChart.getYAxisLabelsAsNumbers();
154+
const minLabel = 2;
155+
const maxLabel = 5000;
156156
const numberOfLabels = 10;
157157
expect(labels.length).to.be.greaterThan(numberOfLabels);
158158
expect(labels[0]).to.eql(minLabel);
159-
expect(labels[labels.length - 1]).to.eql(maxLabel);
159+
expect(labels[labels.length - 1]).to.be.greaterThan(maxLabel);
160160
});
161161

162162
it('should show ticks on selecting square root scale', async () => {

‎test/functional/apps/visualize/index.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
3232
describe('visualize app', () => {
3333
before(async () => {
3434
log.debug('Starting visualize before method');
35-
await browser.setScreenshotSize(1280, 640);
35+
await browser.setWindowSize(1280, 800);
3636
await esArchiver.loadIfNeeded('logstash_functional');
3737
await esArchiver.loadIfNeeded('long_window_logstash');
3838
await esArchiver.load('visualize');
@@ -43,10 +43,6 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
4343
isOss = await PageObjects.common.isOss();
4444
});
4545

46-
after(async () => {
47-
await browser.setWindowSize(1280, 800);
48-
});
49-
5046
describe('', function () {
5147
this.tags('ciGroup9');
5248

‎test/functional/page_objects/visualize_chart_page.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr
5151
.map((tick) => $(tick).text().trim());
5252
}
5353

54+
public async getYAxisLabelsAsNumbers() {
55+
return (await this.getYAxisLabels()).map((label) => Number(label.replace(',', '')));
56+
}
57+
5458
/**
5559
* Gets the chart data and scales it based on chart height and label.
5660
* @param dataLabel data-label value

0 commit comments

Comments
 (0)