Skip to content

Fix errors when creating a predicate with a request body containing a field of type number. #768

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

Open
srmppn wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix errors when creating a predicate with a request body containing a field of type number. #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79aa225
Fix errors when matching with type number
May 17, 2024
0e9bc4b
fix eslint
May 18, 2024
d1a7765
fix eslint
May 18, 2024
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
105 changes: 105 additions & 0 deletions mbTest/api/http/httpStubTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,111 @@ function merge (defaults, overrides) {

assert.strictEqual(response.body, 'Matched');
});

it('should support matching request body with type number using contains', async function () {
const request = {
port,
protocol,
stubs: [
{ predicates: [{ contains: { body: { number: 1 } } }], responses: [{ is: { body: 'Matched Exact Integer' } }] },
{ predicates: [{ contains: { body: { number: 2 } } }], responses: [{ is: { body: 'Matched Partial Integer' } }] },
{ predicates: [{ contains: { body: { number: 3.03 } } }], responses: [{ is: { body: 'Matched Exact Float' } }] },
{ predicates: [{ contains: { body: { number: 4.04 } } }], responses: [{ is: { body: 'Matched Partial Float' } }] },
{ predicates: [{ contains: { body: { number: -5 } } }], responses: [{ is: { body: 'Matched Exact Negative' } }] },
{ predicates: [{ contains: { body: { number: -6 } } }], responses: [{ is: { body: 'Matched Partial Negative' } }] }
]
};

await api.createImposter(request);

const matchedInteger = await client.post('/', '{ "number": 1 }', port);
const matchedPartialInteger = await client.post('/', '{ "number": 22 }', port);

const matchedExactFloat = await client.post('/', '{ "number": 3.03 }', port);
const matchedPartialFloat = await client.post('/', '{ "number": 44.04 }', port);

const matchedExactNegative = await client.post('/', '{ "number": -5 }', port);
const matchedPartialNegative = await client.post('/', '{ "number": -6.06 }', port);

assert.strictEqual(matchedInteger.body, 'Matched Exact Integer');
assert.strictEqual(matchedPartialInteger.body, 'Matched Partial Integer');

assert.strictEqual(matchedExactFloat.body, 'Matched Exact Float');
assert.strictEqual(matchedPartialFloat.body, 'Matched Partial Float');

assert.strictEqual(matchedExactNegative.body, 'Matched Exact Negative');
assert.strictEqual(matchedPartialNegative.body, 'Matched Partial Negative');
});

it('should support matching request body with type number using startsWith', async function () {
const request = {
port,
protocol,
stubs: [
{ predicates: [{ startsWith: { body: { number: 1 } } }], responses: [{ is: { body: 'Matched Exact Integer' } }] },
{ predicates: [{ startsWith: { body: { number: 2 } } }], responses: [{ is: { body: 'Matched Partial Integer' } }] },
{ predicates: [{ startsWith: { body: { number: 3.03 } } }], responses: [{ is: { body: 'Matched Exact Float' } }] },
{ predicates: [{ startsWith: { body: { number: 44.0 } } }], responses: [{ is: { body: 'Matched Partial Float' } }] },
{ predicates: [{ startsWith: { body: { number: -5 } } }], responses: [{ is: { body: 'Matched Exact Negative' } }] },
{ predicates: [{ startsWith: { body: { number: -6 } } }], responses: [{ is: { body: 'Matched Partial Negative' } }] }
]
};

await api.createImposter(request);

const matchedInteger = await client.post('/', '{ "number": 1 }', port);
const matchedPartialInteger = await client.post('/', '{ "number": 21 }', port);

const matchedExactFloat = await client.post('/', '{ "number": 3.03 }', port);
const matchedPartialFloat = await client.post('/', '{ "number": 44.04 }', port);

const matchedExactNegative = await client.post('/', '{ "number": -5 }', port);
const matchedPartialNegative = await client.post('/', '{ "number": -6.06 }', port);

assert.strictEqual(matchedInteger.body, 'Matched Exact Integer');
assert.strictEqual(matchedPartialInteger.body, 'Matched Partial Integer');

assert.strictEqual(matchedExactFloat.body, 'Matched Exact Float');
assert.strictEqual(matchedPartialFloat.body, 'Matched Partial Float');

assert.strictEqual(matchedExactNegative.body, 'Matched Exact Negative');
assert.strictEqual(matchedPartialNegative.body, 'Matched Partial Negative');
});

it('should support matching request body with type number using endsWith', async function () {
const request = {
port,
protocol,
stubs: [
{ predicates: [{ endsWith: { body: { number: 1 } } }], responses: [{ is: { body: 'Matched Exact Integer' } }] },
{ predicates: [{ endsWith: { body: { number: 2 } } }], responses: [{ is: { body: 'Matched Partial Integer' } }] },
{ predicates: [{ endsWith: { body: { number: 3.03 } } }], responses: [{ is: { body: 'Matched Exact Float' } }] },
{ predicates: [{ endsWith: { body: { number: 4.04 } } }], responses: [{ is: { body: 'Matched Partial Float' } }] },
{ predicates: [{ endsWith: { body: { number: -5 } } }], responses: [{ is: { body: 'Matched Exact Negative' } }] },
{ predicates: [{ endsWith: { body: { number: 6.06 } } }], responses: [{ is: { body: 'Matched Partial Negative' } }] }
]
};

await api.createImposter(request);

const matchedInteger = await client.post('/', '{ "number": 1 }', port);
const matchedPartialInteger = await client.post('/', '{ "number": 22 }', port);

const matchedExactFloat = await client.post('/', '{ "number": 3.03 }', port);
const matchedPartialFloat = await client.post('/', '{ "number": 44.04 }', port);

const matchedExactNegative = await client.post('/', '{ "number": -5 }', port);
const matchedPartialNegative = await client.post('/', '{ "number": -66.06 }', port);

assert.strictEqual(matchedInteger.body, 'Matched Exact Integer');
assert.strictEqual(matchedPartialInteger.body, 'Matched Partial Integer');

assert.strictEqual(matchedExactFloat.body, 'Matched Exact Float');
assert.strictEqual(matchedPartialFloat.body, 'Matched Partial Float');

assert.strictEqual(matchedExactNegative.body, 'Matched Exact Negative');
assert.strictEqual(matchedPartialNegative.body, 'Matched Partial Negative');
});
});
});
});
27 changes: 24 additions & 3 deletions src/models/predicates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,33 @@ function toString (value) {
}
}

function contains (actual, expected) {
if (typeof actual === 'string') {
return actual.indexOf(expected) >= 0;
}
return actual.toString().indexOf(expected) >= 0;
}

function startsWith (actual, expected) {
if (typeof actual === 'string') {
return actual.indexOf(expected) === 0;
}
return actual.toString().indexOf(expected) === 0;
}

function endsWith (actual, expected) {
if (typeof actual === 'string') {
return actual.indexOf(expected, actual.length - expected.length) >= 0;
}
return actual.toString().indexOf(expected, actual.length - expected.length) >= 0;
}

const predicates = {
equals: create('equals', (expected, actual) => toString(expected) === toString(actual)),
deepEquals,
contains: create('contains', (expected, actual) => actual.indexOf(expected) >= 0),
startsWith: create('startsWith', (expected, actual) => actual.indexOf(expected) === 0),
endsWith: create('endsWith', (expected, actual) => actual.indexOf(expected, actual.length - expected.length) >= 0),
contains: create('contains', (expected, actual) => contains(actual, expected)),
startsWith: create('startsWith', (expected, actual) => startsWith(actual, expected)),
endsWith: create('endsWith', (expected, actual) => endsWith(actual, expected)),
matches,
exists: create('exists', function (expected, actual) {
return expected ? (typeof actual !== 'undefined' && actual !== '') : (typeof actual === 'undefined' || actual === '');
Expand Down