Issue 6959 - Use async/await in test/browser/elemHideEmulation.js

test/browser/elemHideEmulation.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 130 matching lines @@
 // Insert a <div> with a unique id and a CSS rule
 // for the the selector matching the id.
 function createElementWithStyle(styleBlock, parent)
 {
   let element = createElement(parent);
   insertStyleRule("#" + element.id + " " + styleBlock);
   return element;
 }
 
 // Create a new ElemHideEmulation instance with @selectors.
-function applyElemHideEmulation(selectors)
+async function applyElemHideEmulation(selectors, test)
 {
-  return Promise.resolve().then(() =>
+  await Promise.resolve();

[Manish Jethani, 2019/01/17 08:03:33]

This should not be necessary but I left it in for compatibility with the
previous version. We should be able to just create the ElemHideEmulation object
and apply the selectors synchronously.

+
+  let elemHideEmulation = null;
+
+  try
   {
-    let elemHideEmulation = new ElemHideEmulation(
+    elemHideEmulation = new ElemHideEmulation(
       elems =>
       {
         for (let elem of elems)
           elem.style.display = "none";
       }
     );
 
     elemHideEmulation.document = testDocument;
     elemHideEmulation.MIN_INVOCATION_INTERVAL = REFRESH_INTERVAL / 2;
     elemHideEmulation.apply(selectors.map(
       selector => ({selector, text: selector})
     ));
-    return elemHideEmulation;
-  });
+  }
+  catch (error)
+  {
+    if (!test)

[Manish Jethani, 2019/01/17 08:03:33]

This should not be necessary if every call to this function passes in the test
object.

[Manish Jethani, 2019/01/17 08:04:36]

Removed now.

+      throw error;
+
+    unexpectedError.call(test, error);
+    return null;
+  }
+
+  return elemHideEmulation;
 }
 
-exports.testVerbatimPropertySelector = function(test)
+exports.testVerbatimPropertySelector = async function(test)
 {
   let toHide = createElementWithStyle("{background-color: #000}");
-  applyElemHideEmulation(
-    [":-abp-properties(background-color: rgb(0, 0, 0))"]
-  ).then(() =>
+
+  if (await applyElemHideEmulation(
+        [":-abp-properties(background-color: rgb(0, 0, 0))"],
+        test
+      ))
   {
     expectHidden(test, toHide);
-  }).catch(unexpectedError.bind(test)).then(() => test.done());
+  }
+
+  test.done();
 };
 
-exports.testVerbatimPropertySelectorWithPrefix = function(test)
+exports.testVerbatimPropertySelectorWithPrefix = async function(test)
 {
   let parent = createElementWithStyle("{background-color: #000}");
   let toHide = createElementWithStyle("{background-color: #000}", parent);
-  applyElemHideEmulation(
-    ["div > :-abp-properties(background-color: rgb(0, 0, 0))"]
-  ).then(() =>
+
+  if (await applyElemHideEmulation(
+        ["div > :-abp-properties(background-color: rgb(0, 0, 0))"],
+        test
+      ))
   {
     expectVisible(test, parent);
     expectHidden(test, toHide);
-  }).catch(unexpectedError.bind(test)).then(() => test.done());
+  }
+
+  test.done();
 };
 
 exports.testVerbatimPropertySelectorWithPrefixNoMatch = function(test)
 {
   let parent = createElementWithStyle("{background-color: #000}");
   let toHide = createElementWithStyle("{background-color: #fff}", parent);
   applyElemHideEmulation(
     ["div > :-abp-properties(background-color: rgb(0, 0, 0))"]
   ).then(() =>
   {
@@ skipping 830 matching lines @@
     for (let element of [...testDocument.getElementsByTagName("div"),
                          ...testDocument.getElementsByTagName("p")])
     {
       if (element.id == "n2" || element.id == "n2_3")
         expectProcessed(test, element, element.id);
       else
         expectNotProcessed(test, element, element.id);
     }
   }).catch(unexpectedError.bind(test)).then(() => test.done());
 };