Merge branch 'MAGETWO-53238' of github.com:magento-mpi/magento2ce into MAGETWO-53238

Author: YevSent

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

@@ -191,19 +191,19 @@
             </field>
         </dataset>
         <dataset name="braintree_use_vault">
-            <field name="payment/vault/vault_payment" xsi:type="array">
+            <field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Braintree</item>
-                <item name="value" xsi:type="string">braintree</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
         <dataset name="braintree_use_vault_rollback">
-            <field name="payment/vault/vault_payment" xsi:type="array">
+            <field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Select vault provider</item>
-                <item name="value" xsi:type="string">null</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
         <dataset name="braintree_paypal">

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

@@ -278,19 +278,19 @@
             </field>
         </dataset>
         <dataset name="payflowpro_use_vault">
-            <field name="payment/vault/vault_payment" xsi:type="array">
+            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/payflowpro_cc_vault_active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">PayflowPro</item>
-                <item name="value" xsi:type="string">payflowpro</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
         <dataset name="payflowpro_use_vault_rollback">
-            <field name="payment/vault/vault_payment" xsi:type="array">
+            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/payflowpro_cc_vault_active" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>
                 <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Select vault provider</item>
-                <item name="value" xsi:type="string">null</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
     </repository>

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

@@ -46,7 +46,7 @@ public function __construct (CheckoutOnepage $checkoutOnepage, array $payment)
      */
     public function run()
     {
-        $this->payment['method'] = 'vault_item_';
+        $this->payment['method'] .= '_item_';
         $this->checkoutOnepage->getPaymentBlock()->selectPaymentMethod($this->payment);
     }
 }

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

@@ -17,13 +17,20 @@ class UseVaultPaymentTokenStep implements TestStepInterface
      * @var OrderCreateIndex
      */
     private $orderCreatePage;
+    
+    /**
+     * @var array
+     */
+    private $payment;
 
     /**
      * @param OrderCreateIndex $orderCreateIndex
+     * @param array $payment
      */
-    public function __construct(OrderCreateIndex $orderCreateIndex)
+    public function __construct(OrderCreateIndex $orderCreateIndex, array $payment)
     {
         $this->orderCreatePage = $orderCreateIndex;
+        $this->payment = $payment;
     }
 
     /**
@@ -32,7 +39,8 @@ public function __construct(OrderCreateIndex $orderCreateIndex)
     public function run()
     {
         $block = $this->orderCreatePage->getCreateBlock();
-        $block->selectPaymentMethod(['method' => 'vault']);
-        $block->selectVaultToken('token_switcher_');
+        $this->payment['method'] .= '_cc_vault';
+        $block->selectPaymentMethod($this->payment);
+        $block->selectVaultToken('token_switcher_' . $this->payment['method']);
     }
 }