From a2811add93b2000ae33f0d7e1cca628eb3a526ff Mon Sep 17 00:00:00 2001 From: nomid0612 Date: Thu, 22 Dec 2022 14:03:07 +0300 Subject: [PATCH 1/2] refactor steps-api: remove apiHelpers.ts file and re-use sendHttpRequest method from api-service --- index.js | 1 - package-lock.json | 33 +++++++++++++++++++++++++-------- package.json | 1 + src/apiActionSteps.ts | 2 +- src/apiHelpers.ts | 24 ------------------------ 5 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 src/apiHelpers.ts diff --git a/index.js b/index.js index b073ccb..369de38 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,5 @@ /* eslint-disable import/no-unresolved */ require('./lib/apiActionSteps.js'); -require('./lib/apiHelpers.js'); require('./lib/apiVerificationSteps.js'); require('./lib/hooks.js'); require('./lib/parameterTypes.js'); diff --git a/package-lock.json b/package-lock.json index 75aec80..4ebc349 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,16 @@ { "name": "@qavajs/steps-api", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@qavajs/steps-api", - "version": "0.0.3", + "version": "0.0.4", "license": "MIT", "dependencies": { "@cucumber/cucumber": "^8.2.2", + "@qavajs/api-service": "^0.0.3", "@qavajs/memory": "^1.0.0", "@qavajs/validation": "^0.0.1", "chai": "^4.3.6", @@ -1552,10 +1553,18 @@ "node": ">= 8" } }, + "node_modules/@qavajs/api-service": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@qavajs/api-service/-/api-service-0.0.3.tgz", + "integrity": "sha512-JL9MyV/nMnWvVbiAwR3AY9FHJw4nVLek3XkvyVDDmEElMzXsKAvBusE6Lcuki9yFO1DDGUy4qf+1+cPTEGOvaA==", + "dependencies": { + "node-fetch": "^2.6.1" + } + }, "node_modules/@qavajs/memory": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@qavajs/memory/-/memory-1.1.0.tgz", - "integrity": "sha512-o0xE1YfWt65ZOlNrChW4T7nEjmy1/Dh6M0BCVaMCjMoth/fjIilUkGMVU5YtJ249GDR3k/ODvWbhWXBbuIl/vA==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@qavajs/memory/-/memory-1.1.1.tgz", + "integrity": "sha512-osFUGn+2DybC7efiGLvERoShVF1KqSwZytjz6eTe+eBkF1RAwTw5F1kPA2C0h8zq0YBhLUazB2pTo5yv5P94BA==" }, "node_modules/@qavajs/validation": { "version": "0.0.1", @@ -9301,10 +9310,18 @@ "fastq": "^1.6.0" } }, + "@qavajs/api-service": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@qavajs/api-service/-/api-service-0.0.3.tgz", + "integrity": "sha512-JL9MyV/nMnWvVbiAwR3AY9FHJw4nVLek3XkvyVDDmEElMzXsKAvBusE6Lcuki9yFO1DDGUy4qf+1+cPTEGOvaA==", + "requires": { + "node-fetch": "^2.6.1" + } + }, "@qavajs/memory": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@qavajs/memory/-/memory-1.1.0.tgz", - "integrity": "sha512-o0xE1YfWt65ZOlNrChW4T7nEjmy1/Dh6M0BCVaMCjMoth/fjIilUkGMVU5YtJ249GDR3k/ODvWbhWXBbuIl/vA==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@qavajs/memory/-/memory-1.1.1.tgz", + "integrity": "sha512-osFUGn+2DybC7efiGLvERoShVF1KqSwZytjz6eTe+eBkF1RAwTw5F1kPA2C0h8zq0YBhLUazB2pTo5yv5P94BA==" }, "@qavajs/validation": { "version": "0.0.1", diff --git a/package.json b/package.json index def6301..2b4d50e 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ }, "dependencies": { "@cucumber/cucumber": "^8.2.2", + "@qavajs/api-service": "^0.0.3", "@qavajs/memory": "^1.0.0", "@qavajs/validation": "^0.0.1", "chai": "^4.3.6", diff --git a/src/apiActionSteps.ts b/src/apiActionSteps.ts index 5526680..387f38a 100644 --- a/src/apiActionSteps.ts +++ b/src/apiActionSteps.ts @@ -1,7 +1,7 @@ import memory from '@qavajs/memory'; import { When } from '@cucumber/cucumber'; import { RequestInit } from 'node-fetch'; -import { sendHttpRequest } from './apiHelpers'; +import { sendHttpRequest } from '@qavajs/api-service'; /** * Send request to the API diff --git a/src/apiHelpers.ts b/src/apiHelpers.ts deleted file mode 100644 index 167bb59..0000000 --- a/src/apiHelpers.ts +++ /dev/null @@ -1,24 +0,0 @@ -import fetch, { RequestInit, Response } from 'node-fetch'; - -/** - * Sending http request - * - * @param {String} url - url that should be requested - * @param {RequestInit} params - Object with all needed properties for request - * @returns {Response} response - response object with payload variable as parsed JSON response body - */ -async function sendHttpRequest(url: string, params: RequestInit): Promise { - const conf = { - headers: { - 'Content-Type': 'application/json', - }, - ...params, - }; - const response: Response = await fetch(url, conf); - const responseBodyPayload = { payload: await response.json() }; - const updatedResponse = Object.assign(response, responseBodyPayload); - - return updatedResponse; -} - -export { sendHttpRequest }; From c5c36505b7e9cd409e99ec64ae6d770b31e58a39 Mon Sep 17 00:00:00 2001 From: nomid0612 Date: Thu, 22 Dec 2022 14:05:18 +0300 Subject: [PATCH 2/2] refactor steps-api: remove apiHelpers.ts file and re-use sendHttpRequest method from api-service --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b4d50e..d4f64d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@qavajs/steps-api", - "version": "0.0.4", + "version": "0.0.5", "description": "api steps for @qavajs project", "scripts": { "build": "tsc",