Fix according to code review

PayU · Mar 20, 2019 · b1f120c · b1f120c
1 parent aff1383
commit b1f120c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/lib/helpers/response-adapter.js b/lib/helpers/response-adapter.js
@@ -27,19 +27,22 @@ function getRequestMethod(request) {
 }
 
 function getRequestPath(request) {
-  let path;
+  // request promise
+  if (request.uri) {
+    return request.uri.pathname;
+  }
 
-  // other
+  // axios
   if (request.path) {
-    ({ path } = request);
+    return request.path;
   }
 
   // supertest
   if (get(request, 'req.path')) {
-    ({ path } = request.req);
+    return request.req.path;
   }
 
-  return (path ? path.split('?')[0] : undefined);
+  return undefined;
 }
 
 function getResponseHeaders(response) {

diff --git a/test/response-adapter.test.js b/test/response-adapter.test.js
@@ -19,7 +19,7 @@ describe('responseAdapter', () => {
     expect(parseResponse(response)).to.be.like(expectedResponse);
   });
 
-  it('request-promise response with query string', async () => {
+  it('request-promise request with query string', async () => {
     const response = await request({
       status: 200,
       url: 'http://www.google.com/v2/pet/123?querty=value',
@@ -52,6 +52,17 @@ describe('responseAdapter', () => {
     expect(parseResponse(response)).to.be.like(expectedResponse);
   });
 
+  it('axios request with query string', async () => {
+    const response = await axios({
+      status: 200,
+      url: 'http://www.google.com/v2/pet/123?querty=value',
+      body: responses.body.valid.value,
+      headers: responses.headers.valid.value,
+    });
+
+    expect(parseResponse(response)).to.be.like(expectedResponse);
+  });
+
   it('axios non-2xx response', async () => {
     try {
       await axios({
@@ -75,6 +86,17 @@ describe('responseAdapter', () => {
     expect(parseResponse(response)).to.be.like(expectedResponse);
   });
 
+  it('supertest request with query string', async () => {
+    const response = await supertest({
+      status: 200,
+      url: 'http://www.google.com/v2/pet/123?querty=value',
+      body: responses.body.valid.value,
+      headers: responses.headers.valid.value,
+    });
+
+    expect(parseResponse(response)).to.be.like(expectedResponse);
+  });
+
   it('general object', async () => {
     expect(parseResponse({
       method: 'get',