updating based on review

elastic · Aug 14, 2018 · c36c480 · c36c480
1 parent 4937570
commit c36c480
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/test/functional/apps/visualize/_data_table_nontimeindex.js b/test/functional/apps/visualize/_data_table_nontimeindex.js
@@ -27,15 +27,15 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('data table with index without time filter', function indexPatternCreation() {
-    const vizName1 = 'Visualization DataTable';
+    const vizName1 = 'Visualization DataTable without time filter';
 
     before(async function () {
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewVisualization();
       log.debug('clickDataTable');
       await PageObjects.visualize.clickDataTable();
       log.debug('clickNewSearch');
-      await PageObjects.visualize.clickNewSearch('logstash*');
+      await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
       log.debug('Bucket = Split Rows');
       await PageObjects.visualize.clickBucket('Split Rows');
       log.debug('Aggregation = Histogram');
@@ -102,7 +102,7 @@ export default function ({ getService, getPageObjects }) {
     it('should show correct data when using average pipeline aggregation', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickDataTable();
-      await PageObjects.visualize.clickNewSearch('logstash*');
+      await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
       await PageObjects.visualize.clickAddMetric();
       await PageObjects.visualize.clickBucket('Metric');
       await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
@@ -117,7 +117,7 @@ export default function ({ getService, getPageObjects }) {
     it('should show correct data for a data table with date histogram', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickDataTable();
-      await PageObjects.visualize.clickNewSearch('logstash*');
+      await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
       await PageObjects.visualize.clickBucket('Split Rows');
       await PageObjects.visualize.selectAggregation('Date Histogram');
       await PageObjects.visualize.selectField('@timestamp');
@@ -136,7 +136,7 @@ export default function ({ getService, getPageObjects }) {
     it('should show correct data for a data table with date histogram', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickDataTable();
-      await PageObjects.visualize.clickNewSearch('logstash*');
+      await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
       await PageObjects.visualize.clickBucket('Split Rows');
       await PageObjects.visualize.selectAggregation('Date Histogram');
       await PageObjects.visualize.selectField('@timestamp');

diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
@@ -25,14 +25,14 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['common', 'visualize', 'header']);
 
   describe('vertical bar chart with index without time filter', function () {
-    const vizName1 = 'Visualization VerticalBarChart';
+    const vizName1 = 'Visualization VerticalBarChart without time filter';
 
     const initBarChart = async () => {
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewVisualization();
       log.debug('clickVerticalBarChart');
       await PageObjects.visualize.clickVerticalBarChart();
-      await PageObjects.visualize.clickNewSearch('logstash*');
+      await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
       log.debug('Bucket = X-Axis');
       await PageObjects.visualize.clickBucket('X-Axis');
       log.debug('Aggregation = Date Histogram');

diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
@@ -35,6 +35,13 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
 
   class VisualizePage {
 
+    get index() {
+      return {
+        LOGSTASH_TIME_BASED: 'logstash-*',
+        LOGSTASH_NON_TIME_BASED: 'logstash*'
+      };
+    }
+
     async navigateToNewVisualization() {
       log.debug('navigateToApp visualize new');
       await PageObjects.common.navigateToUrl('visualize', 'new');
@@ -353,7 +360,7 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
       await find.clickByCssSelector('button[data-test-subj="toggleEditor"]');
     }
 
-    async clickNewSearch(indexPattern = 'logstash-*') {
+    async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
       await testSubjects.click(`paginatedListItem-${indexPattern}`);
       await PageObjects.header.waitUntilLoadingHasFinished();
     }