From cb3de78d7dac7b4de84889cbe8051bda3f789223 Mon Sep 17 00:00:00 2001
From: Gautam Arora <gautamsarora3@gmail.com>
Date: Tue, 18 Jul 2017 20:41:00 -0400
Subject: [PATCH 1/4] test: add comments for whatwg-url tests

Added comments to whatwg-url tests that they should not be changed until
modifications are merged upstream as per guidelines for
[Web Platform Tests](https://github.com/nodejs/node/blob/master/doc/guides/writing-tests.md#web-platform-tests)

Fixes: #12793
---
 doc/guides/writing-tests.md                               | 3 ++-
 test/fixtures/url-setter-tests.js                         | 3 ++-
 test/fixtures/url-tests.js                                | 3 ++-
 test/fixtures/url-toascii.js                              | 3 ++-
 test/parallel/test-whatwg-url-constructor.js              | 3 ++-
 test/parallel/test-whatwg-url-historical.js               | 3 ++-
 test/parallel/test-whatwg-url-origin.js                   | 3 ++-
 test/parallel/test-whatwg-url-searchparams-append.js      | 3 ++-
 test/parallel/test-whatwg-url-searchparams-constructor.js | 3 ++-
 test/parallel/test-whatwg-url-searchparams-delete.js      | 3 ++-
 test/parallel/test-whatwg-url-searchparams-foreach.js     | 3 ++-
 test/parallel/test-whatwg-url-searchparams-get.js         | 3 ++-
 test/parallel/test-whatwg-url-searchparams-getall.js      | 3 ++-
 test/parallel/test-whatwg-url-searchparams-has.js         | 3 ++-
 test/parallel/test-whatwg-url-searchparams-set.js         | 3 ++-
 test/parallel/test-whatwg-url-searchparams-sort.js        | 3 ++-
 test/parallel/test-whatwg-url-searchparams-stringifier.js | 3 ++-
 test/parallel/test-whatwg-url-setters.js                  | 3 ++-
 test/parallel/test-whatwg-url-toascii.js                  | 3 ++-
 test/parallel/test-whatwg-url-tojson.js                   | 3 ++-
 20 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/doc/guides/writing-tests.md b/doc/guides/writing-tests.md
index 9d226da6e804..bd7d8803606c 100644
--- a/doc/guides/writing-tests.md
+++ b/doc/guides/writing-tests.md
@@ -264,7 +264,8 @@ These imported tests will be wrapped like this:
 
 ```js
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js
index 923110d93641..f460538bf3db 100644
--- a/test/fixtures/url-setter-tests.js
+++ b/test/fixtures/url-setter-tests.js
@@ -1,6 +1,7 @@
 'use strict';
 
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/b30abaecf4/url/setters_tests.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js
index 00643f961321..589e13a218a3 100644
--- a/test/fixtures/url-tests.js
+++ b/test/fixtures/url-tests.js
@@ -1,6 +1,7 @@
 'use strict';
 
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8df7c9c215/url/urltestdata.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-toascii.js b/test/fixtures/url-toascii.js
index ea5e0f22ba1b..97fbef163a69 100644
--- a/test/fixtures/url-toascii.js
+++ b/test/fixtures/url-toascii.js
@@ -1,6 +1,7 @@
 'use strict';
 
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-constructor.js b/test/parallel/test-whatwg-url-constructor.js
index 290f9266b54f..112b9597a252 100644
--- a/test/parallel/test-whatwg-url-constructor.js
+++ b/test/parallel/test-whatwg-url-constructor.js
@@ -15,7 +15,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-historical.js b/test/parallel/test-whatwg-url-historical.js
index 7848b1c1873a..18a2fe01898f 100644
--- a/test/parallel/test-whatwg-url-historical.js
+++ b/test/parallel/test-whatwg-url-historical.js
@@ -9,7 +9,8 @@ const URL = require('url').URL;
 const { test, assert_equals, assert_throws } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/historical.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-origin.js b/test/parallel/test-whatwg-url-origin.js
index 732100e142a5..dc0a1d7d4465 100644
--- a/test/parallel/test-whatwg-url-origin.js
+++ b/test/parallel/test-whatwg-url-origin.js
@@ -14,7 +14,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-origin.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
index d9534a2209dd..36f0f30d7a04 100644
--- a/test/parallel/test-whatwg-url-searchparams-append.js
+++ b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -6,7 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-append.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
index 4a549c842b19..34671f90d1a9 100644
--- a/test/parallel/test-whatwg-url-searchparams-constructor.js
+++ b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -10,7 +10,8 @@ const {
 
 /* eslint-disable */
 var params;  // Strict mode fix for WPT.
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/54c3502d7b/url/urlsearchparams-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
index dae0b338ddae..7edd94919c7f 100644
--- a/test/parallel/test-whatwg-url-searchparams-delete.js
+++ b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -7,7 +7,8 @@ const { test, assert_equals, assert_true, assert_false } =
   require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-delete.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
index 6135f3563872..5f2d296146e4 100644
--- a/test/parallel/test-whatwg-url-searchparams-foreach.js
+++ b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -8,7 +8,8 @@ const { test, assert_array_equals, assert_unreached } =
 
 /* eslint-disable */
 var i;  // Strict mode fix for WPT.
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/a8b2b1e/url/urlsearchparams-foreach.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
index a49cc2c2b0d0..8f3f5024c2dc 100644
--- a/test/parallel/test-whatwg-url-searchparams-get.js
+++ b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -6,7 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-get.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
index bf287d52a01c..fa76bcefee28 100644
--- a/test/parallel/test-whatwg-url-searchparams-getall.js
+++ b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -7,7 +7,8 @@ const { test, assert_equals, assert_true, assert_array_equals } =
   require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-getall.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
index 127e1a8329bf..d31320e21cba 100644
--- a/test/parallel/test-whatwg-url-searchparams-has.js
+++ b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -6,7 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_false, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-has.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
index f7620c05d12e..4ee02d0fc313 100644
--- a/test/parallel/test-whatwg-url-searchparams-set.js
+++ b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -6,7 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-set.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-sort.js b/test/parallel/test-whatwg-url-searchparams-sort.js
index adc349760475..6535a8f9c7bc 100644
--- a/test/parallel/test-whatwg-url-searchparams-sort.js
+++ b/test/parallel/test-whatwg-url-searchparams-sort.js
@@ -5,7 +5,8 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/5903e00e77e85f8bcb21c73d1d7819fcd04763bd/url/urlsearchparams-sort.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
index 7162932546f2..da7ba6c36923 100644
--- a/test/parallel/test-whatwg-url-searchparams-stringifier.js
+++ b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -6,7 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-setters.js b/test/parallel/test-whatwg-url-setters.js
index 938c2aa25387..2de2cda9c510 100644
--- a/test/parallel/test-whatwg-url-setters.js
+++ b/test/parallel/test-whatwg-url-setters.js
@@ -18,7 +18,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-setters.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-toascii.js b/test/parallel/test-whatwg-url-toascii.js
index 851240ce650a..8effeefd8644 100644
--- a/test/parallel/test-whatwg-url-toascii.js
+++ b/test/parallel/test-whatwg-url-toascii.js
@@ -14,7 +14,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.window.js
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-tojson.js b/test/parallel/test-whatwg-url-tojson.js
index 5a90fdd27f39..3d161043d489 100644
--- a/test/parallel/test-whatwg-url-tojson.js
+++ b/test/parallel/test-whatwg-url-tojson.js
@@ -5,7 +5,8 @@ const URL = require('url').URL;
 const { test, assert_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* WPT Refs:
+/* The following tests are copied from WPT, modifications to them should be upstreamed first.
+   Refs:
    https://github.com/w3c/web-platform-tests/blob/02585db/url/url-tojson.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */

From 7b630485e2acbf62d9502062e28c5fd4ca8fc5e7 Mon Sep 17 00:00:00 2001
From: Gautam Arora <gautamsarora3@gmail.com>
Date: Tue, 18 Jul 2017 21:06:21 -0400
Subject: [PATCH 2/4] test: fix to keep lines under 80 chars

---
 doc/guides/writing-tests.md                               | 4 ++--
 test/fixtures/url-setter-tests.js                         | 4 ++--
 test/fixtures/url-tests.js                                | 4 ++--
 test/fixtures/url-toascii.js                              | 4 ++--
 test/parallel/test-whatwg-url-constructor.js              | 4 ++--
 test/parallel/test-whatwg-url-historical.js               | 4 ++--
 test/parallel/test-whatwg-url-origin.js                   | 4 ++--
 test/parallel/test-whatwg-url-searchparams-append.js      | 4 ++--
 test/parallel/test-whatwg-url-searchparams-constructor.js | 4 ++--
 test/parallel/test-whatwg-url-searchparams-delete.js      | 4 ++--
 test/parallel/test-whatwg-url-searchparams-foreach.js     | 4 ++--
 test/parallel/test-whatwg-url-searchparams-get.js         | 4 ++--
 test/parallel/test-whatwg-url-searchparams-getall.js      | 4 ++--
 test/parallel/test-whatwg-url-searchparams-has.js         | 4 ++--
 test/parallel/test-whatwg-url-searchparams-set.js         | 4 ++--
 test/parallel/test-whatwg-url-searchparams-sort.js        | 4 ++--
 test/parallel/test-whatwg-url-searchparams-stringifier.js | 4 ++--
 test/parallel/test-whatwg-url-setters.js                  | 4 ++--
 test/parallel/test-whatwg-url-toascii.js                  | 4 ++--
 test/parallel/test-whatwg-url-tojson.js                   | 4 ++--
 20 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/doc/guides/writing-tests.md b/doc/guides/writing-tests.md
index bd7d8803606c..305457090084 100644
--- a/doc/guides/writing-tests.md
+++ b/doc/guides/writing-tests.md
@@ -264,8 +264,8 @@ These imported tests will be wrapped like this:
 
 ```js
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js
index f460538bf3db..faa055c105f0 100644
--- a/test/fixtures/url-setter-tests.js
+++ b/test/fixtures/url-setter-tests.js
@@ -1,7 +1,7 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/b30abaecf4/url/setters_tests.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js
index 589e13a218a3..475a72239046 100644
--- a/test/fixtures/url-tests.js
+++ b/test/fixtures/url-tests.js
@@ -1,7 +1,7 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8df7c9c215/url/urltestdata.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/fixtures/url-toascii.js b/test/fixtures/url-toascii.js
index 97fbef163a69..fb6fe2f50fd8 100644
--- a/test/fixtures/url-toascii.js
+++ b/test/fixtures/url-toascii.js
@@ -1,7 +1,7 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-constructor.js b/test/parallel/test-whatwg-url-constructor.js
index 112b9597a252..9258f11fab3b 100644
--- a/test/parallel/test-whatwg-url-constructor.js
+++ b/test/parallel/test-whatwg-url-constructor.js
@@ -15,8 +15,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-historical.js b/test/parallel/test-whatwg-url-historical.js
index 18a2fe01898f..c12365c44e51 100644
--- a/test/parallel/test-whatwg-url-historical.js
+++ b/test/parallel/test-whatwg-url-historical.js
@@ -9,8 +9,8 @@ const URL = require('url').URL;
 const { test, assert_equals, assert_throws } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/historical.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-origin.js b/test/parallel/test-whatwg-url-origin.js
index dc0a1d7d4465..365a0a8e3de3 100644
--- a/test/parallel/test-whatwg-url-origin.js
+++ b/test/parallel/test-whatwg-url-origin.js
@@ -14,8 +14,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-origin.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
index 36f0f30d7a04..705c944888a1 100644
--- a/test/parallel/test-whatwg-url-searchparams-append.js
+++ b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -6,8 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-append.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
index 34671f90d1a9..918b442a1766 100644
--- a/test/parallel/test-whatwg-url-searchparams-constructor.js
+++ b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -10,8 +10,8 @@ const {
 
 /* eslint-disable */
 var params;  // Strict mode fix for WPT.
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/54c3502d7b/url/urlsearchparams-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
index 7edd94919c7f..3ea044567683 100644
--- a/test/parallel/test-whatwg-url-searchparams-delete.js
+++ b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -7,8 +7,8 @@ const { test, assert_equals, assert_true, assert_false } =
   require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-delete.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
index 5f2d296146e4..f30d7a3ff4e0 100644
--- a/test/parallel/test-whatwg-url-searchparams-foreach.js
+++ b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -8,8 +8,8 @@ const { test, assert_array_equals, assert_unreached } =
 
 /* eslint-disable */
 var i;  // Strict mode fix for WPT.
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/a8b2b1e/url/urlsearchparams-foreach.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
index 8f3f5024c2dc..b217e4bad28e 100644
--- a/test/parallel/test-whatwg-url-searchparams-get.js
+++ b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -6,8 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-get.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
index fa76bcefee28..12e479cf40cb 100644
--- a/test/parallel/test-whatwg-url-searchparams-getall.js
+++ b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -7,8 +7,8 @@ const { test, assert_equals, assert_true, assert_array_equals } =
   require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-getall.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
index d31320e21cba..654e700e05ff 100644
--- a/test/parallel/test-whatwg-url-searchparams-has.js
+++ b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -6,8 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_false, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-has.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
index 4ee02d0fc313..61f526b942fb 100644
--- a/test/parallel/test-whatwg-url-searchparams-set.js
+++ b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -6,8 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-set.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-sort.js b/test/parallel/test-whatwg-url-searchparams-sort.js
index 6535a8f9c7bc..dceb262f3cf6 100644
--- a/test/parallel/test-whatwg-url-searchparams-sort.js
+++ b/test/parallel/test-whatwg-url-searchparams-sort.js
@@ -5,8 +5,8 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/5903e00e77e85f8bcb21c73d1d7819fcd04763bd/url/urlsearchparams-sort.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
index da7ba6c36923..0718496b3e9f 100644
--- a/test/parallel/test-whatwg-url-searchparams-stringifier.js
+++ b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -6,8 +6,8 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-setters.js b/test/parallel/test-whatwg-url-setters.js
index 2de2cda9c510..ba054f5b7ed1 100644
--- a/test/parallel/test-whatwg-url-setters.js
+++ b/test/parallel/test-whatwg-url-setters.js
@@ -18,8 +18,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-setters.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-toascii.js b/test/parallel/test-whatwg-url-toascii.js
index 8effeefd8644..a98fb7b3259c 100644
--- a/test/parallel/test-whatwg-url-toascii.js
+++ b/test/parallel/test-whatwg-url-toascii.js
@@ -14,8 +14,8 @@ const request = {
 };
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.window.js
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
diff --git a/test/parallel/test-whatwg-url-tojson.js b/test/parallel/test-whatwg-url-tojson.js
index 3d161043d489..af0991de96e3 100644
--- a/test/parallel/test-whatwg-url-tojson.js
+++ b/test/parallel/test-whatwg-url-tojson.js
@@ -5,8 +5,8 @@ const URL = require('url').URL;
 const { test, assert_equals } = require('../common/wpt');
 
 /* eslint-disable */
-/* The following tests are copied from WPT, modifications to them should be upstreamed first.
-   Refs:
+/* The following tests are copied from WPT, modifications to them should be
+   upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/02585db/url/url-tojson.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */

From 7937fde7e2c904e87ecaa24f4089bc2d23986e96 Mon Sep 17 00:00:00 2001
From: Gautam Arora <gautamsarora3@gmail.com>
Date: Wed, 19 Jul 2017 00:01:33 -0400
Subject: [PATCH 3/4] test: move eslint disable to after comments

---
 doc/guides/writing-tests.md                               | 2 +-
 test/parallel/test-whatwg-url-constructor.js              | 2 +-
 test/parallel/test-whatwg-url-historical.js               | 2 +-
 test/parallel/test-whatwg-url-origin.js                   | 2 +-
 test/parallel/test-whatwg-url-searchparams-append.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-constructor.js | 4 ++--
 test/parallel/test-whatwg-url-searchparams-delete.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-foreach.js     | 4 ++--
 test/parallel/test-whatwg-url-searchparams-get.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-getall.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-has.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-set.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-sort.js        | 2 +-
 test/parallel/test-whatwg-url-searchparams-stringifier.js | 2 +-
 test/parallel/test-whatwg-url-setters.js                  | 2 +-
 test/parallel/test-whatwg-url-toascii.js                  | 2 +-
 test/parallel/test-whatwg-url-tojson.js                   | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/doc/guides/writing-tests.md b/doc/guides/writing-tests.md
index 305457090084..b9db80413761 100644
--- a/doc/guides/writing-tests.md
+++ b/doc/guides/writing-tests.md
@@ -263,12 +263,12 @@ Some of the tests for the WHATWG URL implementation (named
 These imported tests will be wrapped like this:
 
 ```js
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 
 // Test code
 
diff --git a/test/parallel/test-whatwg-url-constructor.js b/test/parallel/test-whatwg-url-constructor.js
index 9258f11fab3b..6c40b8094233 100644
--- a/test/parallel/test-whatwg-url-constructor.js
+++ b/test/parallel/test-whatwg-url-constructor.js
@@ -14,12 +14,12 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-tests'))
 };
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 function runURLConstructorTests() {
   // var setup = async_test("Loading data…")
   // setup.step(function() {
diff --git a/test/parallel/test-whatwg-url-historical.js b/test/parallel/test-whatwg-url-historical.js
index c12365c44e51..344815241222 100644
--- a/test/parallel/test-whatwg-url-historical.js
+++ b/test/parallel/test-whatwg-url-historical.js
@@ -8,12 +8,12 @@ if (!common.hasIntl) {
 const URL = require('url').URL;
 const { test, assert_equals, assert_throws } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/historical.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 // var objects = [
 //   [function() { return window.location }, "location object"],
 //   [function() { return document.createElement("a") }, "a element"],
diff --git a/test/parallel/test-whatwg-url-origin.js b/test/parallel/test-whatwg-url-origin.js
index 365a0a8e3de3..730087127a59 100644
--- a/test/parallel/test-whatwg-url-origin.js
+++ b/test/parallel/test-whatwg-url-origin.js
@@ -13,12 +13,12 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-tests'))
 };
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-origin.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 function runURLOriginTests() {
   // var setup = async_test("Loading data…")
   // setup.step(function() {
diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
index 705c944888a1..9d1c0eda49b0 100644
--- a/test/parallel/test-whatwg-url-searchparams-append.js
+++ b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -5,12 +5,12 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-append.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams();
     params.append('a', 'b');
diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
index 918b442a1766..4737fa7c7bef 100644
--- a/test/parallel/test-whatwg-url-searchparams-constructor.js
+++ b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -8,13 +8,13 @@ const {
   assert_false, assert_throws, assert_array_equals
 } = require('../common/wpt');
 
-/* eslint-disable */
-var params;  // Strict mode fix for WPT.
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/54c3502d7b/url/urlsearchparams-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
+var params;  // Strict mode fix for WPT.
 test(function() {
     var params = new URLSearchParams();
     assert_equals(params + '', '');
diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
index 3ea044567683..66d59e71ddc9 100644
--- a/test/parallel/test-whatwg-url-searchparams-delete.js
+++ b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -6,12 +6,12 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_equals, assert_true, assert_false } =
   require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-delete.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     params.delete('a');
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
index f30d7a3ff4e0..0fd0b3c32945 100644
--- a/test/parallel/test-whatwg-url-searchparams-foreach.js
+++ b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -6,13 +6,13 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals, assert_unreached } =
   require('../common/wpt');
 
-/* eslint-disable */
-var i;  // Strict mode fix for WPT.
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/a8b2b1e/url/urlsearchparams-foreach.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
+var i;  // Strict mode fix for WPT.
 test(function() {
     var params = new URLSearchParams('a=1&b=2&c=3');
     var keys = [];
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
index b217e4bad28e..0433b12a124e 100644
--- a/test/parallel/test-whatwg-url-searchparams-get.js
+++ b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -5,12 +5,12 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-get.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_equals(params.get('a'), 'b');
diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
index 12e479cf40cb..5623f2cecaef 100644
--- a/test/parallel/test-whatwg-url-searchparams-getall.js
+++ b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -6,12 +6,12 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true, assert_array_equals } =
   require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-getall.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_array_equals(params.getAll('a'), ['b']);
diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
index 654e700e05ff..e33491a86cf5 100644
--- a/test/parallel/test-whatwg-url-searchparams-has.js
+++ b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -5,12 +5,12 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_false, assert_true } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-has.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_true(params.has('a'));
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
index 61f526b942fb..ba1e88450ede 100644
--- a/test/parallel/test-whatwg-url-searchparams-set.js
+++ b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -5,12 +5,12 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-set.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     params.set('a', 'B');
diff --git a/test/parallel/test-whatwg-url-searchparams-sort.js b/test/parallel/test-whatwg-url-searchparams-sort.js
index dceb262f3cf6..f2bf042d9cd2 100644
--- a/test/parallel/test-whatwg-url-searchparams-sort.js
+++ b/test/parallel/test-whatwg-url-searchparams-sort.js
@@ -4,12 +4,12 @@ require('../common');
 const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/5903e00e77e85f8bcb21c73d1d7819fcd04763bd/url/urlsearchparams-sort.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 [
   {
     "input": "z=b&a=b&z=a&a=a",
diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
index 0718496b3e9f..7d8f8e5bc794 100644
--- a/test/parallel/test-whatwg-url-searchparams-stringifier.js
+++ b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -5,12 +5,12 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(function() {
     var params = new URLSearchParams();
     params.append('a', 'b c');
diff --git a/test/parallel/test-whatwg-url-setters.js b/test/parallel/test-whatwg-url-setters.js
index ba054f5b7ed1..40ba95ac4be4 100644
--- a/test/parallel/test-whatwg-url-setters.js
+++ b/test/parallel/test-whatwg-url-setters.js
@@ -17,12 +17,12 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-setter-tests'))
 };
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-setters.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 function startURLSettersTests() {
 //   var setup = async_test("Loading data…")
 //   setup.step(function() {
diff --git a/test/parallel/test-whatwg-url-toascii.js b/test/parallel/test-whatwg-url-toascii.js
index a98fb7b3259c..2ee65712d142 100644
--- a/test/parallel/test-whatwg-url-toascii.js
+++ b/test/parallel/test-whatwg-url-toascii.js
@@ -13,12 +13,12 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-toascii'))
 };
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.window.js
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 // async_test(t => {
 //   const request = new XMLHttpRequest()
 //   request.open("GET", "toascii.json")
diff --git a/test/parallel/test-whatwg-url-tojson.js b/test/parallel/test-whatwg-url-tojson.js
index af0991de96e3..6d4b5cbf7efd 100644
--- a/test/parallel/test-whatwg-url-tojson.js
+++ b/test/parallel/test-whatwg-url-tojson.js
@@ -4,12 +4,12 @@ require('../common');
 const URL = require('url').URL;
 const { test, assert_equals } = require('../common/wpt');
 
-/* eslint-disable */
 /* The following tests are copied from WPT, modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/02585db/url/url-tojson.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
+/* eslint-disable */
 test(() => {
   const a = new URL("https://example.com/")
   assert_equals(JSON.stringify(a), "\"https://example.com/\"")

From 7ae90c5f5ce523ee7c32a4e80b9145953a1cee39 Mon Sep 17 00:00:00 2001
From: Gautam Arora <gautamsarora3@gmail.com>
Date: Wed, 19 Jul 2017 01:08:41 -0400
Subject: [PATCH 4/4] test: replacing comma with period in comments

---
 doc/guides/writing-tests.md                               | 2 +-
 test/fixtures/url-setter-tests.js                         | 2 +-
 test/fixtures/url-tests.js                                | 2 +-
 test/fixtures/url-toascii.js                              | 2 +-
 test/parallel/test-whatwg-url-constructor.js              | 2 +-
 test/parallel/test-whatwg-url-historical.js               | 2 +-
 test/parallel/test-whatwg-url-origin.js                   | 2 +-
 test/parallel/test-whatwg-url-searchparams-append.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-constructor.js | 2 +-
 test/parallel/test-whatwg-url-searchparams-delete.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-foreach.js     | 2 +-
 test/parallel/test-whatwg-url-searchparams-get.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-getall.js      | 2 +-
 test/parallel/test-whatwg-url-searchparams-has.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-set.js         | 2 +-
 test/parallel/test-whatwg-url-searchparams-sort.js        | 2 +-
 test/parallel/test-whatwg-url-searchparams-stringifier.js | 2 +-
 test/parallel/test-whatwg-url-setters.js                  | 2 +-
 test/parallel/test-whatwg-url-toascii.js                  | 2 +-
 test/parallel/test-whatwg-url-tojson.js                   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/guides/writing-tests.md b/doc/guides/writing-tests.md
index b9db80413761..8c5c2b745564 100644
--- a/doc/guides/writing-tests.md
+++ b/doc/guides/writing-tests.md
@@ -263,7 +263,7 @@ Some of the tests for the WHATWG URL implementation (named
 These imported tests will be wrapped like this:
 
 ```js
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js
index faa055c105f0..6f769eaec754 100644
--- a/test/fixtures/url-setter-tests.js
+++ b/test/fixtures/url-setter-tests.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/b30abaecf4/url/setters_tests.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js
index 475a72239046..b36e2be3e49e 100644
--- a/test/fixtures/url-tests.js
+++ b/test/fixtures/url-tests.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8df7c9c215/url/urltestdata.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/fixtures/url-toascii.js b/test/fixtures/url-toascii.js
index fb6fe2f50fd8..59b76330f867 100644
--- a/test/fixtures/url-toascii.js
+++ b/test/fixtures/url-toascii.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-constructor.js b/test/parallel/test-whatwg-url-constructor.js
index 6c40b8094233..38be3a293b9f 100644
--- a/test/parallel/test-whatwg-url-constructor.js
+++ b/test/parallel/test-whatwg-url-constructor.js
@@ -14,7 +14,7 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-tests'))
 };
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-historical.js b/test/parallel/test-whatwg-url-historical.js
index 344815241222..466949cd322d 100644
--- a/test/parallel/test-whatwg-url-historical.js
+++ b/test/parallel/test-whatwg-url-historical.js
@@ -8,7 +8,7 @@ if (!common.hasIntl) {
 const URL = require('url').URL;
 const { test, assert_equals, assert_throws } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/historical.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-origin.js b/test/parallel/test-whatwg-url-origin.js
index 730087127a59..274de420bebb 100644
--- a/test/parallel/test-whatwg-url-origin.js
+++ b/test/parallel/test-whatwg-url-origin.js
@@ -13,7 +13,7 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-tests'))
 };
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-origin.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
index 9d1c0eda49b0..fc9f5bd75d16 100644
--- a/test/parallel/test-whatwg-url-searchparams-append.js
+++ b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-append.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
index 4737fa7c7bef..b6e720cc7fb0 100644
--- a/test/parallel/test-whatwg-url-searchparams-constructor.js
+++ b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -8,7 +8,7 @@ const {
   assert_false, assert_throws, assert_array_equals
 } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/54c3502d7b/url/urlsearchparams-constructor.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
index 66d59e71ddc9..6e733fd94466 100644
--- a/test/parallel/test-whatwg-url-searchparams-delete.js
+++ b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -6,7 +6,7 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_equals, assert_true, assert_false } =
   require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-delete.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
index 0fd0b3c32945..0147418ff21f 100644
--- a/test/parallel/test-whatwg-url-searchparams-foreach.js
+++ b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -6,7 +6,7 @@ const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals, assert_unreached } =
   require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/a8b2b1e/url/urlsearchparams-foreach.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
index 0433b12a124e..2e7d22c998bf 100644
--- a/test/parallel/test-whatwg-url-searchparams-get.js
+++ b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-get.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
index 5623f2cecaef..3a8bf347ff1f 100644
--- a/test/parallel/test-whatwg-url-searchparams-getall.js
+++ b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -6,7 +6,7 @@ const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true, assert_array_equals } =
   require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-getall.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
index e33491a86cf5..dcdf585dcdf7 100644
--- a/test/parallel/test-whatwg-url-searchparams-has.js
+++ b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_false, assert_true } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-has.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
index ba1e88450ede..46414ff23aba 100644
--- a/test/parallel/test-whatwg-url-searchparams-set.js
+++ b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals, assert_true } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-set.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-sort.js b/test/parallel/test-whatwg-url-searchparams-sort.js
index f2bf042d9cd2..712dbc5636d8 100644
--- a/test/parallel/test-whatwg-url-searchparams-sort.js
+++ b/test/parallel/test-whatwg-url-searchparams-sort.js
@@ -4,7 +4,7 @@ require('../common');
 const { URL, URLSearchParams } = require('url');
 const { test, assert_array_equals } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/5903e00e77e85f8bcb21c73d1d7819fcd04763bd/url/urlsearchparams-sort.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
index 7d8f8e5bc794..e2f73d262e59 100644
--- a/test/parallel/test-whatwg-url-searchparams-stringifier.js
+++ b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const URLSearchParams = require('url').URLSearchParams;
 const { test, assert_equals } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/urlsearchparams-stringifier.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-setters.js b/test/parallel/test-whatwg-url-setters.js
index 40ba95ac4be4..7e69bc4edce3 100644
--- a/test/parallel/test-whatwg-url-setters.js
+++ b/test/parallel/test-whatwg-url-setters.js
@@ -17,7 +17,7 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-setter-tests'))
 };
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/8791bed/url/url-setters.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-toascii.js b/test/parallel/test-whatwg-url-toascii.js
index 2ee65712d142..5a34b0396495 100644
--- a/test/parallel/test-whatwg-url-toascii.js
+++ b/test/parallel/test-whatwg-url-toascii.js
@@ -13,7 +13,7 @@ const request = {
   response: require(path.join(common.fixturesDir, 'url-toascii'))
 };
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/4839a0a804/url/toascii.window.js
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
diff --git a/test/parallel/test-whatwg-url-tojson.js b/test/parallel/test-whatwg-url-tojson.js
index 6d4b5cbf7efd..8e9a30c7e017 100644
--- a/test/parallel/test-whatwg-url-tojson.js
+++ b/test/parallel/test-whatwg-url-tojson.js
@@ -4,7 +4,7 @@ require('../common');
 const URL = require('url').URL;
 const { test, assert_equals } = require('../common/wpt');
 
-/* The following tests are copied from WPT, modifications to them should be
+/* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
    https://github.com/w3c/web-platform-tests/blob/02585db/url/url-tojson.html
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html