Fix functional tests for Visualize, to work with new landing page.

cjcenizal · Feb 4, 2017 · 5a720c9 · 5a720c9
1 parent 6a66f6f
commit 5a720c9
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/wizard/step_1.html b/src/core_plugins/kibana/public/visualize/wizard/step_1.html
@@ -31,7 +31,7 @@ <h1 class="kuiTitle">
               class="wizard-type-heading-icon fa fa-fw"
               ng-class="type.icon"
             ></i>
-            <h4 class="wizard-type-heading-text">{{type.title}}</h4>
+            <h4 data-test-subj="visualizeWizardChartTypeTitle" class="wizard-type-heading-text">{{type.title}}</h4>
           </div>
           <p class="wizard-type-description">{{type.description}}</p>
         </a>

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickAreaChart');
       return PageObjects.visualize.clickAreaChart();

diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js
@@ -10,7 +10,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize');
+    return PageObjects.common.navigateToUrl('visualize', 'step/1');
   });
 
   bdd.describe('chart types', function indexPatternCreation() {

diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickDataTable');
       return PageObjects.visualize.clickDataTable();

diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickLineChart');
       return PageObjects.visualize.clickLineChart();

diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickMetric');
       return PageObjects.visualize.clickMetric();

diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickPieChart');
       return PageObjects.visualize.clickPieChart();

diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
@@ -15,7 +15,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   bdd.before(function () {
 
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickTileMap');
       return PageObjects.visualize.clickTileMap();

diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -14,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
-    return PageObjects.common.navigateToApp('visualize')
+    return PageObjects.common.navigateToUrl('visualize', 'step/1')
     .then(function () {
       PageObjects.common.debug('clickVerticalBarChart');
       return PageObjects.visualize.clickVerticalBarChart();

diff --git a/test/support/page_objects/common.js b/test/support/page_objects/common.js
@@ -80,6 +80,15 @@ export default class Common {
     return getUrl.baseUrl(config.servers.elasticsearch);
   }
 
+  navigateToUrl(appName, subUrl) {
+    const appConfig = Object.assign({}, config.apps[appName], {
+      // Overwrite the default hash with the URL we really want.
+      hash: `${appName}/${subUrl}`,
+    });
+    const appUrl = getUrl.noAuth(config.servers.kibana, appConfig);
+    return this.remote.get(appUrl);
+  }
+
   navigateToApp(appName, testStatusPage) {
     const self = this;
     const appUrl = getUrl.noAuth(config.servers.kibana, config.apps[appName]);

diff --git a/test/support/page_objects/visualize_page.js b/test/support/page_objects/visualize_page.js
@@ -82,10 +82,7 @@ export default class VisualizePage {
   }
 
   getChartTypes() {
-
-    return this.remote
-    .setFindTimeout(defaultFindTimeout)
-    .findAllByCssSelector('.wizard-type-heading h4')
+    return PageObjects.common.findAllTestSubjects('visualizeWizardChartTypeTitle')
     .then(function (chartTypes) {
       function getChartType(chart) {
         return chart.getVisibleText();
@@ -379,14 +376,7 @@ export default class VisualizePage {
   // this is for starting on the
   // bottom half of the "Create a new visualization      Step 1" page
   openSavedVisualization(vizName) {
-    const self = this;
-    return self.filterVisByName(vizName)
-    .then(() => {
-      return PageObjects.common.sleep(1000);
-    })
-    .then(function clickDashboardByLinkedText() {
-      return self.clickVisualizationByLinkText(vizName);
-    });
+    return this.clickVisualizationByLinkText(vizName);
   }
 
   getXAxisLabels() {