code review fixes

Author: ALegchilov

src/apiActionSteps.ts

@@ -1,6 +1,6 @@
 import { When } from '@cucumber/cucumber';
 import { logPayload, sendHttpRequest } from './utils';
-import { MemoryValue } from '@qavajs/core/src/load';
+import { MemoryValue } from '@qavajs/core';
 
 /**
  * Send request to the API

src/apiConstructionSteps.ts

@@ -1,7 +1,7 @@
 import { DataTable, When } from '@cucumber/cucumber';
 import { dataTable2Object, sendHttpRequest } from './utils';
 import GraphQl from './GraphQl';
-import { MemoryValue } from '@qavajs/core/src/load';
+import { MemoryValue } from '@qavajs/core';
 
 /**
  * Create request template and save it to memory

src/utils.ts

@@ -1,5 +1,4 @@
 import { DataTable, IWorld } from '@cucumber/cucumber';
-import { MemoryValue } from '@qavajs/core/src/load';
 import WebSocket from 'ws';
 
 /**
@@ -79,17 +78,6 @@ export function logPayload(type: string, payload: any): string {
   }
 }
 
-export async function sendMessage(
-  {
-    messageKey,
-    wsKey,
-  }: {
-    messageKey: MemoryValue;
-    wsKey: MemoryValue;
-  },
-  context: any,
-) {
-  const ws = (await context.getValue(wsKey)) as WebSocket;
-  const message = await context.getValue(messageKey);
+export function sendMessage(message: any, ws: WebSocket){
   ws.send(Buffer.from(message));
 }

src/websocket.ts

@@ -1,7 +1,8 @@
 import { When } from '@cucumber/cucumber';
 import WebSocket from 'ws';
-import { MemoryValue } from '@qavajs/core/src/load';
+import { MemoryValue } from '@qavajs/core';
 import { sendMessage } from './utils';
+import memory from "@qavajs/memory";
 
 When('I connect to {value} ws endpoint {value}', async function (uriKey: MemoryValue, wsKey: MemoryValue) {
   const uri = await uriKey.value();
@@ -35,15 +36,19 @@ When(
   },
 );
 
-When('I send {string} message to {string} ws endpoint', async function (messageKey: MemoryValue, wsKey: MemoryValue) {
-  await sendMessage({ messageKey, wsKey }, this);
+When('I send {value} message to {value} ws endpoint', async function (messageKey: MemoryValue, wsKey: MemoryValue) {
+  const message = await messageKey.value();
+  const ws = await wsKey.value();
+  sendMessage(message, ws);
 });
 
-When('I send message to {string} ws endpoint:', async function (wsKey: MemoryValue, messageKey) {
-  await sendMessage({ messageKey, wsKey }, this);
+When('I send message to {value} ws endpoint:', async function (wsKey: MemoryValue, messageKey: string) {
+  const message = await  memory.getValue(messageKey);
+  const ws = await wsKey.value();
+  sendMessage(message, ws);
 });
 
-When('I close {string} ws connection', async function (wsKey: MemoryValue) {
+When('I close {value} ws connection', async function (wsKey: MemoryValue) {
   const ws = (await wsKey.value()) as WebSocket;
   ws.close();
 });

test-e2e/step-definitions/index.ts

@@ -1,6 +1,6 @@
 import { Then } from '@cucumber/cucumber';
 import { expect } from 'chai';
-import { MemoryValue } from '@qavajs/core/src/load';
+import { MemoryValue } from '@qavajs/core';
 
 Then('I expect {value} memory value to be equal {value}', async function (actual: MemoryValue, expected: MemoryValue) {
   const actualValue = await actual.value();