MAGETWO-53238: Vault Provider field contains Payflow Pro option in countries which don't have such solution

Author: rliukshyn

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

@@ -191,15 +191,15 @@
             </field>
         </dataset>
         <dataset name="braintree_use_vault">
-            <field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
+            <field name="payment/braintree_section/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">Yes</item>
                 <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
         <dataset name="braintree_use_vault_rollback">
-            <field name="payment/braintree/braintree_cc_vault_active" xsi:type="array">
+            <field name="payment/braintree_section/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">No</item>

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml

@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\CreateVaultOrderBackendTest" summary="Create Order from Admin via Braintree with saving Credit Cards">
-        <variation name="CreateVaultOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-47137">
+        <variation name="CreateVaultOrderBackendTestBraintreeVariation1" summary="Checkout with Braintree Credit Card from Admin (Payment Action = Authorize Only)" ticketId="MAGETWO-47137, MAGETWO-47139">
             <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
             <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml

@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\UseVaultOnCheckoutTest" summary="Use saved for Braintree credit card on checkout.">
-        <variation name="UseVaultOnCheckoutBraintreeTestVariation1" summary="Use saved for Braintree credit card on checkout" ticketId="MAGETWO-46530">
+        <variation name="UseVaultOnCheckoutBraintreeTestVariation1" summary="Use saved for Braintree credit card on checkout" ticketId="MAGETWO-46530, MAGETWO-38382">
             <data name="description" xsi:type="string">Use saved for Braintree credit card on checkout</data>
             <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
@@ -22,7 +22,6 @@
             <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
             <data name="status" xsi:type="string">Processing</data>
             <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
-            <data name="status" xsi:type="string">Processing</data>
             <data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/UseVaultOnCheckoutTest.xml

@@ -14,6 +14,13 @@
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
+        <dataset name="amex_default">
+            <field name="cc_number" xsi:type="string">378282246310005</field>
+            <field name="cc_exp_month" xsi:type="string">02 - February</field>
+            <field name="cc_exp_year" xsi:type="string">2021</field>
+            <field name="cc_cid" xsi:type="string">1234</field>
+        </dataset>
+
         <dataset name="visa_direct">
             <field name="cc_number" xsi:type="string">4617747819866651</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>

dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml

@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Vault\Test\TestCase\UseVaultOnCheckoutTest" summary="Use saved for PayPal Payflow Pro credit card on checkout">
-        <variation name="UseVaultOnCheckoutPayflowProTestVariation1" summary="Use saved for PayPal Payflow Pro credit card on checkout" ticketId="MAGETWO-47349">
+        <variation name="UseVaultOnCheckoutPayflowProTestVariation1" summary="Use saved for PayPal Payflow Pro credit card on checkout" ticketId="MAGETWO-47349, MAGETWO-47347">
             <data name="products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>

dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/DeleteSavedCreditCardTest.xml

@@ -31,6 +31,7 @@
  * 16. Place order.
  *
  * @group Order_Management_(CS)
+ * @ZephyrId MAGETWO-48127, MAGETWO-48091
  */
 class CreateVaultOrderBackendTest extends Scenario
 {