Merge branch 'master' into fixTestTimeouts

src/plugins/kibana/public/dashboard/styles/main.less

@@ -147,7 +147,7 @@ dashboard-grid {
       .panel-content {
         display: flex;
         flex: 1 1 100%;
-        height: auto;
+        height: 100%;
       }
     }
   }

src/ui/public/chrome/directives/app_switcher/app_switcher.less

@@ -58,6 +58,7 @@ body { overflow-x: hidden; }
   &.hidden-chrome { left: 0; }
   &-panel {
     .flex-parent(@shrink: 0);
+    height: 100%;
     box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
   }
 

src/ui/public/styles/base.less

@@ -94,6 +94,7 @@ ul.navbar-inline li {
   .flex-parent(@shrink: 0);
   position: relative;
   z-index: 0;
+  max-height: 100%;
   background-color: @white;
 }
 

src/ui/public/visualize/visualize.less

@@ -20,6 +20,7 @@ visualize {
     overflow: auto;
     -webkit-transition: opacity 0.01s;
     transition: opacity 0.01s;
+    max-height: 100%;
 
     &.spy-only {
       display: none;

test/support/pages/common.js

@@ -10,6 +10,9 @@ define(function (require) {
   var parse = require('intern/dojo/node!url').parse;
   var format = require('intern/dojo/node!url').format;
   var path = require('intern/dojo/node!path');
+  var ShieldPage = require('../../support/pages/shield_page');
+
+  var shieldPage;
 
   function injectTimestampQuery(func, url) {
     var formatted = modifyQueryString(url, function (parsed) {
@@ -43,6 +46,7 @@ define(function (require) {
       remote.get.wrapper = injectTimestampQuery;
       this.remote.getCurrentUrl = _.wrap(this.remote.getCurrentUrl, removeTimestampQuery);
     }
+    shieldPage = new ShieldPage(this.remote);
   }
 
 
@@ -90,6 +94,20 @@ define(function (require) {
           .then(function () {
             return self.remote.getCurrentUrl();
           })
+          .then(function (currentUrl) {
+            var loginPage = new RegExp('login').test(currentUrl);
+            if (loginPage) {
+              self.debug('Found loginPage = ' + loginPage + ', username = '
+                + config.servers.kibana.shield.username);
+              return shieldPage.login(config.servers.kibana.shield.username,
+                config.servers.kibana.shield.password)
+              .then(function () {
+                return self.remote.getCurrentUrl();
+              });
+            } else {
+              return currentUrl;
+            }
+          })
           .then(function (currentUrl) {
             currentUrl = currentUrl.replace(/\/\/\w+:\w+@/, '//');
             var navSuccessful = new RegExp(appUrl).test(currentUrl);

test/support/pages/shield_page.js

@@ -0,0 +1,35 @@
+// in test/support/pages/shield_page.js
+define(function (require) {
+  var config = require('intern').config;
+  var defaultTimeout = config.timeouts.default;
+
+  // the page object is created as a constructor
+  // so we can provide the remote Command object
+  // at runtime
+  function ShieldPage(remote) {
+    this.remote = remote;
+  }
+
+  ShieldPage.prototype = {
+    constructor: ShieldPage,
+
+    login: function login(user, pwd) {
+      var remote = this.remote;
+      return remote.setFindTimeout(5000)
+      .findById('username')
+      .type(user)
+      .then(function () {
+        return remote.findById('password')
+        .type(pwd);
+      })
+      .then(function () {
+        return remote.findByCssSelector('.btn')
+        .click();
+      });
+    }
+
+
+  };
+
+  return ShieldPage;
+});