11 files changed, 24 insertions, 57 deletions
diff --git a/lib/internal/url.js b/lib/internal/url.js
index b61b699ecd..1d63c26e51 100644
--- a/lib/internal/url.js
+++ b/lib/internal/url.js
@@ -1045,6 +1045,7 @@ function urlToOptions(url) {
 }
 
 exports.URL = URL;
+exports.URLSearchParams = URLSearchParams;
 exports.originFor = originFor;
 exports.domainToASCII = domainToASCII;
 exports.domainToUnicode = domainToUnicode;
diff --git a/lib/url.js b/lib/url.js
index 8bdfd0cb66..4ad6e31bb0 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -17,6 +17,7 @@ exports.resolve = urlResolve;
 exports.resolveObject = urlResolveObject;
 exports.format = urlFormat;
 exports.URL = internalUrl.URL;
+exports.URLSearchParams = internalUrl.URLSearchParams;
 exports.originFor = internalUrl.originFor;
 exports.domainToASCII = internalUrl.domainToASCII;
 exports.domainToUnicode = internalUrl.domainToUnicode;
diff --git a/test/parallel/test-whatwg-url-searchparams-append.js b/test/parallel/test-whatwg-url-searchparams-append.js
index 1f61cb0d11..5ef92252be 100644
--- a/test/parallel/test-whatwg-url-searchparams-append.js
+++ b/test/parallel/test-whatwg-url-searchparams-append.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Append same name
 params = new URLSearchParams();
diff --git a/test/parallel/test-whatwg-url-searchparams-constructor.js b/test/parallel/test-whatwg-url-searchparams-constructor.js
index 34ccb4c37d..9b7ca1e4e9 100644
--- a/test/parallel/test-whatwg-url-searchparams-constructor.js
+++ b/test/parallel/test-whatwg-url-searchparams-constructor.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Basic URLSearchParams construction
 params = new URLSearchParams();
diff --git a/test/parallel/test-whatwg-url-searchparams-delete.js b/test/parallel/test-whatwg-url-searchparams-delete.js
index b08a3b7686..71bb7487a7 100644
--- a/test/parallel/test-whatwg-url-searchparams-delete.js
+++ b/test/parallel/test-whatwg-url-searchparams-delete.js
@@ -2,13 +2,11 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const url = require('url');
+const URL = url.URL;
+const URLSearchParams = url.URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Delete basics
 params = new URLSearchParams('a=b&c=d');
diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js
index b6d684b067..199d01b8fd 100644
--- a/test/parallel/test-whatwg-url-searchparams-foreach.js
+++ b/test/parallel/test-whatwg-url-searchparams-foreach.js
@@ -2,18 +2,14 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
-
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+const url = require('url');
+const URL = url.URL;
+const URLSearchParams = url.URLSearchParams;
 
 let a, b, i;
 
 // ForEach Check
-params = new URLSearchParams('a=1&b=2&c=3');
+const params = new URLSearchParams('a=1&b=2&c=3');
 const keys = [];
 const values = [];
 params.forEach(function(value, key) {
diff --git a/test/parallel/test-whatwg-url-searchparams-get.js b/test/parallel/test-whatwg-url-searchparams-get.js
index cfc6c345a6..7ddfb67e8b 100644
--- a/test/parallel/test-whatwg-url-searchparams-get.js
+++ b/test/parallel/test-whatwg-url-searchparams-get.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Get basics
 params = new URLSearchParams('a=b&c=d');
diff --git a/test/parallel/test-whatwg-url-searchparams-getall.js b/test/parallel/test-whatwg-url-searchparams-getall.js
index 8333982d68..34805164ab 100644
--- a/test/parallel/test-whatwg-url-searchparams-getall.js
+++ b/test/parallel/test-whatwg-url-searchparams-getall.js
@@ -2,14 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
-
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+const URLSearchParams = require('url').URLSearchParams;
 
+let params;
 let matches;
 
 // getAll() basics
diff --git a/test/parallel/test-whatwg-url-searchparams-has.js b/test/parallel/test-whatwg-url-searchparams-has.js
index c884227e0b..cd8901da23 100644
--- a/test/parallel/test-whatwg-url-searchparams-has.js
+++ b/test/parallel/test-whatwg-url-searchparams-has.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Has basics
 params = new URLSearchParams('a=b&c=d');
diff --git a/test/parallel/test-whatwg-url-searchparams-set.js b/test/parallel/test-whatwg-url-searchparams-set.js
index 2d9ae8aaa8..5ab2bbe8d8 100644
--- a/test/parallel/test-whatwg-url-searchparams-set.js
+++ b/test/parallel/test-whatwg-url-searchparams-set.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Set basics
 params = new URLSearchParams('a=b&c=d');
diff --git a/test/parallel/test-whatwg-url-searchparams-stringifier.js b/test/parallel/test-whatwg-url-searchparams-stringifier.js
index 0a53df6344..c591425461 100644
--- a/test/parallel/test-whatwg-url-searchparams-stringifier.js
+++ b/test/parallel/test-whatwg-url-searchparams-stringifier.js
@@ -2,13 +2,9 @@
 
 require('../common');
 const assert = require('assert');
-const URL = require('url').URL;
+const URLSearchParams = require('url').URLSearchParams;
 
-const m = new URL('http://example.org');
-let params = m.searchParams;
-
-// Until we export URLSearchParams
-const URLSearchParams = params.constructor;
+let params;
 
 // Serialize space
 // querystring does not currently handle spaces intelligently