diff --git a/packages/web-util/src/tests/mock.ts b/packages/web-util/src/tests/mock.ts index 115994cbd..c01e66849 100644 --- a/packages/web-util/src/tests/mock.ts +++ b/packages/web-util/src/tests/mock.ts @@ -191,6 +191,9 @@ export abstract class MockEnvironment { return { result: "error-difference", diff: "method", + last: lastQuery.query.method, + expected: currentExpectedQuery.query.method, + index, }; } if (currentExpectedQuery.query.url !== lastQuery.query.url) { @@ -280,6 +283,9 @@ interface AssertQueryMadeButNotExpected { interface AssertExpectedQueryMethodMismatch { result: "error-difference"; diff: "method"; + last: string; + expected: string; + index: number; } interface AssertExpectedQueryUrlMismatch { result: "error-difference"; diff --git a/packages/web-util/src/utils/axios.ts b/packages/web-util/src/utils/axios.ts deleted file mode 100644 index c38314009..000000000 --- a/packages/web-util/src/utils/axios.ts +++ /dev/null @@ -1,79 +0,0 @@ -/* - This file is part of GNU Taler - (C) 2021 Taler Systems S.A. - - GNU Taler is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNU Taler; see the file COPYING. If not, see - */ - -import axios, { AxiosPromise, AxiosRequestConfig } from "axios"; - -/** - * - * @author Sebastian Javier Marchano (sebasjm) - */ - -//FIXME: remove this, since it is not used anymore -/** - * @deprecated - */ -export let removeAxiosCancelToken = false; - -export let axiosHandler = function doAxiosRequest( - config: AxiosRequestConfig, -): AxiosPromise { - return axios(config); -}; - -const listOfHandlersToUseOnce = new Array(); - -/** - * Set this backend library to testing mode. - * Instead of calling the axios library the @handler will be called - * - * @param handler callback that will mock axios - */ -export function setAxiosRequestAsTestingEnvironment( - handler: AxiosHandler, -): void { - removeAxiosCancelToken = true; - axiosHandler = function defaultTestingHandler(config) { - const currentHanlder = listOfHandlersToUseOnce.shift(); - if (!currentHanlder) { - return handler(config); - } - - return currentHanlder(config); - }; -} - -type AxiosHandler = (config: AxiosRequestConfig) => AxiosPromise; -type AxiosArguments = { args: AxiosRequestConfig | undefined }; - -/** - * Replace Axios handler with a mock. - * Throw if is called more than once - * - * @param handler mock function - * @returns savedArgs - */ -export function mockAxiosOnce(handler: AxiosHandler): { - args: AxiosRequestConfig | undefined; -} { - const savedArgs: AxiosArguments = { args: undefined }; - listOfHandlersToUseOnce.push( - (config: AxiosRequestConfig): AxiosPromise => { - savedArgs.args = config; - return handler(config); - }, - ); - return savedArgs; -} diff --git a/packages/web-util/src/utils/index.ts b/packages/web-util/src/utils/index.ts deleted file mode 100644 index 6dfbd5f8d..000000000 --- a/packages/web-util/src/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./axios.js"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd9d2d308..ddd8d7d0b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -694,7 +694,6 @@ importers: '@types/node': ^18.11.17 '@types/web': ^0.0.82 '@types/ws': ^8.5.3 - axios: ^1.2.2 chokidar: ^3.5.3 esbuild: ^0.14.21 express: ^4.18.2 @@ -712,7 +711,6 @@ importers: '@types/node': 18.11.17 '@types/web': 0.0.82 '@types/ws': 8.5.3 - axios: 1.2.2 chokidar: 3.5.3 esbuild: 0.14.54 express: 4.18.2 @@ -7638,16 +7636,6 @@ packages: - debug dev: true - /axios/1.2.2: - resolution: {integrity: sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==} - dependencies: - follow-redirects: 1.15.2 - form-data: 4.0.0 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - dev: true - /axobject-query/2.2.0: resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==} dev: true