Skip to content

Commit 67f8497

Browse files
committed
fixing hasChartSwitchWarning function, CR corrections & eslint conflicts
1 parent ac71fd4 commit 67f8497

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

x-pack/test/functional/apps/lens/dashboard.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import expect from '@kbn/expect';
88
import { FtrProviderContext } from '../../ftr_provider_context';
99

10-
// eslint-disable-next-line import/no-default-export
1110
export default function ({ getService, getPageObjects }: FtrProviderContext) {
1211
const PageObjects = getPageObjects(['header', 'common', 'dashboard', 'timePicker', 'lens']);
1312

x-pack/test/functional/apps/lens/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
1111
const log = getService('log');
1212
const esArchiver = getService('esArchiver');
1313

14-
describe.only('lens app', () => {
14+
describe('lens app', () => {
1515
before(async () => {
1616
log.debug('Starting lens before method');
1717
await browser.setWindowSize(1280, 800);

x-pack/test/functional/apps/lens/smokescreen.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
7777
await PageObjects.lens.goToTimeRange();
7878
await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
7979
await PageObjects.lens.switchToVisualization('lnsDatatable');
80-
expect(await PageObjects.lens.getDatatableThText()).to.eql('Maximum of bytes');
80+
expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('Maximum of bytes');
8181
expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('19,986');
8282
await PageObjects.lens.switchToVisualization('lnsMetric');
8383
await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
@@ -114,6 +114,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
114114
await listingTable.searchForItemWithName('lnsXYvis');
115115
await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
116116
await PageObjects.lens.goToTimeRange();
117+
expect(await PageObjects.lens.hasChartSwitchWarning('donut')).to.eql(true);
117118
await PageObjects.lens.switchToVisualization('donut');
118119

119120
expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
@@ -124,8 +125,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
124125
'Average of bytes'
125126
);
126127

128+
expect(await PageObjects.lens.hasChartSwitchWarning('bar')).to.eql(false);
127129
await PageObjects.lens.switchToVisualization('bar');
128130
expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
131+
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
132+
'Top values of ip'
133+
);
134+
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
135+
'Average of bytes'
136+
);
129137
});
130138

131139
it('should allow seamless transition from bar chart to line chart using layer chart switch', async () => {
@@ -135,6 +143,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
135143
await PageObjects.lens.goToTimeRange();
136144
await PageObjects.lens.switchLayerSeriesType('line');
137145
expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
146+
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
147+
'@timestamp'
148+
);
149+
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
150+
'Average of bytes'
151+
);
152+
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_splitDimensionPanel')).to.eql(
153+
'Top values of ip'
154+
);
138155
});
139156

140157
it('should allow seamless transition from pie chart to treemap chart', async () => {
@@ -172,11 +189,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
172189
field: 'bytes',
173190
});
174191

192+
expect(await PageObjects.lens.hasChartSwitchWarning('lnsDatatable')).to.eql(false);
175193
await PageObjects.lens.switchToVisualization('lnsDatatable');
176194

177-
expect(await PageObjects.lens.getDatatableThText()).to.eql('@timestamp per 3 hours');
195+
expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('@timestamp per 3 hours');
178196
expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('2015-09-20 00:00');
179-
expect(await PageObjects.lens.getDatatableThText(1)).to.eql('Average of bytes');
197+
expect(await PageObjects.lens.getDatatableHeaderText(1)).to.eql('Average of bytes');
180198
expect(await PageObjects.lens.getDatatableCellText(0, 1)).to.eql('6,011.351');
181199
});
182200
});

x-pack/test/functional/page_objects/lens_page.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,11 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
176176
*/
177177
async hasChartSwitchWarning(subVisualizationId: string) {
178178
await this.openChartSwitchPopover();
179-
180179
const element = await testSubjects.find(`lnsChartSwitchPopover_${subVisualizationId}`);
181-
return await testSubjects.descendantExists('euiKeyPadMenuItem__betaBadgeWrapper', element);
180+
return await find.descendantExistsByCssSelector(
181+
'.euiKeyPadMenuItem__betaBadgeWrapper',
182+
element
183+
);
182184
},
183185

184186
/**
@@ -231,16 +233,15 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
231233
'lns-dimensionTrigger',
232234
dimensionElements[index]
233235
);
234-
const text = await trigger.getVisibleText();
235-
return text;
236+
return await trigger.getVisibleText();
236237
},
237238

238239
/**
239240
* Gets text of the specified datatable header cell
240241
*
241242
* @param index - index of th element in datatable
242243
*/
243-
async getDatatableThText(index = 0) {
244+
async getDatatableHeaderText(index = 0) {
244245
return find
245246
.byCssSelector(
246247
`[data-test-subj="lnsDataTable"] thead th:nth-child(${

0 commit comments

Comments
 (0)