Skip to content

Commit f0ade7c

Browse files
committed
MAGETWO-53238: Vault Provider field contains Payflow Pro option in countries which don't have such solution
- Fix functional tests for Vault
1 parent dc738bc commit f0ade7c

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,19 @@
191191
</field>
192192
</dataset>
193193
<dataset name="braintree_use_vault">
194-
<field name="payment/vault/vault_payment" xsi:type="array">
194+
<field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
195195
<item name="scope" xsi:type="string">payment</item>
196196
<item name="scope_id" xsi:type="number">1</item>
197-
<item name="label" xsi:type="string">Braintree</item>
198-
<item name="value" xsi:type="string">braintree</item>
197+
<item name="label" xsi:type="string">Yes</item>
198+
<item name="value" xsi:type="number">1</item>
199199
</field>
200200
</dataset>
201201
<dataset name="braintree_use_vault_rollback">
202-
<field name="payment/vault/vault_payment" xsi:type="array">
202+
<field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
203203
<item name="scope" xsi:type="string">payment</item>
204204
<item name="scope_id" xsi:type="number">1</item>
205-
<item name="label" xsi:type="string">Select vault provider</item>
206-
<item name="value" xsi:type="string">null</item>
205+
<item name="label" xsi:type="string">No</item>
206+
<item name="value" xsi:type="number">0</item>
207207
</field>
208208
</dataset>
209209
<dataset name="braintree_paypal">

dev/tests/functional/tests/app/Magento/Paypal/Test/Repository/ConfigData.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,19 +278,19 @@
278278
</field>
279279
</dataset>
280280
<dataset name="payflowpro_use_vault">
281-
<field name="payment/vault/vault_payment" xsi:type="array">
281+
<field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/payflowpro_cc_vault_active" xsi:type="array">
282282
<item name="scope" xsi:type="string">payment</item>
283283
<item name="scope_id" xsi:type="number">1</item>
284-
<item name="label" xsi:type="string">PayflowPro</item>
285-
<item name="value" xsi:type="string">payflowpro</item>
284+
<item name="label" xsi:type="string">Yes</item>
285+
<item name="value" xsi:type="number">1</item>
286286
</field>
287287
</dataset>
288288
<dataset name="payflowpro_use_vault_rollback">
289-
<field name="payment/vault/vault_payment" xsi:type="array">
289+
<field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/payflowpro_cc_vault_active" xsi:type="array">
290290
<item name="scope" xsi:type="string">payment</item>
291291
<item name="scope_id" xsi:type="number">1</item>
292-
<item name="label" xsi:type="string">Select vault provider</item>
293-
<item name="value" xsi:type="string">null</item>
292+
<item name="label" xsi:type="string">No</item>
293+
<item name="value" xsi:type="number">0</item>
294294
</field>
295295
</dataset>
296296
</repository>

dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedCreditCardStep.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct (CheckoutOnepage $checkoutOnepage, array $payment)
4646
*/
4747
public function run()
4848
{
49-
$this->payment['method'] = 'vault_item_';
49+
$this->payment['method'] .= '_item_';
5050
$this->checkoutOnepage->getPaymentBlock()->selectPaymentMethod($this->payment);
5151
}
5252
}

dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseVaultPaymentTokenStep.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@ class UseVaultPaymentTokenStep implements TestStepInterface
1717
* @var OrderCreateIndex
1818
*/
1919
private $orderCreatePage;
20+
21+
/**
22+
* @var array
23+
*/
24+
private $payment;
2025

2126
/**
2227
* @param OrderCreateIndex $orderCreateIndex
28+
* @param array $payment
2329
*/
24-
public function __construct(OrderCreateIndex $orderCreateIndex)
30+
public function __construct(OrderCreateIndex $orderCreateIndex, array $payment)
2531
{
2632
$this->orderCreatePage = $orderCreateIndex;
33+
$this->payment = $payment;
2734
}
2835

2936
/**
@@ -32,7 +39,8 @@ public function __construct(OrderCreateIndex $orderCreateIndex)
3239
public function run()
3340
{
3441
$block = $this->orderCreatePage->getCreateBlock();
35-
$block->selectPaymentMethod(['method' => 'vault']);
36-
$block->selectVaultToken('token_switcher_');
42+
$this->payment['method'] .= '_cc_vault';
43+
$block->selectPaymentMethod($this->payment);
44+
$block->selectVaultToken('token_switcher_' . $this->payment['method']);
3745
}
3846
}

0 commit comments

Comments
 (0)