Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/api-axios/src/resources/dma-cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default class AvLogMessagesApiV3 extends AvMicroserviceApi {
flattened.X_XSRF_TOKEN = document.cookie.replace(/(?:(?:^|.*;\s*)XSRF-TOKEN\s*=\s*([^;]*).*$)|^.*$/, '$1');

const fields = Object.keys(flattened)
.filter((key) => flattened[key] != null)
.map((key) => {
const name = key.replaceAll(/\[\d+]/g, '[]');
const value = flattened[key];
Expand Down
1 change: 1 addition & 0 deletions packages/api-axios/src/resources/dma.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default class AvLogMessagesApiV2 extends AvMicroserviceApi {
flattened.X_XSRF_TOKEN = document.cookie.replace(/(?:(?:^|.*;\s*)XSRF-TOKEN\s*=\s*([^;]*).*$)|^.*$/, '$1');

const fields = Object.keys(flattened)
.filter((key) => flattened[key] != null)
.map((key) => {
const name = key.replaceAll(/\[\d+]/g, '[]');
const value = flattened[key];
Expand Down
21 changes: 19 additions & 2 deletions packages/api-axios/src/resources/tests/dma-cloud.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,28 @@ describe('AvLogMessagesApiV3', () => {

test('send should generate fields correctly', () => {
const fields = api.send('info', { testField1: 'test1', testField2: 'test2'});
expect(fields).toContain('level=info&entries.testField1=test1&entries.testField2=test2');
expect(fields).toStrictEqual('level=info&entries.testField1=test1&entries.testField2=test2&X_XSRF_TOKEN=');
});

test('send should generate optional overrides fields correctly', () => {
const fields = api.send('info', { testField1: 'test1', testField2: 'test2', overrides: { akaName: 'override1', transactionId: 'override2' } });
expect(fields).toContain('level=info&entries.testField1=test1&entries.testField2=test2&overrides.akaName=override1&overrides.transactionId=override2');
expect(fields).toStrictEqual('level=info&entries.testField1=test1&entries.testField2=test2&overrides.akaName=override1&overrides.transactionId=override2&X_XSRF_TOKEN=');
});

test('send should not include undefined values in fields', () => {
const fields = api.send('info', { testField1: 'test1', testField2: undefined });
expect(fields).toStrictEqual('level=info&entries.testField1=test1&X_XSRF_TOKEN=');
expect(fields).not.toContain('testField2');
});

test('send should not include null values in fields', () => {
const fields = api.send('info', { testField1: 'test1', testField2: null });
expect(fields).toStrictEqual('level=info&entries.testField1=test1&X_XSRF_TOKEN=');
expect(fields).not.toContain('testField2');
});

test('send should not include overrides=undefined when overrides is not provided', () => {
const fields = api.send('info', { testField1: 'test1' });
expect(fields).not.toContain('overrides');
});
});
21 changes: 19 additions & 2 deletions packages/api-axios/src/resources/tests/dma.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,28 @@ describe('AvLogMessagesApiV2', () => {

test('send should generate fields correctly', () => {
const fields = api.send('info', { testField1: 'test1', testField2: 'test2'});
expect(fields).toContain('level=info&entries.testField1=test1&entries.testField2=test2');
expect(fields).toStrictEqual('level=info&entries.testField1=test1&entries.testField2=test2&X_XSRF_TOKEN=');
});

test('send should generate optional overrides fields correctly', () => {
const fields = api.send('info', { testField1: 'test1', testField2: 'test2', overrides: { akaName: 'override1', transactionId: 'override2' } });
expect(fields).toContain('level=info&entries.testField1=test1&entries.testField2=test2&overrides.akaName=override1&overrides.transactionId=override2');
expect(fields).toStrictEqual('level=info&entries.testField1=test1&entries.testField2=test2&overrides.akaName=override1&overrides.transactionId=override2&X_XSRF_TOKEN=');
});

test('send should not include undefined values in fields', () => {
const fields = api.send('info', { testField1: 'test1', testField2: undefined });
expect(fields).toStrictEqual('level=info&entries.testField1=test1&X_XSRF_TOKEN=');
expect(fields).not.toContain('testField2');
});

test('send should not include null values in fields', () => {
const fields = api.send('info', { testField1: 'test1', testField2: null });
expect(fields).toStrictEqual('level=info&entries.testField1=test1&X_XSRF_TOKEN=');
expect(fields).not.toContain('testField2');
});

test('send should not include overrides=undefined when overrides is not provided', () => {
const fields = api.send('info', { testField1: 'test1' });
expect(fields).not.toContain('overrides');
});
});
Loading