moved common pageobject from endpoint_list to page_utils

x-pack/test/functional_endpoint/apps/endpoint/endpoint_list.ts

@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
- const pageObjects = getPageObjects(['common', 'endpoint', 'header']);
+ const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
  const esArchiver = getService('esArchiver');
  const testSubjects = getService('testSubjects');
 
@@ -73,7 +73,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
  'Jan 24, 2020 @ 16:06:09.541',
  ],
  ];
- const tableData = await pageObjects.endpoint.getEndpointAppTableData('hostListTable');
+ const tableData = await pageObjects.endpointPageUtils.tableData('hostListTable');
  expect(tableData).to.eql(expectedData);
  });
 
@@ -126,7 +126,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
  });
  it('displays no items found when empty', async () => {
  // get the endpoint list table data and verify message
- const [, [noItemsFoundMessage]] = await pageObjects.endpoint.getEndpointAppTableData(
+ const [, [noItemsFoundMessage]] = await pageObjects.endpointPageUtils.tableData(
  'hostListTable'
  );
  expect(noItemsFoundMessage).to.equal('No items found');

x-pack/test/functional_endpoint/apps/endpoint/policy_list.ts

@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
- const pageObjects = getPageObjects(['common', 'endpoint', 'policy']);
+ const pageObjects = getPageObjects(['common', 'endpoint', 'policy', 'endpointPageUtils']);
  const testSubjects = getService('testSubjects');
  const policyTestResources = getService('policyTestResources');
  const RELATIVE_DATE_FORMAT = /\d (?:seconds|minutes) ago/i;
@@ -31,7 +31,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  expect(policyTotal).to.equal('0 Policies');
  });
  it('has correct table headers', async () => {
- const allHeaderCells = await pageObjects.endpoint.tableHeaderVisibleText('policyTable');
+ const allHeaderCells = await pageObjects.endpointPageUtils.tableHeaderVisibleText(
+ 'policyTable'
+ );
  expect(allHeaderCells).to.eql([
  'Policy Name',
  'Created By',
@@ -43,7 +45,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  ]);
  });
  it('should show empty table results message', async () => {
- const [, [noItemsFoundMessage]] = await pageObjects.endpoint.getEndpointAppTableData(
+ const [, [noItemsFoundMessage]] = await pageObjects.endpointPageUtils.tableData(
  'policyTable'
  );
  expect(noItemsFoundMessage).to.equal('No items found');
@@ -65,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  });
 
  it('should show policy on the list', async () => {
- const [, policyRow] = await pageObjects.endpoint.getEndpointAppTableData('policyTable');
+ const [, policyRow] = await pageObjects.endpointPageUtils.tableData('policyTable');
  // Validate row data with the exception of the Date columns - since those are initially
  // shown as relative.
  expect([policyRow[0], policyRow[1], policyRow[3], policyRow[5], policyRow[6]]).to.eql([

x-pack/test/functional_endpoint/page_objects/endpoint_page.ts

@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export function EndpointPageProvider({ getService, getPageObjects }: FtrProviderContext) {
  const testSubjects = getService('testSubjects');
- const pageObjects = getPageObjects(['common', 'header']);
+ const pageObjects = getPageObjects(['common', 'header', 'endpointPageUtils']);
  const retry = getService('retry');
 
  return {
@@ -23,53 +23,9 @@ export function EndpointPageProvider({ getService, getPageObjects }: FtrProvider
  await pageObjects.header.waitUntilLoadingHasFinished();
  },
 
- /**
- * Finds the Table with the given `selector` (test subject) and returns
- * back an array containing the table's header column text
- *
- * @param selector
- * @returns Promise<string[]>
- */
- async tableHeaderVisibleText(selector: string) {
- const $ = await (await testSubjects.find('policyTable')).parseDomContent();
- return $('thead tr th')
- .toArray()
- .map((th) =>
- $(th)
- .text()
- .replace(/&nbsp;/g, '')
- .trim()
- );
- },
-
- /**
- * Finds a table and returns the data in a nested array with row 0 is the headers if they exist.
- * It uses euiTableCellContent to avoid poluting the array data with the euiTableRowCell__mobileHeader data.
- * @param dataTestSubj
- * @returns Promise<string[][]>
- */
- async getEndpointAppTableData(dataTestSubj: string) {
- await testSubjects.exists(dataTestSubj);
- const hostTable: WebElementWrapper = await testSubjects.find(dataTestSubj);
- const $ = await hostTable.parseDomContent();
- return $('tr')
- .toArray()
- .map((row) =>
- $(row)
- .find('.euiTableCellContent')
- .toArray()
- .map((cell) =>
- $(cell)
- .text()
- .replace(/&nbsp;/g, '')
- .trim()
- )
- );
- },
-
  async waitForTableToHaveData(dataTestSubj: string) {
  await retry.waitForWithTimeout('table to have data', 2000, async () => {
- const tableData = await this.getEndpointAppTableData(dataTestSubj);
+ const tableData = await pageObjects.endpointPageUtils.tableData(dataTestSubj);
  if (tableData[1][0] === 'No items found') {
  return false;
  }

x-pack/test/functional_endpoint/page_objects/page_utils.ts

@@ -5,8 +5,10 @@
  */
 
 import { FtrProviderContext } from '../ftr_provider_context';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
 
 export function EndpointPageUtils({ getService }: FtrProviderContext) {
+ const testSubjects = getService('testSubjects');
  const find = getService('find');
 
  return {
@@ -26,5 +28,49 @@ export function EndpointPageUtils({ getService }: FtrProviderContext) {
 
  await euiCheckboxLabelElement.click();
  },
+
+ /**
+ * Finds the Table with the given `selector` (test subject) and returns
+ * back an array containing the table's header column text
+ *
+ * @param selector
+ * @returns Promise<string[]>
+ */
+ async tableHeaderVisibleText(selector: string) {
+ const $ = await (await testSubjects.find(selector)).parseDomContent();
+ return $('thead tr th')
+ .toArray()
+ .map((th) =>
+ $(th)
+ .text()
+ .replace(/&nbsp;/g, '')
+ .trim()
+ );
+ },
+
+ /**
+ * Finds a table and returns the data in a nested array with row 0 is the headers if they exist.
+ * It uses euiTableCellContent to avoid poluting the array data with the euiTableRowCell__mobileHeader data.
+ * @param dataTestSubj
+ * @returns Promise<string[][]>
+ */
+ async tableData(dataTestSubj: string) {
+ await testSubjects.exists(dataTestSubj);
+ const hostTable: WebElementWrapper = await testSubjects.find(dataTestSubj);
+ const $ = await hostTable.parseDomContent();
+ return $('tr')
+ .toArray()
+ .map((row) =>
+ $(row)
+ .find('.euiTableCellContent')
+ .toArray()
+ .map((cell) =>
+ $(cell)
+ .text()
+ .replace(/&nbsp;/g, '')
+ .trim()
+ )
+ );
+ },
  };
 }