Issue 6090 - Properly use regexp for message matching and proper console override

test/_common.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 400 matching lines @@
       now: () => currentTime
     }
   };
 };
 
 console.warn = console.log;
 
 exports.silenceWarnOutput = function(test, msg)
 {
   let warnHandler = console.warn;
-  console.warn = s =>
-  {
+  console.warn = (...args) =>
+  {
+    let s = (args[0] instanceof Error ? args[0].message : args[0]);
+
     if (s != msg)
-      warnHandler(s);
+      warnHandler(...args);
   };
   try
   {
     return test();
   }
   finally
   {
     console.warn = warnHandler;
   }
 };
 
 exports.silenceAssertionOutput = function(test, msg)
 {
   let msgMatch = new RegExp("^Error: (.*)[\r\n]");
   let errorHandler = console.error;
-  console.error = s =>

[sergei, 2017/11/28 15:46:22]

should not we wrap even a single argument of the lambdas (also above) in
parentheses? `(s) => ...`

[hub, 2017/11/28 15:54:20]

This follow our code style.

-  {
-    let match = msgMatch.match(s);

[sergei, 2017/11/28 15:46:22]

AFAIR regexp does not have method `match`, it should be either msgMatch.exec or
s.match(msgMatch), IMO the former is better.

[hub, 2017/11/28 15:54:20]

Already fixed in the patch update. I have no idea how I didn't catch it prior to
submission :-/

+  console.error = (...args) =>
+  {
+    let s = (args[0] instanceof Error ? args[0].message : args[0]);
+    let match = s && s.match(msgMatch);
     if (!match || match[1] != msg)
-      errorHandler(s);
+      errorHandler(...args);
   };
   try
   {
     return test();
   }
   finally
   {
     console.error = errorHandler;
   }
 };
@@ skipping 13 matching lines @@
       }
     })
   };
 };
 
 exports.unexpectedError = function(error)
 {
   console.error(error);
   this.ok(false, "Unexpected error: " + error);
 };