Skip to content

Commit 9fbdfa1

Browse files
committed
test: add test for new default headers
1 parent af9b401 commit 9fbdfa1

2 files changed

Lines changed: 7 additions & 20 deletions

File tree

lib/requestwrapper.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,6 @@ export function sendRequest(parameters, _callback) {
213213

214214
// Headers
215215
options.headers = extend({}, options.headers);
216-
if (!isBrowser) {
217-
options.headers['User-Agent'] = `${pkg.name}-nodejs-${pkg.version};${options.headers[
218-
'User-Agent'
219-
] || ''}`;
220-
}
221216

222217
// Query params
223218
if (options.qs && Object.keys(options.qs).length > 0) {

test/unit/requestWrapper.test.js

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22

3+
const os = require('os');
34
const sendRequest = require('../../lib/requestwrapper').sendRequest;
45
const formatError = require('../../lib/requestwrapper').formatErrorIfExists;
56
const isStream = require('isstream');
@@ -25,32 +26,23 @@ describe('requestwrapper', () => {
2526
});
2627
});
2728

28-
it('header should be accurate', () => {
29+
it('should set default headers', () => {
2930
const service = {
3031
username: 'batman',
3132
password: 'bruce-wayne',
3233
url: 'http://ibm.com:80',
3334
version: '2017-05-26',
3435
};
35-
const service2 = {
36-
username: 'batman',
37-
password: 'bruce-wayne',
38-
url: 'http://ibm.com:80',
39-
version: '2017-05-26',
40-
headers: {
41-
'User-Agent': 'openwhisk',
42-
},
43-
};
4436
const assistant = new watson.AssistantV1(service);
45-
const assistant_ow = new watson.AssistantV1(service2);
4637
const payload = {
4738
workspace_id: 'workspace1',
4839
};
4940
const req = assistant.listIntents(payload, noop);
50-
const req2 = assistant_ow.listIntents(payload, noop);
51-
expect(req.headers['User-Agent']).toBe('watson-developer-cloud-nodejs-' + pjson.version + ';');
52-
expect(req2.headers['User-Agent']).toBe(
53-
'watson-developer-cloud-nodejs-' + pjson.version + ';' + 'openwhisk'
41+
expect(req.headers['User-Agent']).toBe(
42+
`watson-apis-node-sdk-${pjson.version} ${os.platform()} ${os.release()} ${process.version}`
43+
);
44+
expect(req.headers['X-IBMCloud-SDK-Analytics']).toBe(
45+
'service_name=conversation;service_version=v1;operation_id=listIntents,async=true'
5446
);
5547
});
5648
});

0 commit comments

Comments
 (0)