Fix non-enumerable options [such as body] not being used

Fixes #1342
sindresorhus · Jul 4, 2020 · 8f775c7 · 8f775c7
1 parent 4dbada9
commit 8f775c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -318,7 +318,7 @@ const nonEnumerableProperties: NonEnumerableProperty[] = [
 	'form'
 ];
 
-const setNonEnumerableProperties = (sources: Array<Options | Defaults | undefined>, to: Options): void => {
+export const setNonEnumerableProperties = (sources: Array<Options | Defaults | undefined>, to: Options): void => {
 	// Non enumerable properties shall not be merged
 	const properties: Partial<{[Key in NonEnumerableProperty]: any}> = {};
 

diff --git a/source/create.ts b/source/create.ts
@@ -38,7 +38,7 @@ import {
 	StreamOptions
 } from './types';
 import createRejection from './as-promise/create-rejection';
-import Request, {kIsNormalizedAlready} from './core';
+import Request, {kIsNormalizedAlready, setNonEnumerableProperties} from './core';
 import deepFreeze from './utils/deep-freeze';
 
 const errors = {
@@ -120,12 +120,16 @@ const create = (defaults: InstanceDefaults): Got => {
 			) as GotReturn;
 		};
 
+		// TODO: remove this in Got 12
 		if (is.plainObject(url)) {
-			options = {
+			const mergedOptions = {
 				...url as Options,
 				...options
 			};
 
+			setNonEnumerableProperties([url, options], mergedOptions);
+
+			options = mergedOptions;
 			url = undefined as any;
 		}
 

diff --git a/test/pagination.ts b/test/pagination.ts
@@ -383,7 +383,7 @@ test('`hooks` are not duplicated', withServer, async (t, server, got) => {
 	t.deepEqual(result, [1, 2, 3]);
 });
 
-test.failing('allowGetBody sends correct json payload with .paginate()', withServer, async (t, server, got) => {
+test('allowGetBody sends correct json payload with .paginate()', withServer, async (t, server, got) => {
 	let page = 1;
 	server.get('/', async (request, response) => {
 		const payload = await getStream(request);