From d129d8e59d3fae4aa15afd73638f97693f16601e Mon Sep 17 00:00:00 2001
From: Elena Marchenko <emarchenko@magento.com>
Date: Fri, 11 Mar 2016 12:57:40 +0200
Subject: [PATCH] MAGETWO-49845: Merge Braintree module with Configuration
- fixed functional tests
---
.../Braintree/Test/Repository/ConfigData.xml | 16 ++++++++--------
.../Test/TestCase/DeleteSavedCreditCardTest.xml | 4 ++--
.../Test/TestCase/InvoicePaypalBraintreeTest.xml | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
index 9f72757a455..4f256fd8f8c 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml
@@ -12,25 +12,25 @@
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string"/>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREETWO_MERCHANT_ID</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/public_key" 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"/>
- <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREETWO_PUBLIC_KEY</item>
+ <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/private_key" 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"/>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREETWO_PRIVATE_KEY</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
</field>
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" 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="string">PAYMENT_BRAINTREETWO_MERCHANT_ACCOUNT_ID</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
@@ -64,25 +64,25 @@
<item name="scope" xsi:type="string">payment</item>
<item name="scope_id" xsi:type="number">1</item>
<item name="label" xsi:type="string"/>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREETWO_MERCHANT_ID</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/public_key" 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"/>
- <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREETWO_PUBLIC_KEY</item>
+ <item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
</field>
<field name="payment/braintree_section/braintree/braintree_required/private_key" 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"/>
- <item name="value" xsi:type="string">PAYMENT_BRAINTREETWO_PRIVATE_KEY</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
</field>
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" 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="string">PAYMENT_BRAINTREETWO_MERCHANT_ACCOUNT_ID</item>
+ <item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
</field>
<field name="payment/braintree/payment_action" xsi:type="array">
<item name="scope" xsi:type="string">payment</item>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml
index 0da522038ac..5511538e072 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/DeleteSavedCreditCardTest.xml
@@ -14,11 +14,11 @@
<data name="checkoutMethod" xsi:type="string">login</data>
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
- <data name="payment/method" xsi:type="string">braintreetwo</data>
+ <data name="payment/method" xsi:type="string">braintree</data>
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
<data name="creditCardSave" xsi:type="string">Yes</data>
- <data name="configData" xsi:type="string">braintreetwo, braintreetwo_use_vault</data>
+ <data name="configData" xsi:type="string">braintree, braintree_use_vault</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
<constraint name="Magento\Vault\Test\Constraint\AssertCreditCardNotPresentOnCheckout" />
</variation>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
index 313cfff4a2d..1b0cc505904 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
@@ -19,8 +19,8 @@
<data name="capturedPrices" xsi:type="array">
<item name="0" xsi:type="string">139.9</item>
</data>
- <data name="payment/method" xsi:type="string">braintreetwo_paypal</data>
- <data name="configData" xsi:type="string">braintreetwo, braintreetwo_paypal</data>
+ <data name="payment/method" xsi:type="string">braintree_paypal</data>
+ <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
<data name="data/items_data/0/qty" xsi:type="string">-</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
@@ -44,8 +44,8 @@
<item name="0" xsi:type="string">118.25</item>
<item name="1" xsi:type="string">108.25</item>
</data>
- <data name="payment/method" xsi:type="string">braintreetwo_paypal</data>
- <data name="configData" xsi:type="string">braintreetwo, braintreetwo_paypal</data>
+ <data name="payment/method" xsi:type="string">braintree_paypal</data>
+ <data name="configData" xsi:type="string">braintree, braintree_paypal</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship</data>
<data name="data/items_data/0/qty" xsi:type="string">1</data>
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
--
GitLab