Fix normalizeArguments() not copying non-enumerable properties

Fixes #1186
sindresorhus · May 2, 2020 · 278c421 · 278c421
1 parent 767d745
commit 278c421
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -856,7 +856,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 		options.maxRedirects = options.maxRedirects ?? 0;
 
 		// Set non-enumerable properties
-		setNonEnumerableProperties([defaults, options], options);
+		setNonEnumerableProperties([defaults, rawOptions], options);
 
 		return options as NormalizedOptions;
 	}

diff --git a/test/normalize-arguments.ts b/test/normalize-arguments.ts
@@ -9,3 +9,14 @@ test('should merge options replacing responseType', t => {
 
 	t.is(options.responseType, responseType);
 });
+
+test('should copy non-numerable properties', t => {
+	const options = {
+		json: {hello: '123'}
+	};
+
+	const merged = got.mergeOptions(got.defaults.options, options);
+	const mergedTwice = got.mergeOptions(got.defaults.options, merged);
+
+	t.is(mergedTwice.json, options.json);
+});
diff --git a/test/pagination.ts b/test/pagination.ts
@@ -309,7 +309,7 @@ test('ignores the `resolveBodyOnly` option', withServer, async (t, server, got)
 	t.deepEqual(items, [1, 2]);
 });
 
-test.failing('allowGetBody sends json payload with .paginate()', withBodyParsingServer, async (t, server, got) => {
+test('allowGetBody sends json payload with .paginate()', withBodyParsingServer, async (t, server, got) => {
 	server.get('/', (request, response) => {
 		if (request.body.hello !== 'world') {
 			response.statusCode = 400;
@@ -318,15 +318,19 @@ test.failing('allowGetBody sends json payload with .paginate()', withBodyParsing
 		response.end(JSON.stringify([1, 2, 3]));
 	});
 
-	const iterator = got.paginate({
+	const iterator = got.paginate<number>({
 		allowGetBody: true,
 		json: {hello: 'world'},
 		retry: 0
 	});
 
-	const result = await iterator.next();
+	const results: number[] = [];
+
+	for await (const item of iterator) {
+		results.push(item);
+	}
 
-	t.deepEqual(result.value, [1, 2, 3]);
+	t.deepEqual(results, [1, 2, 3]);
 });
 
 test('`requestLimit` works', withServer, async (t, server, got) => {