fix: match pre-requests in reverse order

cypress-io · Dec 7, 2021 · 6292de3 · 6292de3
1 parent 008613f
commit 6292de3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/proxy/lib/http/util/prerequests.ts b/packages/proxy/lib/http/util/prerequests.ts
@@ -21,11 +21,11 @@ process.once('exit', () => {
 })
 
 function removeOne<T> (a: Array<T>, predicate: (v: T) => boolean): T | void {
-  for (const i in a) {
+  for (let i = a.length - 1; i >= 0; i--) {
     const v = a[i]
 
     if (predicate(v)) {
-      a.splice(i as unknown as number, 1)
+      a.splice(i, 1)
 
       return v
     }

diff --git a/packages/proxy/test/unit/http/util/prerequests.spec.ts b/packages/proxy/test/unit/http/util/prerequests.spec.ts
@@ -11,6 +11,8 @@ describe('http/util/prerequests', () => {
   })
 
   it('synchronously matches a pre-request that existed at the time of the request', () => {
+    // should match in reverse order
+    preRequests.addPending({ requestId: '1234', url: 'foo', method: 'WRONGMETHOD' } as BrowserPreRequest)
     preRequests.addPending({ requestId: '1234', url: 'foo', method: 'GET' } as BrowserPreRequest)
 
     const cb = sinon.stub()