Merge branch 'master' into ftr/clear-browser-storage-between-tests

docs/canvas/canvas-function-reference.asciidoc

@@ -1355,7 +1355,7 @@ Formats a `number` into a formatted `string` using NumeralJS. See http://numeral
 [source,js]
 ----
 formatnumber format=”$0,0.00”
-fortmatnumber “0.0a”
+formatnumber “0.0a”
 ----
 
 *Code example*

packages/kbn-expect/expect.js

@@ -98,6 +98,9 @@ Assertion.prototype.assert = function (truth, msg, error, expected) {
 
   if (!ok) {
     err = new Error(msg.call(this));
+    if (this.customMsg) {
+      err.message = this.customMsg;
+    }
     if (arguments.length > 3) {
       err.actual = this.obj;
       err.expected = expected;
@@ -217,7 +220,10 @@ Assertion.prototype.empty = function () {
  */
 
 Assertion.prototype.be =
-Assertion.prototype.equal = function (obj) {
+Assertion.prototype.equal = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       obj === this.obj
     , function(){ return 'expected ' + i(this.obj) + ' to equal ' + i(obj) }
@@ -231,7 +237,10 @@ Assertion.prototype.equal = function (obj) {
  * @api public
  */
 
-Assertion.prototype.eql = function (obj) {
+Assertion.prototype.eql = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       expect.eql(this.obj, obj)
     , function(){ return 'expected ' + i(this.obj) + ' to sort of equal ' + i(obj) }
@@ -248,7 +257,10 @@ Assertion.prototype.eql = function (obj) {
  * @api public
  */
 
-Assertion.prototype.within = function (start, finish) {
+Assertion.prototype.within = function (start, finish, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   var range = start + '..' + finish;
   this.assert(
       this.obj >= start && this.obj <= finish
@@ -298,7 +310,10 @@ Assertion.prototype.an = function (type) {
  */
 
 Assertion.prototype.greaterThan =
-Assertion.prototype.above = function (n) {
+Assertion.prototype.above = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       this.obj > n
     , function(){ return 'expected ' + i(this.obj) + ' to be above ' + n }
@@ -314,7 +329,10 @@ Assertion.prototype.above = function (n) {
  */
 
 Assertion.prototype.lessThan =
-Assertion.prototype.below = function (n) {
+Assertion.prototype.below = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       this.obj < n
     , function(){ return 'expected ' + i(this.obj) + ' to be below ' + n }
@@ -329,7 +347,10 @@ Assertion.prototype.below = function (n) {
  * @api public
  */
 
-Assertion.prototype.match = function (regexp) {
+Assertion.prototype.match = function (regexp, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       regexp.exec(this.obj)
     , function(){ return 'expected ' + i(this.obj) + ' to match ' + regexp }
@@ -344,7 +365,10 @@ Assertion.prototype.match = function (regexp) {
  * @api public
  */
 
-Assertion.prototype.length = function (n) {
+Assertion.prototype.length = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   expect(this.obj).to.have.property('length');
   var len = this.obj.length;
   this.assert(
@@ -410,7 +434,10 @@ Assertion.prototype.property = function (name, val) {
  */
 
 Assertion.prototype.string =
-Assertion.prototype.contain = function (obj) {
+Assertion.prototype.contain = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   if ('string' == typeof this.obj) {
     this.assert(
         ~this.obj.indexOf(obj)

packages/kbn-expect/expect.js.d.ts

@@ -59,20 +59,20 @@ interface Assertion {
   /**
    * Checks if the obj exactly equals another.
    */
-  equal(obj: any): Assertion;
+  equal(obj: any, msg?: string): Assertion;
 
   /**
    * Checks if the obj sortof equals another.
    */
-  eql(obj: any): Assertion;
+  eql(obj: any, msg?: string): Assertion;
 
   /**
    * Assert within start to finish (inclusive).
    *
    * @param start
    * @param finish
    */
-  within(start: number, finish: number): Assertion;
+  within(start: number, finish: number, msg?: string): Assertion;
 
   /**
    * Assert typeof.
@@ -87,36 +87,36 @@ interface Assertion {
   /**
    * Assert numeric value above n.
    */
-  greaterThan(n: number): Assertion;
+  greaterThan(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value above n.
    */
-  above(n: number): Assertion;
+  above(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value below n.
    */
-  lessThan(n: number): Assertion;
+  lessThan(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value below n.
    */
-  below(n: number): Assertion;
+  below(n: number, msg?: string): Assertion;
 
   /**
    * Assert string value matches regexp.
    *
    * @param regexp
    */
-  match(regexp: RegExp): Assertion;
+  match(regexp: RegExp, msg?: string): Assertion;
 
   /**
    * Assert property "length" exists and has value of n.
    *
    * @param n
    */
-  length(n: number): Assertion;
+  length(n: number, msg?: string): Assertion;
 
   /**
    * Assert property name exists, with optional val.
@@ -129,14 +129,14 @@ interface Assertion {
   /**
    * Assert that string contains str.
    */
-  contain(str: string): Assertion;
-  string(str: string): Assertion;
+  contain(str: string, msg?: string): Assertion;
+  string(str: string, msg?: string): Assertion;
 
   /**
    * Assert that the array contains obj.
    */
-  contain(obj: any): Assertion;
-  string(obj: any): Assertion;
+  contain(obj: any, msg?: string): Assertion;
+  string(obj: any, msg?: string): Assertion;
 
   /**
    * Assert exact keys or inclusion of keys by using the `.own` modifier.

x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx

@@ -229,12 +229,12 @@ export const HostsContainer = React.memo<Props>(({ url }) => (
         />
         <Route
           path={`${url}/:detailName`}
-          render={({ location: { search = '' } }) => (
-            <Redirect
-              from={`${url}/:detailName`}
-              to={`${url}/:detailName/${HostsTableType.authentications}${search}`}
-            />
-          )}
+          render={({
+            match: {
+              params: { detailName },
+            },
+            location: { search = '' },
+          }) => <Redirect to={`${url}/${detailName}/${HostsTableType.authentications}${search}`} />}
         />
         <Route
           path={`/${SiemPageName.hosts}/`}