From 78c2d07beee02d0b7d3fc45a5c93f126507f0628 Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Wed, 16 Mar 2016 12:18:38 -0500
Subject: [PATCH] use Count not count on area chart test.  Remove moveMouseTo
 for now.

---
 test/functional/apps/visualize/_area_chart.js |  2 +-
 test/support/pages/visualize_page.js          | 37 ++++++-------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index 4770acd3d726..b7c5617f406c 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -150,7 +150,7 @@ define(function (require) {
             expect(labels).to.eql(yAxisLabels);
           })
           .then(function getAreaChartData() {
-            return visualizePage.getAreaChartData('count');
+            return visualizePage.getAreaChartData('Count');
           })
           .then(function (paths) {
             common.debug('expectedAreaChartData = ' + expectedAreaChartData);
diff --git a/test/support/pages/visualize_page.js b/test/support/pages/visualize_page.js
index b7cea331c958..f39dc71a3ef6 100644
--- a/test/support/pages/visualize_page.js
+++ b/test/support/pages/visualize_page.js
@@ -336,21 +336,13 @@ define(function (require) {
     },
 
     filterVisByName: function filterVisByName(vizName) {
-      var self = this;
       return this.remote
       .findByCssSelector('input[name="filter"]')
-      .then(function (filter) {
-        return self.remote.moveMouseTo(filter);
-      })
-      .then (function () {
-        return self.remote
-        .findByCssSelector('input[name="filter"]')
-        .click()
-        .type(vizName.replace('-',' '));
-      })
-      .then (function () {
-        common.sleep(3000);
-      });
+      .click()
+      // can't uses dashes in saved visualizations when filtering
+      // or extended character sets
+      // https://github.com/elastic/kibana/issues/6300
+      .type(vizName.replace('-',' '));
     },
 
     clickVisualizationByLinkText: function clickVisualizationByLinkText(vizName) {
@@ -359,14 +351,7 @@ define(function (require) {
       return this.remote
       .setFindTimeout(defaultTimeout)
       .findByLinkText(vizName)
-      .then(function (link) {
-        return self.remote.moveMouseTo(link);
-      })
-      .then (function () {
-        return self.remote
-        .findByLinkText(vizName)
-        .click();
-      });
+      .click();
     },
 
     // this starts by clicking the Load Saved Viz button, not from the
@@ -375,18 +360,18 @@ define(function (require) {
       var self = this;
       return this.clickLoadSavedVisButton()
       .then(function filterVisualization() {
-        return self.filterVisByName(vizName);
-      })
-      .then(function clickDashboardByLinkedText() {
-        return self.clickVisualizationByLinkText(vizName);
+        return self.openSavedVisualization(vizName);
       });
     },
 
-    // this starts on the
+    // this is for starting on the
     // bottom half of the "Create a new visualization      Step 1" page
     openSavedVisualization: function openSavedVisualization(vizName) {
       var self = this;
       return self.filterVisByName(vizName)
+      .then(function () {
+        return common.sleep(1000);
+      })
       .then(function clickDashboardByLinkedText() {
         return self.clickVisualizationByLinkText(vizName);
       });