Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Strip trailing slashes in sendRequest #92

Merged
merged 1 commit into from
May 1, 2020
Merged

feat: Strip trailing slashes in sendRequest #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/request-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import FormData = require('form-data');
import https = require('https');
import querystring = require('querystring');
import { PassThrough as readableStream } from 'stream';
import { buildRequestFileObject, getMissingParams, isEmptyObject, isFileData, isFileWithMetadata } from './helper';
import { buildRequestFileObject, getMissingParams, isEmptyObject, isFileData, isFileWithMetadata, stripTrailingSlash } from './helper';
import logger from './logger';

const isBrowser = typeof window === 'object';
Expand Down Expand Up @@ -180,6 +180,8 @@ export class RequestWrapper {
url = serviceUrl + url;
}

url = stripTrailingSlash(url);

let data = body;

if (form) {
Expand Down
24 changes: 24 additions & 0 deletions test/unit/request-wrapper.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,30 @@ describe('sendRequest', () => {
done();
});

it('sendRequest should strip trailing slashes', async done => {
const parameters = {
defaultOptions: {
body: 'post=body',
formData: '',
qs: {},
method: 'POST',
url: 'https://example.ibm.com/',
headers: {
'test-header': 'test-header-value',
},
responseType: 'buffer',
},
};

mockAxiosInstance.mockResolvedValue(axiosResolveValue);

const res = await requestWrapperInstance.sendRequest(parameters);
// assert results
expect(mockAxiosInstance.mock.calls[0][0].url).toEqual('https://example.ibm.com');
expect(res).toEqual(expectedResult);
done();
});

it('should call formatError if request failed', async done => {
const parameters = {
defaultOptions: {
Expand Down