fixing hasChartSwitchWarning function, CR corrections & eslint conflicts

elastic · Aug 6, 2020 · 67f8497 · 67f8497
1 parent ac71fd4
commit 67f8497
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/x-pack/test/functional/apps/lens/dashboard.ts b/x-pack/test/functional/apps/lens/dashboard.ts
@@ -7,7 +7,6 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-// eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
  const PageObjects = getPageObjects(['header', 'common', 'dashboard', 'timePicker', 'lens']);
 

diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts
@@ -11,7 +11,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
  const log = getService('log');
  const esArchiver = getService('esArchiver');
 
- describe.only('lens app', () => {
+ describe('lens app', () => {
  before(async () => {
  log.debug('Starting lens before method');
  await browser.setWindowSize(1280, 800);

diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  await PageObjects.lens.goToTimeRange();
  await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
  await PageObjects.lens.switchToVisualization('lnsDatatable');
- expect(await PageObjects.lens.getDatatableThText()).to.eql('Maximum of bytes');
+ expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('Maximum of bytes');
  expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('19,986');
  await PageObjects.lens.switchToVisualization('lnsMetric');
  await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
@@ -114,6 +114,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  await listingTable.searchForItemWithName('lnsXYvis');
  await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
  await PageObjects.lens.goToTimeRange();
+ expect(await PageObjects.lens.hasChartSwitchWarning('donut')).to.eql(true);
  await PageObjects.lens.switchToVisualization('donut');
 
  expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
@@ -124,8 +125,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  'Average of bytes'
  );
 
+ expect(await PageObjects.lens.hasChartSwitchWarning('bar')).to.eql(false);
  await PageObjects.lens.switchToVisualization('bar');
  expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
+ expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
+ 'Top values of ip'
+ );
+ expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+ 'Average of bytes'
+ );
  });
 
  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) {
  await PageObjects.lens.goToTimeRange();
  await PageObjects.lens.switchLayerSeriesType('line');
  expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
+ expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
+ '@timestamp'
+ );
+ expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+ 'Average of bytes'
+ );
+ expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_splitDimensionPanel')).to.eql(
+ 'Top values of ip'
+ );
  });
 
  it('should allow seamless transition from pie chart to treemap chart', async () => {
@@ -172,11 +189,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
  field: 'bytes',
  });
 
+ expect(await PageObjects.lens.hasChartSwitchWarning('lnsDatatable')).to.eql(false);
  await PageObjects.lens.switchToVisualization('lnsDatatable');
 
- expect(await PageObjects.lens.getDatatableThText()).to.eql('@timestamp per 3 hours');
+ expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('@timestamp per 3 hours');
  expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('2015-09-20 00:00');
- expect(await PageObjects.lens.getDatatableThText(1)).to.eql('Average of bytes');
+ expect(await PageObjects.lens.getDatatableHeaderText(1)).to.eql('Average of bytes');
  expect(await PageObjects.lens.getDatatableCellText(0, 1)).to.eql('6,011.351');
  });
  });

diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
@@ -176,9 +176,11 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
  */
  async hasChartSwitchWarning(subVisualizationId: string) {
  await this.openChartSwitchPopover();
-
  const element = await testSubjects.find(`lnsChartSwitchPopover_${subVisualizationId}`);
- return await testSubjects.descendantExists('euiKeyPadMenuItem__betaBadgeWrapper', element);
+ return await find.descendantExistsByCssSelector(
+ '.euiKeyPadMenuItem__betaBadgeWrapper',
+ element
+ );
  },
 
  /**
@@ -231,16 +233,15 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
  'lns-dimensionTrigger',
  dimensionElements[index]
  );
- const text = await trigger.getVisibleText();
- return text;
+ return await trigger.getVisibleText();
  },
 
  /**
  * Gets text of the specified datatable header cell
  *
  * @param index - index of th element in datatable
  */
- async getDatatableThText(index = 0) {
+ async getDatatableHeaderText(index = 0) {
  return find
  .byCssSelector(
  `[data-test-subj="lnsDataTable"] thead th:nth-child(${