From 6573d1bf5fe340f2a356870a286d0465d545fadb Mon Sep 17 00:00:00 2001
From: Jahed Ahmed <jahed@snyk.io>
Date: Wed, 11 Aug 2021 18:28:27 +0000
Subject: [PATCH] test: remove spy from acceptance test

This spy is never called as we're executing code outside the process.
---
 test/acceptance/fake-server.ts         | 4 ++++
 test/jest/acceptance/analytics.spec.ts | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/acceptance/fake-server.ts b/test/acceptance/fake-server.ts
index aa03c6f95c..05c2d5ac37 100644
--- a/test/acceptance/fake-server.ts
+++ b/test/acceptance/fake-server.ts
@@ -8,6 +8,7 @@ interface FakeServer extends restify.Server {
   popRequests: (num: number) => restify.Request[];
   setNextResponse: (r: any) => void;
   setNextStatusCodeAndResponse: (c: number, r: any) => void;
+  clearRequests: () => void;
 }
 
 export function fakeServer(root, apikey) {
@@ -23,6 +24,9 @@ export function fakeServer(root, apikey) {
   server.popRequests = (num: number) => {
     return server._reqLog.splice(server._reqLog.length - num, num);
   };
+  server.clearRequests = () => {
+    server._reqLog = [];
+  };
   server.use(restify.plugins.acceptParser(server.acceptable));
   server.use(restify.plugins.queryParser({ mapParams: true }));
   server.use(restify.plugins.bodyParser({ mapParams: true }));
diff --git a/test/jest/acceptance/analytics.spec.ts b/test/jest/acceptance/analytics.spec.ts
index 4e68d50c01..851e42d26f 100644
--- a/test/jest/acceptance/analytics.spec.ts
+++ b/test/jest/acceptance/analytics.spec.ts
@@ -1,7 +1,6 @@
 import { fakeServer } from '../../acceptance/fake-server';
 import { createProject } from '../util/createProject';
 import { runSnykCLI } from '../util/runSnykCLI';
-import * as request from '../../../src/lib/request';
 import * as fs from 'fs';
 
 describe('analytics module', () => {
@@ -27,7 +26,7 @@ describe('analytics module', () => {
   });
 
   afterEach(() => {
-    jest.restoreAllMocks();
+    server.clearRequests();
   });
 
   afterAll((done) => {
@@ -301,7 +300,6 @@ describe('analytics module', () => {
   });
 
   it("won't send analytics if disable analytics is set", async () => {
-    const requestSpy = jest.spyOn(request, 'makeRequest');
     const { code } = await runSnykCLI(`version`, {
       env: {
         ...env,
@@ -309,6 +307,8 @@ describe('analytics module', () => {
       },
     });
     expect(code).toBe(0);
-    expect(requestSpy).not.toBeCalled();
+
+    const lastRequest = server.popRequest();
+    expect(lastRequest).toBeUndefined();
   });
 });