fix(rest): updated Axios to 0.27.2

Related axios/axios#4124 closes #1223
serenity-js · Jun 11, 2022 · b54694b · b54694b
1 parent 3113f20
commit b54694b
Show file tree

Hide file tree

Showing 10 changed files with 183 additions and 382 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.1",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/node": "^14.18.16",
+    "@types/node": "^14.18.21",
     "@types/sinon": "^10.0.11",
     "@types/sinon-chai": "^3.2.8",
     "@typescript-eslint/eslint-plugin": "^5.27.0",

diff --git a/packages/core/src/model/artifacts/HTTPRequestResponse.ts b/packages/core/src/model/artifacts/HTTPRequestResponse.ts
@@ -12,13 +12,15 @@ export interface RequestAndResponse extends JSONObject {
     request: {
         url: string;
         method: string;
-        headers: { [header: string]: string };
+        headers: Record<string, string | number | boolean>;
         data?: any;
     };
     response: {
         status: number;
         data?: any;
-        headers?: { [header: string]: string };
+        headers?: Record<string, string> & {
+            'set-cookie'?: string[]
+        };
     };
 }
 

diff --git a/packages/local-server/package.json b/packages/local-server/package.json
@@ -67,7 +67,7 @@
     "@types/hapi": "^18.0.7",
     "@types/mocha": "^9.1.1",
     "@types/restify": "^8.5.4",
-    "axios": "^0.21.4",
+    "axios": "^0.27.2",
     "express": "^4.18.1",
     "koa": "^2.13.4",
     "mocha": "^10.0.0",

diff --git a/packages/protractor/package.json b/packages/protractor/package.json
@@ -90,7 +90,7 @@
     "@types/html-minifier": "^4.0.2",
     "@types/mocha": "^9.1.1",
     "@types/selenium-webdriver": "^3.0.19",
-    "axios": "^0.21.4",
+    "axios": "^0.27.2",
     "body-parser": "^1.20.0",
     "cross-env": "^7.0.3",
     "express": "^4.18.1",

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@serenity-js/core": "3.0.0-rc.18",
-    "axios": "^0.21.4"
+    "axios": "^0.27.2"
   },
   "devDependencies": {
     "@documentation/esdoc-template": "3.0.0",

diff --git a/packages/rest/src/screenplay/abilities/CallAnApi.ts b/packages/rest/src/screenplay/abilities/CallAnApi.ts
@@ -1,5 +1,5 @@
 import { Ability, ConfigurationError, LogicError, TestCompromisedError, UsesAbilities } from '@serenity-js/core';
-import axios, { AxiosError, AxiosInstance, AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios, { AxiosDefaults, AxiosError, AxiosInstance, AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
 const mergeConfig = require('axios/lib/core/mergeConfig');      // eslint-disable-line @typescript-eslint/no-var-requires
 const buildFullPath = require('axios/lib/core/buildFullPath');  // eslint-disable-line @typescript-eslint/no-var-requires
 
@@ -126,7 +126,7 @@ export class CallAnApi implements Ability {
      *
      * @see {@link AxiosRequestConfig}
      */
-    modifyConfig(fn: (original: AxiosRequestConfig) => any): void {
+    modifyConfig(fn: (original: AxiosDefaults<any>) => any): void {
         fn(this.axiosInstance.defaults);
     }
 

diff --git a/packages/serenity-bdd/package.json b/packages/serenity-bdd/package.json
@@ -51,7 +51,7 @@
     "@serenity-js/assertions": "3.0.0-rc.18",
     "@serenity-js/core": "3.0.0-rc.18",
     "@serenity-js/rest": "3.0.0-rc.18",
-    "axios": "^0.21.4",
+    "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "find-java-home": "^1.2.2",
     "https-proxy-agent": "^5.0.1",

diff --git a/...rc/stage/crew/serenity-bdd-reporter/processors/transformations/activityRelatedArtifact.ts b/...rc/stage/crew/serenity-bdd-reporter/processors/transformations/activityRelatedArtifact.ts
@@ -60,7 +60,7 @@ export function activityRelatedArtifact<Context extends SerenityBDDReportContext
             .else(_ => report)
 }
 
-function mapToString(dictionary: {[key: string]: string}) {
+function mapToString(dictionary: Record<string, string | number | boolean>) {
     return Object.keys(dictionary).map(key => `${key}: ${dictionary[key]}`).join('\n');
 }
 
@@ -88,9 +88,9 @@ function httpRequestResponse<Context extends SerenityBDDReportContext>(activityI
                 method:          requestResponse.request.method.toUpperCase(),
                 path:            requestResponse.request.url,
                 content:         bodyToString(requestResponse.request.data),
-                contentType:     requestResponse.request.headers['Content-Type'] || '', // todo: add a case insensitive proxy around this RFC 2616: 4.2
-                requestHeaders:  mapToString(requestResponse.request.headers)  || '',
-                requestCookies:  requestResponse.request.headers.Cookie || '', // todo: add a case insensitive proxy around this RFC 2616: 4.2
+                contentType:     String(requestResponse.request.headers['Content-Type'] || ''), // todo: add a case insensitive proxy around this RFC 2616: 4.2
+                requestHeaders:  mapToString(requestResponse.request.headers || {})  || '',
+                requestCookies:  String(requestResponse.request.headers.Cookie || ''), // todo: add a case insensitive proxy around this RFC 2616: 4.2
                 statusCode:      requestResponse.response.status,
                 responseHeaders: mapToString(requestResponse.response.headers) || '',
                 responseCookies: requestResponse.response.headers.Cookie || '', // todo: add a case insensitive proxy around this RFC 2616: 4.2

diff --git a/packages/webdriverio/package.json b/packages/webdriverio/package.json
@@ -86,7 +86,7 @@
     "@wdio/local-runner": "^7.19.7",
     "@wdio/mocha-framework": "^7.19.7",
     "@wdio/spec-reporter": "^7.19.7",
-    "axios": "^0.21.4",
+    "axios": "^0.27.2",
     "cross-env": "^7.0.3",
     "mocha": "^10.0.0",
     "mocha-testdata": "^1.2.0",