fix: support literal query string (#2590)

Michael Solomon · web-flow · commit 4162fa8b2dda · 2024-02-17T18:38:55.000Z
diff --git a/lib/interceptor.js b/lib/interceptor.js
@@ -510,7 +510,7 @@ module.exports = class Interceptor {
       strFormattingFn = common.percentDecode
     }
 
-    if (queries instanceof URLSearchParams) {
+    if (queries instanceof URLSearchParams || typeof queries === 'string') {
       // Normalize the data into the shape that is matched against.
       // Duplicate keys are handled by combining the values into an array.
       queries = querystring.parse(queries.toString())
diff --git a/tests/got/test_query.js b/tests/got/test_query.js
@@ -19,6 +19,22 @@ describe('query params in path', () => {
 })
 
 describe('`query()`', () => {
+  describe('when called with a string', () => {
+    it('matches a url encoded query string of the same name=value', async () => {
+      const scope = nock('http://example.test')
+        .get('/')
+        .query('foo%5Bbar%5D%3Dhello%20world%21')
+        .reply()
+
+      const { statusCode } = await got(
+        'http://example.test/?foo%5Bbar%5D%3Dhello%20world%21',
+      )
+
+      expect(statusCode).to.equal(200)
+      scope.done()
+    })
+  })
+
   describe('when called with an object', () => {
     it('matches a query string of the same name=value', async () => {
       const scope = nock('http://example.test')
@@ -256,8 +272,8 @@ describe('`query()`', () => {
       const interceptor = nock('http://example.test').get('/')
 
       expect(() => {
-        interceptor.query('foo=bar')
-      }).to.throw(Error, 'Argument Error: foo=bar')
+        interceptor.query(1)
+      }).to.throw(Error, 'Argument Error: 1')
     })
   })
 

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ module.exports = class Interceptor {`
`510`	`510`	`strFormattingFn = common.percentDecode`
`511`	`511`	`}`
`512`	`512`
`513`		`- if (queries instanceof URLSearchParams) {`
	`513`	`+ if (queries instanceof URLSearchParams \|\| typeof queries === 'string') {`
`514`	`514`	`// Normalize the data into the shape that is matched against.`
`515`	`515`	`// Duplicate keys are handled by combining the values into an array.`
`516`	`516`	`queries = querystring.parse(queries.toString())`