Don't override hooks when merging arguments

Fixes #611
sindresorhus · Sep 13, 2018 · 3ad3950 · 3ad3950
1 parent 292f78a
commit 3ad3950
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/source/normalize-arguments.js b/source/normalize-arguments.js
@@ -55,7 +55,8 @@ const preNormalize = options => {
 };
 
 module.exports = (url, options, defaults) => {
-	options = merge({}, defaults.options, options ? preNormalize(options) : {});
+	options = merge({}, defaults.options, options || {});
+	options = preNormalize(options);
 
 	if (Reflect.has(options, 'url') || (is.object(url) && Reflect.has(url, 'url'))) {
 		throw new TypeError('Parameter `url` is not an option. Use got(url, options)');

diff --git a/test/create.js b/test/create.js
@@ -190,3 +190,20 @@ test('ability to pass a custom request method', async t => {
 
 	t.true(called);
 });
+
+test('hooks aren\'t overriden when merging options', async t => {
+	let called = false;
+	const instance = got.extend({
+		hooks: {
+			beforeRequest: [
+				() => {
+					called = true;
+				}
+			]
+		}
+	});
+
+	await instance(s.url, {});
+
+	t.true(called);
+});