Issue 4795 - Use modern JavaScript syntax

qunit/tests/url.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 {
-  let url = require("url");

[Sebastian Noack, 2017/01/16 15:35:57]

I suppose we could better use destructuring here now?

[kzar, 2017/01/17 07:42:50]

Done.

-  let getDecodedHostname = url.getDecodedHostname;
-  let extractHostFromFrame = url.extractHostFromFrame;
-  let stringifyURL = url.stringifyURL;
-  let isThirdParty = url.isThirdParty;
+  let {getDecodedHostname,
+       extractHostFromFrame,
+       stringifyURL,
+       isThirdParty} = require("url");
 
   module("URL/host tools");
 
   test("Extracting hostname from URL", () =>
   {
     function testURLHostname(url, expectedHostname, message)
     {
       equal(getDecodedHostname(new URL(url)), expectedHostname, message);
     }
 
@@ skipping 92 matching lines @@
     testThirdParty("1.0xff.1.1", "2.0xff.1.1", true, "different IPv4 address with hexadecimal octet is third-party");
     testThirdParty("0xff.example.com", "example.com", false, "domain starts like a hexadecimal IPv4 address but isn't one");
     testThirdParty("[2001:db8:85a3::8a2e:370:7334]", "[2001:db8:85a3::8a2e:370:7334]", false, "same IPv6 address isn't third-party");
     testThirdParty("[2001:db8:85a3::8a2e:370:7334]", "[5001:db8:85a3::8a2e:370:7334]", true, "different IPv6 address is third-party");
     testThirdParty("[::ffff:192.0.2.128]", "[::ffff:192.0.2.128]", false, "same IPv4-mapped IPv6 address isn't third-party");
     testThirdParty("[::ffff:192.0.2.128]", "[::ffff:192.1.2.128]", true, "different IPv4-mapped IPv6 address is third-party");
     testThirdParty("xn--f-1gaa.com", "f\u00f6\u00f6.com", false, "same IDN isn't third-party");
     testThirdParty("example.com..", "example.com....", false, "traling dots are ignored");
   });
 }