From 56fc3f5292a0893138b4e98af7116b02c671e057 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Thu, 13 Feb 2020 17:20:36 -0600
Subject: [PATCH] Fix false positives in query signals routes tests

* Refactors mock expectations so that they're actually evaluated; they
can't go within a mockImplementation call as it's evaluated in the wrong
scope.
* Fixes duplicated test to use the proper assertions
---
 .../signals/query_signals_route.test.ts       | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
index d245d45d30c1e..9439adfcec3cb 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
@@ -40,37 +40,42 @@ describe('query for signal', () => {
 
   describe('query and agg on signals index', () => {
     test('returns 200 when using single query', async () => {
-      clients.clusterClient.callAsCurrentUser.mockImplementation((endpoint, params) => {
-        expect(params!.body).toMatchObject({ ...typicalSignalsQueryAggs() });
-        return Promise.resolve(true);
-      });
-      const { statusCode } = await server.inject(getSignalsAggsQueryRequest());
+      const { statusCode } = await server.inject(getSignalsQueryRequest());
+
       expect(statusCode).toBe(200);
+      expect(clients.clusterClient.callAsCurrentUser).toHaveBeenCalledWith(
+        'search',
+        expect.objectContaining({ body: typicalSignalsQuery() })
+      );
       expect(myUtils.getIndex).toHaveReturnedWith('fakeindex');
     });
 
     test('returns 200 when using single agg', async () => {
-      clients.clusterClient.callAsCurrentUser.mockImplementation((endpoint, params) => {
-        expect(params!.body).toMatchObject({ ...typicalSignalsQueryAggs() });
-        return Promise.resolve(true);
-      });
       const { statusCode } = await server.inject(getSignalsAggsQueryRequest());
+
       expect(statusCode).toBe(200);
+      expect(clients.clusterClient.callAsCurrentUser).toHaveBeenCalledWith(
+        'search',
+        expect.objectContaining({ body: typicalSignalsQueryAggs() })
+      );
       expect(myUtils.getIndex).toHaveReturnedWith('fakeindex');
     });
 
     test('returns 200 when using aggs and query together', async () => {
-      const allTogether = getSignalsQueryRequest();
-      allTogether.payload = { ...typicalSignalsQueryAggs(), ...typicalSignalsQuery() };
-      clients.clusterClient.callAsCurrentUser.mockImplementation((endpoint, params) => {
-        expect(params!.body).toMatchObject({
-          ...typicalSignalsQueryAggs(),
-          ...typicalSignalsQuery(),
-        });
-        return Promise.resolve(true);
-      });
-      const { statusCode } = await server.inject(allTogether);
+      const request = getSignalsQueryRequest();
+      request.payload = { ...typicalSignalsQueryAggs(), ...typicalSignalsQuery() };
+      const { statusCode } = await server.inject(request);
+
       expect(statusCode).toBe(200);
+      expect(clients.clusterClient.callAsCurrentUser).toHaveBeenCalledWith(
+        'search',
+        expect.objectContaining({
+          body: {
+            ...typicalSignalsQuery(),
+            ...typicalSignalsQueryAggs(),
+          },
+        })
+      );
       expect(myUtils.getIndex).toHaveReturnedWith('fakeindex');
     });