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

[Backport 7.x] Fix integration test (#1336)

Browse Source 
Co-authored-by: Tomas Della Vedova <delvedor@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2020-10-15 08:56:16 +02:00
committed by GitHub
parent dd8ee9056b
commit 18b62b41aa
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,20 +279,26 @@ function build (opts = {}) {
// eg: 'Basic ${auth}' we search the stahed value 'auth' // eg: 'Basic ${auth}' we search the stahed value 'auth'
// and the resulting value will be 'Basic valueOfAuth' // and the resulting value will be 'Basic valueOfAuth'
if (typeof val === 'string' && val.includes('${')) { if (typeof val === 'string' && val.includes('${')) {
const start = val.indexOf('${') while (obj[key].includes('${')) {
const end = val.indexOf('}', val.indexOf('${')) const val = obj[key]
const stashedKey = val.slice(start + 2, end) const start = val.indexOf('${')
const stashed = stash.get(stashedKey) const end = val.indexOf('}', val.indexOf('${'))
obj[key] = val.slice(0, start) + stashed + val.slice(end + 1) const stashedKey = val.slice(start + 2, end)
const stashed = stash.get(stashedKey)
obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
}
continue continue
} }
// handle json strings, eg: '{"hello":"$world"}' // handle json strings, eg: '{"hello":"$world"}'
if (typeof val === 'string' && val.includes('"$')) { if (typeof val === 'string' && val.includes('"$')) {
const start = val.indexOf('"$') while (obj[key].includes('"$')) {
const end = val.indexOf('"', start + 1) const val = obj[key]
const stashedKey = val.slice(start + 2, end) const start = val.indexOf('"$')
const stashed = '"' + stash.get(stashedKey) + '"' const end = val.indexOf('"', start + 1)
obj[key] = val.slice(0, start) + stashed + val.slice(end + 1) const stashedKey = val.slice(start + 2, end)
const stashed = '"' + stash.get(stashedKey) + '"'
obj[key] = val.slice(0, start) + stashed + val.slice(end + 1)
}
continue continue
} }
// if the key value is a string, and the string includes '$' // if the key value is a string, and the string includes '$'