Follow-up commit

sindresorhus · Apr 15, 2020 · 9eb8407 · 9eb8407
1 parent 407d597
commit 9eb8407
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/source/core/index.ts b/source/core/index.ts
@@ -717,8 +717,9 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 		}
 
 		// `options.cookieJar`
-		if (options.cookieJar) {
-			let {setCookie, getCookieString} = options.cookieJar;
+		const {cookieJar} = options;
+		if (cookieJar) {
+			let {setCookie, getCookieString} = cookieJar;
 
 			assert.function_(setCookie);
 			assert.function_(getCookieString);
@@ -727,9 +728,12 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 			if (setCookie.length === 4 && getCookieString.length === 0) {
 				setCookie = promisify(setCookie.bind(options.cookieJar));
 				getCookieString = promisify(getCookieString.bind(options.cookieJar));
-			}
 
-			options.cookieJar = {setCookie, getCookieString};
+				options.cookieJar = {
+					setCookie: setCookie.bind(cookieJar),
+					getCookieString: getCookieString.bind(getCookieString)
+				};
+			}
 		}
 
 		// `options.searchParams`

diff --git a/test/cookies.ts b/test/cookies.ts
@@ -89,15 +89,16 @@ test('does not throw on invalid cookies when options.ignoreInvalidCookies is set
 test('catches store errors', async t => {
 	const error = 'Some error';
 	const cookieJar = new toughCookie.CookieJar({
-		findCookies: (_, __, callback) => {
+		findCookies: (_, __, ___, callback) => {
 			callback(new Error(error), []);
 		},
 		findCookie: () => {},
 		getAllCookies: () => {},
 		putCookie: () => {},
 		removeCookies: () => {},
 		removeCookie: () => {},
-		updateCookie: () => {}
+		updateCookie: () => {},
+		synchronous: false
 	});
 
 	await t.throwsAsync(got('https://example.com', {cookieJar}), {message: error});