habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated integration test runner

Browse Source
This commit is contained in:
delvedor
2019-02-18 13:00:43 +01:00
parent 709ee6fa30
commit aa9f5b6d41
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration/test-runner.js
View File

@ -213,7 +213,7 @@ TestRunner.prototype.fillStashedValues = function (obj) {
return obj return obj
function getStashedValues (str) { function getStashedValues (str) {
return str const arr = str
// we split the string on the dots // we split the string on the dots
// handle the key with a dot inside that is not a part of the path // handle the key with a dot inside that is not a part of the path
.split(/(?<!\\)\./g) .split(/(?<!\\)\./g)
@ -228,8 +228,11 @@ TestRunner.prototype.fillStashedValues = function (obj) {
} }
return part return part
}) })
// recreate the string value
.join('.') // recreate the string value only if the array length is higher than one
// otherwise return the first element which in some test this could be a number,
// and call `.join` will coerce it to a string.
return arr.length > 1 ? arr.join('.') : arr[0]
} }
} }
@ -351,7 +354,8 @@ TestRunner.prototype.exec = function (name, actions, q, done) {
: delve(this.response, this.fillStashedValues(key)), : delve(this.response, this.fillStashedValues(key)),
key === '$body' key === '$body'
? action.match[key] ? action.match[key]
: this.fillStashedValues(action.match)[key] : this.fillStashedValues(action.match)[key],
action.match
) )
done() done()
}) })
@ -463,10 +467,10 @@ TestRunner.prototype.is_false = function (val, msg) {
* @param {any} the second value * @param {any} the second value
* @returns {TestRunner} * @returns {TestRunner}
*/ */
TestRunner.prototype.match = function (val1, val2) { TestRunner.prototype.match = function (val1, val2, action) {
// both values are objects // both values are objects
if (typeof val1 === 'object' && typeof val2 === 'object') { if (typeof val1 === 'object' && typeof val2 === 'object') {
this.tap.strictDeepEqual(val1, val2) this.tap.strictDeepEqual(val1, val2, action)
// the first value is the body as string and the second a pattern string // the first value is the body as string and the second a pattern string
} else if ( } else if (
typeof val1 === 'string' && typeof val2 === 'string' && typeof val1 === 'string' && typeof val2 === 'string' &&
@ -482,10 +486,10 @@ TestRunner.prototype.match = function (val1, val2) {
.replace(/\s/g, '') .replace(/\s/g, '')
.slice(1, -1) .slice(1, -1)
// 'm' adds the support for multiline regex // 'm' adds the support for multiline regex
this.tap.match(val1, new RegExp(regStr, 'm'), `should match pattern provided: ${val2}`) this.tap.match(val1, new RegExp(regStr, 'm'), `should match pattern provided: ${val2}, action: ${JSON.stringify(action)}`)
// everything else // everything else
} else { } else {
this.tap.strictEqual(val1, val2, `should be equal: ${val1} - ${val2}`) this.tap.strictEqual(val1, val2, `should be equal: ${val1} - ${val2}, action: ${JSON.stringify(action)}`)
} }
return this return this
} }