Merge 41e1e65 into a287f8e

index.js

@@ -16,6 +16,7 @@ const unzipResponse = require('unzip-response');
 const createErrorClass = require('create-error-class');
 const isRetryAllowed = require('is-retry-allowed');
 const Buffer = require('safe-buffer').Buffer;
+const isURL = require('isurl');
 const pkg = require('./package');
 
 function requestAsEventEmitter(opts) {
@@ -206,6 +207,10 @@ function normalizeArguments(url, opts) {
 		}
 	}
 
+	if (isURL(url)) {
+		url = urlParseLax(url.href);
+	}
+
 	opts = Object.assign(
 		{
 			protocol: 'http:',

package.json

@@ -48,6 +48,7 @@
     "is-redirect": "^1.0.0",
     "is-retry-allowed": "^1.0.0",
     "is-stream": "^1.0.0",
+    "isurl": "^1.0.0-alpha3",
     "lowercase-keys": "^1.0.0",
     "safe-buffer": "^5.0.1",
     "timed-out": "^4.0.0",
@@ -64,6 +65,7 @@
     "pem": "^1.4.4",
     "pify": "^2.3.0",
     "tempfile": "^1.1.1",
+    "whatwg-url": "^4.6.0",
     "xo": "^0.18.0"
   },
   "ava": {

test/arguments.js

@@ -1,7 +1,9 @@
+import whatwgURL from 'whatwg-url';
 import test from 'ava';
 import got from '../';
 import {createServer} from './helpers/server';
 
+const URL = whatwgURL.URL;
 let s;
 
 test.before('setup', async () => {
@@ -65,6 +67,11 @@ test('should throw with auth in url', async t => {
 	}
 });
 
+test('whatwg-url support', async () => {
+	const wURL = new URL(`${s.url}/test`);
+	await got(wURL);
+});
+
 test.after('cleanup', async () => {
 	await s.close();
 });