From 38f75797736d157c6ed0d7c4cbcaa5e0f2e2b2b8 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Tue, 29 Aug 2017 19:15:23 +0300
Subject: [PATCH] HG-237: Patch fixture for hold payments facility (#29)

* 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
---
 Jenkinsfile                                   |  2 +-
 damsel                                        |  2 +-
 scripts/dominant/base-fixture.commit.json.tpl | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2bd1b74..daeb1e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
         }
diff --git a/damsel b/damsel
index c23a0b1..44afec3 160000
--- a/damsel
+++ b/damsel
@@ -1 +1 @@
-Subproject commit c23a0b1bac257318289f68e7e5a488469df4b173
+Subproject commit 44afec3edcf10c00899f2686efd8273c48106059
diff --git a/scripts/dominant/base-fixture.commit.json.tpl b/scripts/dominant/base-fixture.commit.json.tpl
index a0c8514..cf2c1ee 100644
--- a/scripts/dominant/base-fixture.commit.json.tpl
+++ b/scripts/dominant/base-fixture.commit.json.tpl
@@ -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}}
             }
         }
     }}}},