From b531c15f9f0140768652a089777edba978737e2a Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Wed, 3 Feb 2016 16:04:05 -0700
Subject: [PATCH 01/19] add tests immediate fire on register

---
 src/server/status/__tests__/Status.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js
index 8563500a34af..2068e7519375 100644
--- a/src/server/status/__tests__/Status.js
+++ b/src/server/status/__tests__/Status.js
@@ -59,6 +59,18 @@ describe('Status class', function () {
     expect(json.message).to.eql('Ready');
   });
 
+  it('should call handler if status is already matched', function (done) {
+    var status = serverStatus.create('test');
+    var msg = 'Test Ready';
+    status.green(msg);
+
+    status.on('green', function () {
+      expect(arguments.length).to.equal(0);
+      expect(status.message).to.equal(msg);
+      done();
+    });
+  });
+
   function testState(color) {
     it(`should change the state to ${color} when #${color}() is called`, function () {
       var status = serverStatus.create('test');

From bc7183ad0c77ebf9366648c43a96149f6b4fd6b9 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Wed, 3 Feb 2016 16:04:30 -0700
Subject: [PATCH 02/19] make tests pass

---
 src/server/status/Status.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/status/Status.js b/src/server/status/Status.js
index 430d44d0a114..bf9f10d6ca2b 100644
--- a/src/server/status/Status.js
+++ b/src/server/status/Status.js
@@ -36,6 +36,14 @@ class Status extends EventEmitter {
       since: this.since
     };
   }
+
+  on(eventName, handler) {
+    super.on(eventName, handler);
+
+    if (eventName === this.state) {
+      setImmediate(handler);
+    }
+  }
 }
 
 states.all.forEach(function (state) {

From 582937871a081e37e941a8f580ce352d95ea8879 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Wed, 3 Feb 2016 16:19:51 -0700
Subject: [PATCH 03/19] add once handler as well

---
 src/server/status/Status.js           |  8 ++++++++
 src/server/status/__tests__/Status.js | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/server/status/Status.js b/src/server/status/Status.js
index bf9f10d6ca2b..9e11cf6bc190 100644
--- a/src/server/status/Status.js
+++ b/src/server/status/Status.js
@@ -44,6 +44,14 @@ class Status extends EventEmitter {
       setImmediate(handler);
     }
   }
+
+  once(eventName, handler) {
+    if (eventName === this.state) {
+      setImmediate(handler);
+    } else {
+      super.once(eventName, handler);
+    }
+  }
 }
 
 states.all.forEach(function (state) {
diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js
index 2068e7519375..727befb31389 100644
--- a/src/server/status/__tests__/Status.js
+++ b/src/server/status/__tests__/Status.js
@@ -59,7 +59,7 @@ describe('Status class', function () {
     expect(json.message).to.eql('Ready');
   });
 
-  it('should call handler if status is already matched', function (done) {
+  it('should call on handler if status is already matched', function (done) {
     var status = serverStatus.create('test');
     var msg = 'Test Ready';
     status.green(msg);
@@ -71,6 +71,18 @@ describe('Status class', function () {
     });
   });
 
+  it('should call once handler if status is already matched', function (done) {
+    var status = serverStatus.create('test');
+    var msg = 'Test Ready';
+    status.green(msg);
+
+    status.once('green', function () {
+      expect(arguments.length).to.equal(0);
+      expect(status.message).to.equal(msg);
+      done();
+    });
+  });
+
   function testState(color) {
     it(`should change the state to ${color} when #${color}() is called`, function () {
       var status = serverStatus.create('test');

From 14061b814e7cb7e5c97379b71c4b5eace534f069 Mon Sep 17 00:00:00 2001
From: Rashid Khan <github.fliplap@spamgourmet.com>
Date: Tue, 8 Mar 2016 08:53:57 -0700
Subject: [PATCH 04/19] Update error timeout and test

---
 src/ui/public/notify/__tests__/notifier.js | 4 ++--
 src/ui/public/notify/notifier.js           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js
index a7febe7c5b93..60630b5df951 100644
--- a/src/ui/public/notify/__tests__/notifier.js
+++ b/src/ui/public/notify/__tests__/notifier.js
@@ -43,8 +43,8 @@ describe('Notifier', function () {
       expect(notify('error').title).to.equal('Error');
     });
 
-    it('sets lifetime to Infinity', function () {
-      expect(notify('error').lifetime).to.equal(Infinity);
+    it('sets lifetime to 5 minutes', function () {
+      expect(notify('error').lifetime).to.equal(300000);
     });
 
     it('allows reporting', function () {
diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js
index 332961e94e41..e2ff33b3901e 100644
--- a/src/ui/public/notify/notifier.js
+++ b/src/ui/public/notify/notifier.js
@@ -229,7 +229,7 @@ Notifier.prototype.error = function (err, cb) {
     content: formatMsg(err, this.from),
     icon: 'warning',
     title: 'Error',
-    lifetime: Infinity,
+    lifetime: 300000,
     actions: ['report', 'accept'],
     stack: formatStack(err)
   }, cb);

From fe0ced0f735db96a1d17ca3e8b75a00fb59a0ab1 Mon Sep 17 00:00:00 2001
From: Shelby Sturgis <shelbyjsturgis@gmail.com>
Date: Fri, 11 Mar 2016 14:16:15 -0800
Subject: [PATCH 05/19] Closes #6516. Fixes issue with query string not being
 added to base path.

---
 src/ui/public/chrome/api/nav.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
index 297df1543be3..0b630a2eccd1 100644
--- a/src/ui/public/chrome/api/nav.js
+++ b/src/ui/public/chrome/api/nav.js
@@ -18,7 +18,7 @@ export default function (chrome, internals) {
     var isUrl = url && isString(url);
     if (!isUrl) return url;
 
-    var parsed = parse(url);
+    var parsed = parse(url, true);
     if (!parsed.host && parsed.pathname) {
       if (parsed.pathname[0] === '/') {
         parsed.pathname = chrome.getBasePath() + parsed.pathname;

From c7d2f89cbcbc3e2150a5efc834c05958dc9333bd Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Fri, 11 Mar 2016 16:01:49 -0700
Subject: [PATCH 06/19] [cli/serve] expand dot-notated keys in yaml arrays

---
 src/cli/serve/read_yaml_config.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
index 0c28635eddc7..d5d4c2800af0 100644
--- a/src/cli/serve/read_yaml_config.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -48,7 +48,14 @@ module.exports = function (path) {
       _.forOwn(val, function (subVal, subKey) {
         apply(config, subVal, key + '.' + subKey);
       });
-    } else {
+    }
+    else if (_.isArray(val)) {
+      config[key] = [];
+      val.forEach((subVal, i) => {
+        apply(config, subVal, key + '.' + i);
+      });
+    }
+    else {
       _.set(config, key, val);
     }
   }

From 89aff0210ff00bd24e0c915cecb98c5104ff43d7 Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Mon, 14 Mar 2016 14:40:53 -0500
Subject: [PATCH 07/19] Changes to methods for getting more specific chart data
 to cover integration testing.

---
 test/functional/apps/visualize/_area_chart.js |   2 +-
 test/functional/apps/visualize/_line_chart.js |   2 +-
 test/support/pages/visualize_page.js          | 124 ++++++++++++------
 3 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index a456dfec3ed7..4770acd3d726 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();
+            return visualizePage.getAreaChartData('count');
           })
           .then(function (paths) {
             common.debug('expectedAreaChartData = ' + expectedAreaChartData);
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index 539758e69bb6..823a34acc51f 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -122,7 +122,7 @@ define(function (require) {
           // sleep a bit before trying to get the chart data
           return common.sleep(3000)
           .then(function () {
-            return visualizePage.getLineChartData()
+            return visualizePage.getLineChartData('fill="#57c17b"')
             .then(function showData(data) {
               var tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
               for (var x = 0; x < data.length; x++) {
diff --git a/test/support/pages/visualize_page.js b/test/support/pages/visualize_page.js
index 2ac4fbb2484d..b7cea331c958 100644
--- a/test/support/pages/visualize_page.js
+++ b/test/support/pages/visualize_page.js
@@ -327,22 +327,71 @@ define(function (require) {
       });
     },
 
-    // saved visualizations are paginated 5 to a page!
-    loadSavedVisualization: function loadSavedVisualization(vizName) {
-      var self = this;
+
+    clickLoadSavedVisButton: function clickLoadSavedVisButton() {
       return this.remote
       .setFindTimeout(defaultTimeout)
       .findByCssSelector('button.ng-scope[aria-label="Load Saved Visualization"]')
-      .click()
-      .then(function findVizByLinkedText() {
-        common.debug('Load Saved Vis button clicked');
+      .click();
+    },
+
+    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);
+      });
+    },
+
+    clickVisualizationByLinkText: function clickVisualizationByLinkText(vizName) {
+      var self = this;
+      common.debug('clickVisualizationByLinkText(' + vizName + ')');
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByLinkText(vizName)
+      .then(function (link) {
+        return self.remote.moveMouseTo(link);
+      })
+      .then (function () {
         return self.remote
-        .setFindTimeout(defaultTimeout)
         .findByLinkText(vizName)
         .click();
       });
     },
 
+    // this starts by clicking the Load Saved Viz button, not from the
+    // bottom half of the "Create a new visualization      Step 1" page
+    loadSavedVisualization: function loadSavedVisualization(vizName) {
+      var self = this;
+      return this.clickLoadSavedVisButton()
+      .then(function filterVisualization() {
+        return self.filterVisByName(vizName);
+      })
+      .then(function clickDashboardByLinkedText() {
+        return self.clickVisualizationByLinkText(vizName);
+      });
+    },
+
+    // this starts 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 clickDashboardByLinkedText() {
+        return self.clickVisualizationByLinkText(vizName);
+      });
+    },
+
     getXAxisLabels: function getXAxisLabels() {
       return this.remote
       .setFindTimeout(defaultTimeout)
@@ -385,7 +434,7 @@ define(function (require) {
      ** This method gets the chart data and scales it based on chart height and label.
      ** Returns an array of height values
      */
-    getAreaChartData: function getAreaChartData() {
+    getAreaChartData: function getAreaChartData(aggregateName) {
 
       var self = this.remote;
       var chartData = [];
@@ -404,7 +453,7 @@ define(function (require) {
         return y.getVisibleText();
       })
       .then(function (yLabel) {
-        yAxisLabel = yLabel.replace(',', '');
+        yAxisLabel = yLabel.replace(',', '').replace('%','');
         common.debug('yAxisLabel = ' + yAxisLabel);
         return yLabel;
       })
@@ -423,43 +472,27 @@ define(function (require) {
       })
       .then(function () {
         return self.setFindTimeout(defaultTimeout * 2)
-        .findAllByCssSelector('path')
-        .then(function (chartTypes) {
-
-          function getChartType(chart) {
-            return chart
-            .getAttribute('data-label')
-            .then(function (chartString) {
-              //common.debug('data-label  = ' + chartString);
-              if (chartString === 'Count') {
-                return chart.getAttribute('d')
-                .then(function (data) {
-                  common.debug(data);
-                  tempArray = data.split('L');
-                  chartSections = tempArray.length / 2;
-                  common.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
-                  chartData[0] = Math.round((yAxisHeight - tempArray[0].split(',')[1]) / yAxisHeight * yAxisLabel);
-                  common.debug('chartData[0] =' + chartData[0]);
-                  for (var i = 1; i < chartSections; i++) {
-                    chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) / yAxisHeight * yAxisLabel);
-                    common.debug('chartData[i] =' + chartData[i]);
-                  }
-                  return chartData;
-                });
-              }
-            });
-          }
-          var getChartTypesPromises = chartTypes.map(getChartType);
-          return Promise.all(getChartTypesPromises);
-        });
+        .findByCssSelector('path[data-label="' + aggregateName + '"]');
       })
-      .then(function (chartData) {
-        return chartData[1]; // MAGIC NUMBER - we find multiple 'path's and only one of them is the right one.
+      .then(function (chart) {
+        return chart.getAttribute('d');
+      })
+      .then(function (data) {
+        common.debug(data);
+        tempArray = data.replace('M','').split('L');
+        chartSections = tempArray.length / 2;
+        common.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
+        for (var i = 0; i < chartSections; i++) {
+          chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) / yAxisHeight * yAxisLabel);
+          common.debug('chartData[i] =' + chartData[i]);
+        }
+        return chartData;
       });
     },
 
+
     // The current test shows dots, not a line.  This function gets the dots and normalizes their height.
-    getLineChartData: function getLineChartData() {
+    getLineChartData: function getLineChartData(cssPart) {
       var self = this.remote;
       var yAxisLabel = 0;
       var yAxisHeight;
@@ -502,7 +535,7 @@ define(function (require) {
             // 5). for each chart element, find the green circle, then the cy position
             function getChartType(chart) {
               return chart
-              .findByCssSelector('circle[fill="#57c17b"]')
+              .findByCssSelector('circle[' + cssPart + ']')
               .then(function (circleObject) {
                 // common.debug('circleObject = ' + circleObject + ' yAxisHeight= ' + yAxisHeight + ' yAxisLabel= ' + yAxisLabel);
                 return circleObject
@@ -636,6 +669,13 @@ define(function (require) {
       .getVisibleText();
     },
 
+    getMarkdownData: function getMarkdownData() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('visualize.ng-isolate-scope')
+      .getVisibleText();
+    },
+
     clickColumns: function clickColumns() {
       return this.remote
       .setFindTimeout(defaultTimeout)

From e1168c52194536405568576aba59b5a777bb3399 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Mon, 14 Mar 2016 15:23:49 -0700
Subject: [PATCH 08/19] match arguments of state emit

---
 src/server/status/Status.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/status/Status.js b/src/server/status/Status.js
index 9e11cf6bc190..2ae32749b958 100644
--- a/src/server/status/Status.js
+++ b/src/server/status/Status.js
@@ -41,13 +41,13 @@ class Status extends EventEmitter {
     super.on(eventName, handler);
 
     if (eventName === this.state) {
-      setImmediate(handler);
+      setImmediate(() => handler(this.state, this.message));
     }
   }
 
   once(eventName, handler) {
     if (eventName === this.state) {
-      setImmediate(handler);
+      setImmediate(() => handler(this.state, this.message));
     } else {
       super.once(eventName, handler);
     }

From 8b3416e269ad7d997f126ec30821a147e3074f2b Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Mon, 14 Mar 2016 15:24:16 -0700
Subject: [PATCH 09/19] update tests, check for listener arguments

---
 src/server/status/__tests__/Status.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js
index 727befb31389..080cfb41163d 100644
--- a/src/server/status/__tests__/Status.js
+++ b/src/server/status/__tests__/Status.js
@@ -4,7 +4,6 @@ var Status = require('../Status');
 var ServerStatus = require('../ServerStatus');
 
 describe('Status class', function () {
-
   var server;
   var serverStatus;
 
@@ -64,8 +63,10 @@ describe('Status class', function () {
     var msg = 'Test Ready';
     status.green(msg);
 
-    status.on('green', function () {
-      expect(arguments.length).to.equal(0);
+    status.on('green', function (prev, prevMsg) {
+      expect(arguments.length).to.equal(2);
+      expect(prev).to.be('green');
+      expect(prevMsg).to.be(msg);
       expect(status.message).to.equal(msg);
       done();
     });
@@ -76,8 +77,10 @@ describe('Status class', function () {
     var msg = 'Test Ready';
     status.green(msg);
 
-    status.once('green', function () {
-      expect(arguments.length).to.equal(0);
+    status.once('green', function (prev, prevMsg) {
+      expect(arguments.length).to.equal(2);
+      expect(prev).to.be('green');
+      expect(prevMsg).to.be(msg);
       expect(status.message).to.equal(msg);
       done();
     });

From aeecf17b552da91ba93e0ae633c3bb0289e938ae Mon Sep 17 00:00:00 2001
From: Nicolas Bevacqua <nicolasbevacqua@gmail.com>
Date: Tue, 15 Mar 2016 13:43:51 -0300
Subject: [PATCH 10/19] [ui/toast] Added a "Less Info" button to toast
 messages. Fixes #5190

---
 src/ui/public/notify/partials/toaster.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ui/public/notify/partials/toaster.html b/src/ui/public/notify/partials/toaster.html
index 52a2e83a067d..b1679f1082a2 100644
--- a/src/ui/public/notify/partials/toaster.html
+++ b/src/ui/public/notify/partials/toaster.html
@@ -16,6 +16,13 @@
             ng-class="'btn-' + notif.type"
             ng-click="notif.showStack = true"
             >More Info</button>
+          <button
+            type="button"
+            ng-if="notif.stack && notif.showStack"
+            class="btn"
+            ng-class="'btn-' + notif.type"
+            ng-click="notif.showStack = false"
+            >Less Info</button>
           <button
             type="button"
             ng-if="notif.accept"

From f85d0a5cefe93f72fcbf803f5bd45ee8a177d240 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Tue, 15 Mar 2016 14:18:44 -0700
Subject: [PATCH 11/19] [chrome/nav] test that chrome.addBasePath() keeps
 querystring

---
 src/ui/public/chrome/api/__tests__/nav.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js
index e3c89deedd60..2161c63d6ce7 100644
--- a/src/ui/public/chrome/api/__tests__/nav.js
+++ b/src/ui/public/chrome/api/__tests__/nav.js
@@ -36,5 +36,10 @@ describe('chrome nav apis', function () {
       const chrome = getChrome();
       expect(chrome.addBasePath('http://github.com/elastic/kibana')).to.be('http://github.com/elastic/kibana');
     });
+
+    it('includes the query string', function () {
+      const chrome = getChrome();
+      expect(chrome.addBasePath('/app/kibana?a=b')).to.be(`${basePath}/app/kibana?a=b`);
+    });
   });
 });

From 02d2210572bc56cb80899d02386550ac7c089284 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srloomis@us.ibm.com>
Date: Wed, 16 Mar 2016 09:50:32 -0700
Subject: [PATCH 12/19] Update CONTRIBUTING.md

* fix a redirected link
* Update docs to mention using a recent Firefox, and use of PATH.
---
 CONTRIBUTING.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19dffe7114a1..0d08e6c5e0ab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -146,7 +146,8 @@ Run the tests for just your particular plugin. Assuming you plugin lives outside
 
 #### Running browser automation tests:
 
-*The Selenium server that is started currently only runs the tests in Firefox*
+*The Selenium server that is started currently only runs the tests in a recent version of Firefox.*
+*You can use the `PATH` environment variable to specify which version of Firefox to use.*
 
 The following will start Kibana, Elasticsearch and Selenium for you. To run the functional UI tests use the following commands
 
@@ -177,7 +178,7 @@ npm run test:ui:runner
 - These tests have been developed and tested with Chrome and Firefox browser.  In theory, they should work on all browsers (that's the benefit of Intern using Leadfoot).
 - These tests should also work with an external testing service like https://saucelabs.com/ or https://www.browserstack.com/ but that has not been tested.
 - https://theintern.github.io/
-- https://theintern.github.io/leadfoot/Element.html
+- https://theintern.github.io/leadfoot/module-leadfoot_Element.html
 
 #### Building OS packages
 

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 13/19] 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);
       });

From d179da582010c6186ef65dbc491e91335d3aa13a Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Wed, 16 Mar 2016 14:55:48 -0500
Subject: [PATCH 14/19] Removed about 5 uneccessary promise chains.

---
 test/support/pages/visualize_page.js | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/test/support/pages/visualize_page.js b/test/support/pages/visualize_page.js
index f39dc71a3ef6..76f006e8b183 100644
--- a/test/support/pages/visualize_page.js
+++ b/test/support/pages/visualize_page.js
@@ -434,9 +434,7 @@ define(function (require) {
       return this.remote
       .setFindTimeout(defaultTimeout)
       .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
-      .then(function setYAxisLabel(y) {
-        return y.getVisibleText();
-      })
+      .getVisibleText()
       .then(function (yLabel) {
         yAxisLabel = yLabel.replace(',', '').replace('%','');
         common.debug('yAxisLabel = ' + yAxisLabel);
@@ -446,10 +444,8 @@ define(function (require) {
       .then(function () {
         return self
         .setFindTimeout(defaultTimeout)
-        .findByCssSelector('rect.background'); // different here
-      })
-      .then(function (chartAreaObj) {
-        return chartAreaObj.getAttribute('height');
+        .findByCssSelector('rect.background') // different here
+        .getAttribute('height');
       })
       .then(function (chartH) {
         yAxisHeight = chartH;
@@ -457,10 +453,8 @@ define(function (require) {
       })
       .then(function () {
         return self.setFindTimeout(defaultTimeout * 2)
-        .findByCssSelector('path[data-label="' + aggregateName + '"]');
-      })
-      .then(function (chart) {
-        return chart.getAttribute('d');
+        .findByCssSelector('path[data-label="' + aggregateName + '"]')
+        .getAttribute('d');
       })
       .then(function (data) {
         common.debug(data);
@@ -486,10 +480,7 @@ define(function (require) {
       return this.remote
         .setFindTimeout(defaultTimeout)
         .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
-        .then(function setYAxisLabel(y) {
-          return y
-          .getVisibleText();
-        })
+        .getVisibleText()
         .then(function (yLabel) {
           yAxisLabel = yLabel.replace(',', '');
           common.debug('yAxisLabel = ' + yAxisLabel);
@@ -500,10 +491,7 @@ define(function (require) {
           return self
           .setFindTimeout(defaultTimeout)
           .findByCssSelector('clipPath rect')
-          .then(function getRectHeight(chartAreaObj) {
-            return chartAreaObj
-            .getAttribute('height');
-          })
+          .getAttribute('height')
           .then(function (theHeight) {
             yAxisHeight = theHeight - 5; // MAGIC NUMBER - clipPath extends a bit above the top of the y-axis and below x-axis
             common.debug('theHeight = ' + theHeight);

From 017a6117f76192950d942e0a460073e704a7b28f Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Wed, 16 Mar 2016 18:01:10 -0400
Subject: [PATCH 15/19] Update ingest API for ES 5.0 mapping changes

---
 .../create_mappings_from_pattern_fields.js    | 10 ++---
 .../create_mappings_from_pattern_fields.js    |  7 ++--
 .../server/routes/api/ingest/register_post.js |  5 +--
 test/unit/api/ingest/_post.js                 | 38 ++++++++++++++++---
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
index cf4563458ece..7444d3838463 100644
--- a/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
+++ b/src/plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
@@ -39,21 +39,21 @@ describe('createMappingsFromPatternFields', function () {
     let mappings = createMappingsFromPatternFields(testFields);
 
     _.forEach(mappings, function (mapping) {
-      if (mapping.type !== 'string') {
+      if (mapping.type !== 'text') {
         expect(_.isEqual(mapping, {
           type: mapping.type,
-          index: 'not_analyzed',
+          index: true,
           doc_values: true
         })).to.be.ok();
       }
     });
   });
 
-  it('should give strings a multi-field mapping', function () {
+  it('should give strings a multi-field mapping with a "text" base type', function () {
     let mappings = createMappingsFromPatternFields(testFields);
 
     _.forEach(mappings, function (mapping) {
-      if (mapping.type === 'string') {
+      if (mapping.type === 'text') {
         expect(mapping).to.have.property('fields');
       }
     });
@@ -68,7 +68,7 @@ describe('createMappingsFromPatternFields', function () {
     expect(mappings.geo.properties).to.have.property('coordinates');
     expect(_.isEqual(mappings.geo.properties.coordinates, {
       type: 'geo_point',
-      index: 'not_analyzed',
+      index: true,
       doc_values: true
     })).to.be.ok();
   });
diff --git a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
index d05e65099161..b9ee189e35c4 100644
--- a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
+++ b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
@@ -13,10 +13,9 @@ module.exports = function createMappingsFromPatternFields(fields) {
 
     if (field.type === 'string') {
       mapping = {
-        type: 'string',
-        index: 'analyzed',
+        type: 'text',
         fields: {
-          raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
+          raw: {type: 'keyword', ignore_above: 256}
         }
       };
     }
@@ -24,7 +23,7 @@ module.exports = function createMappingsFromPatternFields(fields) {
       const fieldType = field.type === 'number' ? 'double' : field.type;
       mapping = {
         type: fieldType,
-        index: 'not_analyzed',
+        index: true,
         doc_values: true
       };
     }
diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js
index fe944f530705..a4e259d6efae 100644
--- a/src/plugins/kibana/server/routes/api/ingest/register_post.js
+++ b/src/plugins/kibana/server/routes/api/ingest/register_post.js
@@ -58,10 +58,9 @@ module.exports = function registerPost(server) {
                       match: '*',
                       match_mapping_type: 'string',
                       mapping: {
-                        type: 'string',
-                        index: 'analyzed',
+                        type: 'text',
                         fields: {
-                          raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
+                          raw: {type: 'keyword', ignore_above: 256}
                         }
                       }
                     }
diff --git a/test/unit/api/ingest/_post.js b/test/unit/api/ingest/_post.js
index d2e986ca176a..06df94ec319a 100644
--- a/test/unit/api/ingest/_post.js
+++ b/test/unit/api/ingest/_post.js
@@ -12,7 +12,12 @@ define(function (require) {
       });
 
       bdd.afterEach(function () {
-        return request.del('/kibana/ingest/logstash-*');
+        return request.del('/kibana/ingest/logstash-*')
+        .then(function () {
+          return scenarioManager.client.indices.delete({
+            index: 'logstash-*'
+          });
+        });
       });
 
       bdd.it('should return 400 for an invalid payload', function invalidPayload() {
@@ -57,6 +62,29 @@ define(function (require) {
           });
       });
 
+      bdd.it('should successfully create new indices based on the template', function newIndices() {
+        return request.post('/kibana/ingest')
+          .send(createTestData())
+          .expect(204)
+          .then(function () {
+            return scenarioManager.client.create({
+              index: 'logstash-1',
+              type: 'foo',
+              id: '1',
+              body: {
+                ip: '192.168.1.1',
+                '@timestamp': '2015-09-20T10:28:22.684Z',
+                agent: 'Jack',
+                bytes: 9001,
+                geo: {coordinates: {lat: 43.07260861, lon: -92.61077833}}
+              }
+            })
+            .then(function (response) {
+              expect(response.created).to.be.ok();
+            });
+          });
+      });
+
       bdd.it('should provide defaults for field properties', function createTemplate() {
         return request.post('/kibana/ingest')
           .send(createTestData())
@@ -92,15 +120,15 @@ define(function (require) {
             .then(function (template) {
               var mappings = template['kibana-logstash-*'].mappings._default_.properties;
               expect(mappings).to.be.ok();
-              expect(_.isEqual(mappings.ip, {index: 'not_analyzed', type: 'ip', doc_values: true})).to.be.ok();
-              expect(_.isEqual(mappings['@timestamp'], {index: 'not_analyzed', type: 'date', doc_values: true})).to.be.ok();
-              expect(_.isEqual(mappings.bytes, {index: 'not_analyzed', type: 'double', doc_values: true})).to.be.ok();
+              expect(_.isEqual(mappings.ip, {index: true, type: 'ip', doc_values: true})).to.be.ok();
+              expect(_.isEqual(mappings['@timestamp'], {index: true, type: 'date', doc_values: true})).to.be.ok();
+              expect(_.isEqual(mappings.bytes, {index: true, type: 'double', doc_values: true})).to.be.ok();
 
               // object fields are mapped as such, with individual mappings for each of their properties
               expect(_.isEqual(mappings.geo, {
                 properties: {
                   coordinates: {
-                    index: 'not_analyzed',
+                    index: true,
                     type: 'geo_point',
                     doc_values: true
                   }

From 8fce2d2e5cd3915a017467ee754bf2ce6932fbcf Mon Sep 17 00:00:00 2001
From: Nicolas Bevacqua <nicolasbevacqua@gmail.com>
Date: Thu, 17 Mar 2016 14:19:36 -0300
Subject: [PATCH 16/19] [cli] Cross-platform CLI execution of "npm start".
 Fixes #4962

---
 CONTRIBUTING.md | 2 +-
 package.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19dffe7114a1..ada37777322f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,7 +55,7 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
   npm run elasticsearch
   ```
 
-- Start the development server.
+- Start the development server. _On Windows, you'll need you use Git Bash, Cygwin, or a similar shell that exposes the `sh` command._
 
   ```sh
   npm start
diff --git a/package.json b/package.json
index 4374c5056995..fb15b12a3c14 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "test:coverage": "grunt test:coverage",
     "build": "grunt build",
     "build:ospackages": "grunt build --os-packages",
-    "start": "./bin/kibana --dev",
+    "start": "sh ./bin/kibana --dev",
     "precommit": "grunt precommit",
     "karma": "karma start",
     "elasticsearch": "grunt esvm:dev:keepalive",

From 79739ab5ce81acc1ecba241364fdf196edc57cbf Mon Sep 17 00:00:00 2001
From: Nicolas Bevacqua <nicolasbevacqua@gmail.com>
Date: Thu, 17 Mar 2016 21:05:15 -0300
Subject: [PATCH 17/19] Ignore OS-specific files in other operating systems.
 Fixes #4460

---
 package.json                    |  1 +
 tasks/build/index.js            |  1 +
 tasks/build/os_shell_scripts.js | 42 +++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 tasks/build/os_shell_scripts.js

diff --git a/package.json b/package.json
index 4374c5056995..d02e318d4d6e 100644
--- a/package.json
+++ b/package.json
@@ -179,6 +179,7 @@
     "makelogs": "3.0.0-beta3",
     "marked-text-renderer": "0.1.0",
     "mocha": "2.3.0",
+    "ncp": "2.0.0",
     "nock": "2.10.0",
     "npm": "2.11.0",
     "portscanner": "1.0.0",
diff --git a/tasks/build/index.js b/tasks/build/index.js
index 0f7c4d00de24..6a5ea09914a9 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -22,6 +22,7 @@ module.exports = function (grunt) {
       'stop:optimizeBuild',
       '_build:downloadNodeBuilds:finish',
       '_build:versionedLinks',
+      '_build:osShellScripts',
       '_build:archives',
       grunt.option('os-packages') ? [
         '_build:pleaseRun',
diff --git a/tasks/build/os_shell_scripts.js b/tasks/build/os_shell_scripts.js
new file mode 100644
index 000000000000..0e511869ec65
--- /dev/null
+++ b/tasks/build/os_shell_scripts.js
@@ -0,0 +1,42 @@
+import {unlink} from 'fs';
+import {join, extname} from 'path';
+import {promisify} from 'bluebird';
+import {ncp} from 'ncp';
+const pncp = promisify(ncp);
+const punlink = promisify(unlink);
+
+export default function (grunt) {
+  grunt.registerTask('_build:osShellScripts', async function osShellScripts() {
+    const done = this.async();
+    const source = 'build/kibana/bin';
+    const platforms = grunt.config.get('platforms');
+    const allPlatforms = fn => invokeAllAsync(platforms, fn);
+
+    try {
+      await allPlatforms(platform => punlink(join(platform.buildDir, 'bin')));
+      await allPlatforms(platform => pncp(source, join(platform.buildDir, 'bin')));
+      await allPlatforms(platform => removeExtraneousShellScripts(grunt, platform));
+      done();
+    } catch (err) {
+      done(err);
+    }
+  });
+};
+
+function invokeAllAsync(all, fn) {
+  return Promise.all(all.map(fn));
+}
+
+function removeExtraneousShellScripts(grunt, platform) {
+  return Promise.all(grunt.file
+    .expand(join(platform.buildDir, 'bin', '*'))
+    .filter(file => isExtraneous(platform, file))
+    .map(file => punlink(file)));
+}
+
+function isExtraneous(platform, file) {
+  const ext = extname(file);
+  if (platform.win && ext === '') { return true; }
+  if (!platform.win && ext === '.bat') { return true; }
+  return false;
+}

From 91366a651abe2ead66a2e621c52bce2e7acaab06 Mon Sep 17 00:00:00 2001
From: LeeDr <lee.drengenberg@elastic.co>
Date: Fri, 18 Mar 2016 11:30:19 -0500
Subject: [PATCH 18/19] Minor updates from code review.

---
 test/support/pages/visualize_page.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/support/pages/visualize_page.js b/test/support/pages/visualize_page.js
index 76f006e8b183..0732b6796499 100644
--- a/test/support/pages/visualize_page.js
+++ b/test/support/pages/visualize_page.js
@@ -436,7 +436,9 @@ define(function (require) {
       .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
       .getVisibleText()
       .then(function (yLabel) {
-        yAxisLabel = yLabel.replace(',', '').replace('%','');
+        // since we're going to use the y-axis 'last' (top) label as a number to
+        // scale the chart pixel data, we need to clean out commas and % marks.
+        yAxisLabel = yLabel.replace(/(%|,)/g, '');
         common.debug('yAxisLabel = ' + yAxisLabel);
         return yLabel;
       })
@@ -458,6 +460,10 @@ define(function (require) {
       })
       .then(function (data) {
         common.debug(data);
+        // This area chart data starts with a 'M'ove to a x,y location, followed
+        // by a bunch of 'L'ines from that point to the next.  Those points are
+        // the values we're going to use to calculate the data values we're testing.
+        // So git rid of the one 'M' and split the rest on the 'L's.
         tempArray = data.replace('M','').split('L');
         chartSections = tempArray.length / 2;
         common.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);

From 849a4997718153c5cdc34fd62313cd452be776a7 Mon Sep 17 00:00:00 2001
From: Nicolas Bevacqua <nicolasbevacqua@gmail.com>
Date: Fri, 18 Mar 2016 13:55:00 -0300
Subject: [PATCH 19/19] [hotfix/build] Fix a bug where removing a directory
 failed under Linux systems

---
 tasks/build/os_shell_scripts.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/build/os_shell_scripts.js b/tasks/build/os_shell_scripts.js
index 0e511869ec65..60817935387d 100644
--- a/tasks/build/os_shell_scripts.js
+++ b/tasks/build/os_shell_scripts.js
@@ -1,9 +1,9 @@
-import {unlink} from 'fs';
 import {join, extname} from 'path';
 import {promisify} from 'bluebird';
 import {ncp} from 'ncp';
+import rimraf from 'rimraf';
 const pncp = promisify(ncp);
-const punlink = promisify(unlink);
+const primraf = promisify(rimraf);
 
 export default function (grunt) {
   grunt.registerTask('_build:osShellScripts', async function osShellScripts() {
@@ -13,7 +13,7 @@ export default function (grunt) {
     const allPlatforms = fn => invokeAllAsync(platforms, fn);
 
     try {
-      await allPlatforms(platform => punlink(join(platform.buildDir, 'bin')));
+      await allPlatforms(platform => primraf(join(platform.buildDir, 'bin')));
       await allPlatforms(platform => pncp(source, join(platform.buildDir, 'bin')));
       await allPlatforms(platform => removeExtraneousShellScripts(grunt, platform));
       done();
@@ -31,7 +31,7 @@ function removeExtraneousShellScripts(grunt, platform) {
   return Promise.all(grunt.file
     .expand(join(platform.buildDir, 'bin', '*'))
     .filter(file => isExtraneous(platform, file))
-    .map(file => punlink(file)));
+    .map(file => primraf(file)));
 }
 
 function isExtraneous(platform, file) {