Issue 7419 - Allow wrapping function for abort-on-property-*

test/browser/snippets.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 93 matching lines @@
 
   testProperty("abpTest5.prop4.bar", true, "TypeError");
 
   window.abpTest5 = {prop4: 42};
   testProperty("abpTest5.prop4.bar", false);
   window.abpTest5 = {prop4: {}};
   testProperty("abpTest5.prop4.bar");
 
   // Check that it works on properties that are functions.
   // https://issues.adblockplus.org/ticket/7419
+
+  // Existing function (from the API).
   await runSnippet(test, "abort-on-property-read", "Object.keys");

[Manish Jethani, 2019/03/29 07:08:07]

In the interest of completeness we could add the following tests:

  // Function properties.
  window.abpTest6 = function() {};
  window.abpTest6.prop1 = function() {};
  await runSnippet(test, "abort-on-property-read", "abpTest6.prop1");
  testProperty("abpTest6.prop1");

  // Function properties, with sub-property set afterwards.
  window.abpTest7 = function() {};
  await runSnippet(test, "abort-on-property-read", "abpTest7.prop1");
  window.abpTest7.prop1 = function() {};
  testProperty("abpTest7.prop1");

  // Arrow function properties.
  window.abpTest8 = () => {};
  await runSnippet(test, "abort-on-property-read", "abpTest8");
  testProperty("abpTest8");

  // Class function properties.
  window.abpTest9 = class {};
  await runSnippet(test, "abort-on-property-read", "abpTest9");
  testProperty("abpTest9");

  // Class function properties with prototype function properties.
  window.abpTest10 = class {};
  window.abpTest10.prototype.prop1 = function() {};
  await runSnippet(test, "abort-on-property-read", "abpTest10.prototype.prop1");
  testProperty("abpTest10.prototype.prop1");

  // Class function properties with prototype function properties, with
  // prototype property set afterwards.
  window.abpTest11 = class {};
  await runSnippet(test, "abort-on-property-read", "abpTest11.prototype.prop1");
  window.abpTest11.prototype.prop1 = function() {};
  testProperty("abpTest11.prototype.prop1");

[hub, 2019/03/29 14:36:27]

for the record, test 8 and 9 already pass. But that's fine. More coverage.

[Manish Jethani, 2019/03/29 15:46:27]

The reason I thought we should add these tests is that it makes it clear to
anyone else who comes by that this works with arrow functions and classes. It
may not be immediately obvious to someone who is not a JS expert that a class is
in fact just a function, for example (esp. if they are from a C++ background).
This makes the code friendlier to everyone.

[hub, 2019/03/29 15:58:02]

I was not arguing against. I was just indicating that they already worked. The
more. The merrier.

[Manish Jethani, 2019/03/29 15:59:09]

Acknowledged.

   testProperty("Object.keys");
+
+  // Function properties.
+  window.abpTest6 = function() {};
+  window.abpTest6.prop1 = function() {};
+  await runSnippet(test, "abort-on-property-read", "abpTest6.prop1");
+  testProperty("abpTest6.prop1");
+
+  // Function properties, with sub-property set afterwards.
+  window.abpTest7 = function() {};
+  await runSnippet(test, "abort-on-property-read", "abpTest7.prop1");
+  window.abpTest7.prop1 = function() {};
+  testProperty("abpTest7.prop1");
+
+  // Function properties, with base property as function set afterwards.
+  await runSnippet(test, "abort-on-property-read", "abpTest8.prop1");
+  window.abpTest8 = function() {};
+  window.abpTest8.prop1 = function() {};
+  testProperty("abpTest8.prop1");
+
+  // Arrow function properties.
+  window.abpTest9 = () => {};
+  await runSnippet(test, "abort-on-property-read", "abpTest9");
+  testProperty("abpTest9");
+
+  // Class function properties.
+  window.abpTest10 = class {};
+  await runSnippet(test, "abort-on-property-read", "abpTest10");
+  testProperty("abpTest10");
+
+  // Class function properties with prototype function properties.
+  window.abpTest11 = class {};
+  window.abpTest11.prototype.prop1 = function() {};
+  await runSnippet(test, "abort-on-property-read", "abpTest11.prototype.prop1");
+  testProperty("abpTest11.prototype.prop1");
+
+  // Class function properties with prototype function properties, with
+  // prototype property set afterwards.
+  window.abpTest12 = class {};
+  await runSnippet(test, "abort-on-property-read", "abpTest12.prototype.prop1");
+  window.abpTest12.prototype.prop1 = function() {};
+  testProperty("abpTest12.prototype.prop1");
 
   test.done();
 };
 
 exports.testAbortCurrentInlineScriptSnippet = async function(test)
 {
   function injectInlineScript(doc, script)
   {
     let scriptElement = doc.createElement("script");
     scriptElement.type = "application/javascript";
@@ skipping 62 matching lines @@
 
   if (e && msg)
   {
     test.equals(e.textContent, "", "result element should be empty");
     test.equals(msg.textContent, "ReferenceError",
                 "There should have been an error");
   }
 
   test.done();
 };