chore: fix cloud specs

Author: AtofStryker

packages/server/test/unit/cloud/api/api_spec.js

@@ -11,7 +11,6 @@ const encryption = require('../../../../lib/cloud/encryption')
 
 const {
   agent,
-  CombinedAgent,
 } = require('@packages/network')
 const pkg = require('@packages/root')
 const api = require('../../../../lib/cloud/api').default
@@ -141,10 +140,7 @@ describe('lib/cloud/api', () => {
 
   context('.rp', () => {
     beforeEach(() => {
-      // Because @packages/network is a bundled ES6 class with https://github.com/cypress-io/cypress/pull/32633
-      // we can no longer mock the addRequest method on the agent singleton instance directly
-      // Until we are able to convert this test to Vitest/TypeScript, we need to spy on the prototype
-      sinon.spy(CombinedAgent.prototype, 'addRequest')
+      sinon.spy(agent, 'addRequest')
 
       return nock.enableNetConnect()
     }) // nock will prevent requests from reaching the agent
@@ -155,9 +151,9 @@ describe('lib/cloud/api', () => {
       return api.ping()
       .thenThrow()
       .catch(() => {
-        expect(CombinedAgent.prototype.addRequest).to.be.calledOnce
+        expect(agent.addRequest).to.be.calledOnce
 
-        expect(CombinedAgent.prototype.addRequest).to.be.calledWithMatch(sinon.match.any, {
+        expect(agent.addRequest).to.be.calledWithMatch(sinon.match.any, {
           href: 'http://localhost:1234/ping',
         })
       })
@@ -169,9 +165,9 @@ describe('lib/cloud/api', () => {
       return api.ping()
       .thenThrow()
       .catch(() => {
-        expect(CombinedAgent.prototype.addRequest).to.be.calledOnce
+        expect(agent.addRequest).to.be.calledOnce
 
-        expect(CombinedAgent.prototype.addRequest).to.be.calledWithMatch(sinon.match.any, {
+        expect(agent.addRequest).to.be.calledWithMatch(sinon.match.any, {
           rejectUnauthorized: true,
         })
       })
@@ -189,9 +185,9 @@ describe('lib/cloud/api', () => {
         return api.ping()
         .thenThrow()
         .catch(() => {
-          expect(CombinedAgent.prototype.addRequest).to.be.calledOnce
+          expect(agent.addRequest).to.be.calledOnce
 
-          expect(CombinedAgent.prototype.addRequest).to.be.calledWithMatch(sinon.match.any, {
+          expect(agent.addRequest).to.be.calledWithMatch(sinon.match.any, {
             href: 'http://localhost:1234/ping',
           })
         })

packages/server/test/unit/cloud/api/cloud_request_spec.ts

@@ -1,9 +1,7 @@
 import sinon from 'sinon'
 import sinonChai from 'sinon-chai'
 import chai, { expect } from 'chai'
-// NOTE: having to import directly from the lib folder as we cannot test ES6 classes effectively with sinon.
-// Since this is a test, this is OK, but testing directly from lib in other modules is not a best practice.
-import agent, { strictAgent } from '@packages/network/lib/agent'
+import { agent, strictAgent } from '@packages/network'
 import axios, { CreateAxiosDefaults, AxiosInstance } from 'axios'
 import debugLib from 'debug'
 import stripAnsi from 'strip-ansi'