Update functional tests to know about the new add data landing page

2025-04-23 17:28:26 -04:00 · 2016-01-22 13:27:11 -05:00 · 2016-01-22 13:27:11 -05:00 · 944b78a241
commit 944b78a241
parent 6709fbabe0
19 changed files with 32 additions and 27 deletions
--- a/src/plugins/kibana/public/settings/sections/indices/_create.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_create.js
@ -7,7 +7,7 @@ define(function (require) {
  require('ui/directives/auto_select_if_only_one');

  require('ui/routes')
-  .when('/settings/indices/existing', {
+  .when('/settings/indices/create/existing', {
    template: require('plugins/kibana/settings/sections/indices/_create.html')
  });

--- a/src/plugins/kibana/public/settings/sections/indices/_edit.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_edit.html
@ -1,6 +1,6 @@
 <kbn-settings-app section="indices">
  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesEdit">
+    <div ng-controller="settingsIndicesEdit" data-test-subj="editIndexPattern">
      <div class="page-header">
        <kbn-settings-index-header
          index-pattern="indexPattern"
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/index.html
@ -1,6 +1,6 @@
 <kbn-settings-app section="indices">
  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesCreate" class="kbn-settings-indices-create">
+    <div data-test-subj="addData">
      <div class="page-header">
        <h1>Add Data</h1>
        Before we can get to the fun stuff, we'll have to get some data into your Elasticsearch cluster.
@ -8,7 +8,7 @@
      </div>

      <h4>
-        <a href="#/settings/indices/existing">Existing Indices</a>
+        <a href="#/settings/indices/create/existing" data-test-subj="existingIndices">Existing Indices</a>
      </h4>
      <div>
        Pick this option if you already have data in Elasticsearch.
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@ -28,7 +28,7 @@ define(function (require) {
        })
        .then(function (navigateTo) {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/settings/_advanced_settings.js
+++ b/test/functional/apps/settings/_advanced_settings.js
@ -14,7 +14,7 @@ define(function (require) {

        return scenarioManager.reload('emptyKibana')
        .then(function () {
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        });
      });

--- a/test/functional/apps/settings/_creation_form_changes.js
+++ b/test/functional/apps/settings/_creation_form_changes.js
@ -16,7 +16,7 @@ define(function (require) {
      bdd.beforeEach(function () {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        });
      });

--- a/test/functional/apps/settings/_index_pattern_create_delete.js
+++ b/test/functional/apps/settings/_index_pattern_create_delete.js
@ -16,7 +16,7 @@ define(function (require) {

        return scenarioManager.reload('emptyKibana')
        .then(function () {
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        });
      });

@ -81,9 +81,9 @@ define(function (require) {
          });
        });

-        bdd.it('should return to index pattern creation page', function returnToPage() {
+        bdd.it('should return to the add data landing page', function returnToPage() {
          return common.tryForTime(5000, function () {
-            return settingsPage.getCreateButton();
+            return common.findTestSubject('addData');
          })
          .catch(common.handleError(this));
        });
--- a/test/functional/apps/settings/_index_pattern_popularity.js
+++ b/test/functional/apps/settings/_index_pattern_popularity.js
@ -16,7 +16,7 @@ define(function (require) {

        return scenarioManager.reload('emptyKibana')
        .then(function () {
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        });
      });

@ -25,7 +25,7 @@ define(function (require) {
      });

      bdd.afterEach(function ae() {
-        return settingsPage.removeIndexPattern();
+        return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
      });

      bdd.describe('change popularity', function indexPatternCreation() {
--- a/test/functional/apps/settings/_index_pattern_results_sort.js
+++ b/test/functional/apps/settings/_index_pattern_results_sort.js
@ -38,7 +38,7 @@ define(function (require) {
      columns.forEach(function (col) {
        bdd.describe('sort by heading - ' + col.heading, function indexPatternCreation() {
          bdd.before(function () {
-            return settingsPage.navigateTo();
+            return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
          });

          bdd.beforeEach(function () {
@ -46,7 +46,7 @@ define(function (require) {
          });

          bdd.afterEach(function () {
-            return settingsPage.removeIndexPattern();
+            return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
          });

          bdd.it('should sort ascending', function pageHeader() {
@ -84,6 +84,7 @@ define(function (require) {

        bdd.before(function () {
          return settingsPage.navigateTo()
+          .then(settingsPage.clickExistingIndicesAddDataLink)
          .then(function () {
            return settingsPage.createIndexPattern();
          });
--- a/test/functional/apps/settings/_initial_state.js
+++ b/test/functional/apps/settings/_initial_state.js
@ -14,7 +14,7 @@ define(function (require) {

        return scenarioManager.reload('emptyKibana')
        .then(function () {
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        });
      });

--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@ -31,7 +31,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_chart_types.js
+++ b/test/functional/apps/visualize/_chart_types.js
@ -18,7 +18,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@ -31,7 +31,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@ -28,7 +28,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_metric_chart.js
+++ b/test/functional/apps/visualize/_metric_chart.js
@ -34,7 +34,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@ -28,7 +28,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@ -30,7 +30,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@ -30,7 +30,7 @@ define(function (require) {
        return scenarioManager.reload('emptyKibana')
        .then(function () {
          common.debug('navigateTo');
-          return settingsPage.navigateTo();
+          return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
        })
        .then(function () {
          common.debug('createIndexPattern');
--- a/test/support/pages/settings_page.js
+++ b/test/support/pages/settings_page.js
@ -20,6 +20,10 @@ define(function (require) {
      return common.findTestSubject('settingsNav advanced').click();
    },

+    clickExistingIndicesAddDataLink: function () {
+      return common.findTestSubject('addData existingIndices').click();
+    },
+
    setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) {
      var self = this;
      return common.findTestSubject('advancedSetting&' + propertyName + ' editButton')
@ -310,12 +314,12 @@ define(function (require) {
      })
      .then(function () {
        return common.tryForTime(defaultTimeout, function () {
-          return self.remote.getCurrentUrl()
-          .then(function (currentUrl) {
-            if (!currentUrl.match(/indices\/.+\?/)) {
+          return common.findTestSubject('editIndexPattern')
+          .then(function (editPatternContainer) {
+            if (!editPatternContainer) {
              throw new Error('Index pattern not created');
            } else {
-              common.debug('Index pattern created: ' + currentUrl);
+              common.debug('Index pattern created');
            }
          });
        });