valitydev/holmes
14
0
Fork 0
mirror of https://github.com/valitydev/holmes.git synced 2024-11-06 01:45:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HG-237: Patch fixture for hold payments facility (#29)

Browse Source 
* HG-236: base fixture for dominant fixed (#25)

* HG-236: Bump to rbkmoney/damsel@644baf1

* HG-236: Jenkinsfile fixed with startsWith epic

* HG-236: hold_lifetime for mastercard added, hold_lifetime is decreased

* HG-255: Update domain config fixture (#28)

* HG-237: Switch to rbkmoney/damsel@44afec3 master
This commit is contained in:
Andrew Mayorov 2017-08-29 19:15:23 +03:00 committed by GitHub
parent 66846dc6c1
commit 38f7579773
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -22,7 +22,7 @@ build('image-holmes', 'docker-host') {
}
try {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'epic/multiclaims') {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic')) {
runStage('push image') {
sh 'make push_image'
}

2
damsel

@ -1 +1 @@
Subproject commit c23a0b1bac257318289f68e7e5a488469df4b173
Subproject commit 44afec3edcf10c00899f2686efd8273c48106059

15
scripts/dominant/base-fixture.commit.json.tpl
View File

@ -121,6 +121,15 @@
}
]}
}
]},
"hold_lifetime": {"decisions": [
{
"if_": {"any_of": [
{"condition": {"payment_tool": {"bank_card": {"payment_system_is": "visa"}}}},
{"condition": {"payment_tool": {"bank_card": {"payment_system_is": "mastercard"}}}}
]},
"then_": {"value": {"seconds": 3}}
}
]}
}
}
@ -341,6 +350,9 @@
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
},
"payment_flow":
{"hold": {"hold_lifetime": {"seconds": 3}}
}
}
}}}},
@ -368,6 +380,9 @@
"account": {
"currency": {"symbolic_code": "RUB"},
"settlement": $(${CURDIR}/create-account.sh RUB $*)
},
"payment_flow":
{"hold": {"hold_lifetime": {"seconds": 3}}
}
}
}}}},