From 83595aecd534b924963017c7070e352a3128cec8 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Thu, 16 Jun 2016 14:59:25 -0400
Subject: [PATCH] Undo changes to functional tests for defunct add data landing
 page

---
 test/functional/apps/management/_creation_form_changes.js   | 2 +-
 .../apps/management/_index_pattern_create_delete.js         | 6 +++---
 .../functional/apps/management/_index_pattern_popularity.js | 4 ++--
 .../apps/management/_index_pattern_results_sort.js          | 5 ++---
 test/functional/apps/management/_initial_state.js           | 2 +-
 test/functional/apps/management/_kibana_settings.js         | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/functional/apps/management/_creation_form_changes.js b/test/functional/apps/management/_creation_form_changes.js
index d76f7e75e84c..fb3b8bf497fe 100644
--- a/test/functional/apps/management/_creation_form_changes.js
+++ b/test/functional/apps/management/_creation_form_changes.js
@@ -13,7 +13,7 @@ bdd.describe('user input reactions', function () {
     // delete .kibana index and then wait for Kibana to re-create it
     return esClient.deleteAndUpdateConfigDoc()
     .then(function () {
-      return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+      return settingsPage.navigateTo();
     });
   });
 
diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index a8d318ed7030..1ad16594f7b3 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -14,7 +14,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
     // delete .kibana index and then wait for Kibana to re-create it
     return esClient.deleteAndUpdateConfigDoc()
     .then(function () {
-      return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+      return settingsPage.navigateTo();
     });
   });
 
@@ -78,9 +78,9 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
       });
     });
 
-    bdd.it('should return to the add data landing page', function returnToPage() {
+    bdd.it('should return to index pattern creation page', function returnToPage() {
       return common.try(function tryingForTime() {
-        return common.findTestSubject('addData');
+        return settingsPage.getCreateButton();
       });
     });
 
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index 9687a86be523..97f9d84a6b48 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -13,7 +13,7 @@ bdd.describe('index result popularity', function describeIndexTests() {
     // delete .kibana index and then wait for Kibana to re-create it
     return esClient.deleteAndUpdateConfigDoc()
     .then(function () {
-      return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+      return settingsPage.navigateTo();
     });
   });
 
@@ -22,7 +22,7 @@ bdd.describe('index result popularity', function describeIndexTests() {
   });
 
   bdd.afterEach(function ae() {
-    return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
+    return settingsPage.removeIndexPattern();
   });
 
   bdd.describe('change popularity', function indexPatternCreation() {
diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js
index 8c47511c30db..50e1ade1ac2e 100644
--- a/test/functional/apps/management/_index_pattern_results_sort.js
+++ b/test/functional/apps/management/_index_pattern_results_sort.js
@@ -34,7 +34,7 @@ bdd.describe('index result field sort', function describeIndexTests() {
   columns.forEach(function (col) {
     bdd.describe('sort by heading - ' + col.heading, function indexPatternCreation() {
       bdd.before(function () {
-        return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+        return settingsPage.navigateTo();
       });
 
       bdd.beforeEach(function () {
@@ -42,7 +42,7 @@ bdd.describe('index result field sort', function describeIndexTests() {
       });
 
       bdd.afterEach(function () {
-        return settingsPage.removeIndexPattern().then(settingsPage.clickExistingIndicesAddDataLink);
+        return settingsPage.removeIndexPattern();
       });
 
       bdd.it('should sort ascending', function pageHeader() {
@@ -80,7 +80,6 @@ bdd.describe('index result field sort', function describeIndexTests() {
 
     bdd.before(function () {
       return settingsPage.navigateTo()
-      .then(settingsPage.clickExistingIndicesAddDataLink)
       .then(function () {
         return settingsPage.createIndexPattern();
       });
diff --git a/test/functional/apps/management/_initial_state.js b/test/functional/apps/management/_initial_state.js
index 77c0414c29c9..c5cdc243cba3 100644
--- a/test/functional/apps/management/_initial_state.js
+++ b/test/functional/apps/management/_initial_state.js
@@ -13,7 +13,7 @@ bdd.describe('initial state', function () {
     // delete .kibana index and then wait for Kibana to re-create it
     return esClient.deleteAndUpdateConfigDoc()
     .then(function () {
-      return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+      return settingsPage.navigateTo();
     });
   });
 
diff --git a/test/functional/apps/management/_kibana_settings.js b/test/functional/apps/management/_kibana_settings.js
index 05d5b5c07167..c9f8783d255a 100644
--- a/test/functional/apps/management/_kibana_settings.js
+++ b/test/functional/apps/management/_kibana_settings.js
@@ -13,7 +13,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
     // delete .kibana index and then wait for Kibana to re-create it
     return esClient.deleteAndUpdateConfigDoc()
     .then(function () {
-      return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
+      return settingsPage.navigateTo();
     });
   });