better swr mocks

1 files changed, 10 insertions, 6 deletions

diff --git a/packages/web-util/src/tests/mock.ts b/packages/web-util/src/tests/mock.ts
index c01e66849..f4eb0e7aa 100644
--- a/packages/web-util/src/tests/mock.ts
+++ b/packages/web-util/src/tests/mock.ts
@@ -15,6 +15,7 @@
  */
 
 import { Logger } from "@gnu-taler/taler-util";
+import { deprecate } from "util";
 
 type HttpMethod =
   | "get"
@@ -63,6 +64,11 @@ type TestValues = {
 
 const logger = new Logger("testing/mock.ts");
 
+type MockedResponse = {
+  queryMade: ExpectationValues;
+  expectedQuery?: ExpectationValues;
+};
+
 export abstract class MockEnvironment {
   expectations: Array<ExpectationValues> = [];
   queriesMade: Array<ExpectationValues> = [];
@@ -108,7 +114,7 @@ export abstract class MockEnvironment {
       qparam?: any;
       response?: ResponseType;
     },
-  ): { status: number; payload: ResponseType } | undefined {
+  ): MockedResponse {
     const queryMade = { query, params, auth: params.auth };
     this.queriesMade.push(queryMade);
     const expectedQuery = this.expectations[this.index];
@@ -116,11 +122,9 @@ export abstract class MockEnvironment {
       if (this.debug) {
         logger.info("unexpected query made", queryMade);
       }
-      return undefined;
+      return { queryMade };
     }
-    const responseCode = this.expectations[this.index].query.code ?? 200;
-    const mockedResponse = this.expectations[this.index].params
-      ?.response as ResponseType;
+
     if (this.debug) {
       logger.info("tracking query made", {
         queryMade,
@@ -128,7 +132,7 @@ export abstract class MockEnvironment {
       });
     }
     this.index++;
-    return { status: responseCode, payload: mockedResponse };
+    return { queryMade, expectedQuery };
   }
 
   public assertJustExpectedRequestWereMade(): AssertStatus {