Skip to content

Commit 433a0e3

Browse files
rliukshynrliukshyn
committed
MTA-3788: Add variations to place order for Braintree
1 parent 111dc62 commit 433a0e3

File tree

7 files changed

+13
-83
lines changed

7 files changed

+13
-83
lines changed

‎dev/tests/functional/tests/app/Magento/Braintree/Test/Constraint/Assert3dSecureFailedMessage.php

Lines changed: 0 additions & 46 deletions
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,6 @@
8888
</field>
8989
</dataset>
9090

91-
<dataset name="braintree_advanced_protection">
92-
<field name="payment/braintree_section/braintree/braintree_advanced/fraudprotection" xsi:type="array">
93-
<item name="scope" xsi:type="string">payment</item>
94-
<item name="scope_id" xsi:type="number">1</item>
95-
<item name="label" xsi:type="string">Yes</item>
96-
<item name="value" xsi:type="number">1</item>
97-
</field>
98-
</dataset>
99-
100-
<dataset name="braintree_advanced_protection_rollback">
101-
<field name="payment/braintree_section/braintree/braintree_advanced/fraudprotection" xsi:type="array">
102-
<item name="scope" xsi:type="string">payment</item>
103-
<item name="scope_id" xsi:type="number">1</item>
104-
<item name="label" xsi:type="string">No</item>
105-
<item name="value" xsi:type="number">0</item>
106-
</field>
107-
</dataset>
108-
10991
<dataset name="braintree_3d_secure_rollback">
11092
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
11193
<item name="scope" xsi:type="string">payment</item>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutDeclinedTest.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
<data name="payment/method" xsi:type="string">braintree</data>
1818
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
1919
<data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
20-
<data name="configData" xsi:type="string">braintree, braintree_advanced_protection</data>
20+
<data name="errorMessage" xsi:type="string">Transaction has been declined. Please try again later.</data>
21+
<data name="configData" xsi:type="string">braintree_fraud_tool_enabled_account, braintree_fraudprotection</data>
2122
<data name="status" xsi:type="string">Processing</data>
2223
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
23-
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderFailedMessage" />
24+
<constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
2425
</variation>
2526
<variation name="OnePageCheckoutBraintreeDeclinedTestVariation2" summary="Checkout with Braintree Credit Card configured with incorrect credentials" ticketId="MAGETWO-46244">
2627
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
@@ -31,11 +32,12 @@
3132
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
3233
<data name="payment/method" xsi:type="string">braintree</data>
3334
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
34-
<data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
35+
<data name="creditCard/dataset" xsi:type="string">visa_braintree</data>
36+
<data name="errorMessage" xsi:type="string">Sorry, but something went wrong</data>
3537
<data name="configData" xsi:type="string">braintree, braintree_incorrect_merchant_account_id</data>
3638
<data name="status" xsi:type="string">Processing</data>
3739
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
38-
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderFailedMessage" />
40+
<constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
3941
</variation>
4042
</testCase>
4143
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutWith3dSecureFailedTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
<data name="creditCard/dataset" xsi:type="string">visa_braintree_3dsecure_failed</data>
2020
<data name="secure3d/dataset" xsi:type="string">secure3d_braintree</data>
2121
<data name="configData" xsi:type="string">braintree, braintree_3d_secure</data>
22+
<data name="errorMessage" xsi:type="string">Please try again with another form of payment.</data>
2223
<data name="status" xsi:type="string">Processing</data>
2324
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
24-
<constraint name="Magento\Braintree\Test\Constraint\Assert3dSecureFailedMessage" />
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage" />
2526
</variation>
2627
</testCase>
2728
</config>

‎dev/tests/functional/tests/app/Magento/Braintree/Test/etc/di.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@
1616
<argument name="severity" xsi:type="string">S1</argument>
1717
</arguments>
1818
</type>
19-
<type name="Magento\Braintree\Test\Constraint\Assert3dSecureFailedMessage">
20-
<arguments>
21-
<argument name="severity" xsi:type="string">S1</argument>
22-
</arguments>
23-
</type>
2419
</config>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderFailedMessage.php renamed to ‎dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCheckoutErrorMessage.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,19 @@
1212
/**
1313
* Assert that error message is correct.
1414
*/
15-
class AssertOrderFailedMessage extends AbstractConstraint
15+
class AssertCheckoutErrorMessage extends AbstractConstraint
1616
{
17-
/**
18-
* Error message on checkout.
19-
*/
20-
const ERROR_MESSAGE = 'Transaction has been declined. Please try again later.';
21-
2217
/**
2318
* Assert that error message is correct.
2419
*
2520
* @param CheckoutOnepage $checkoutOnepage
21+
* @param string $errorMessage
2622
* @return void
2723
*/
28-
public function processAssert(CheckoutOnepage $checkoutOnepage)
24+
public function processAssert(CheckoutOnepage $checkoutOnepage, $errorMessage)
2925
{
3026
\PHPUnit_Framework_Assert::assertEquals(
31-
self::ERROR_MESSAGE,
27+
$errorMessage,
3228
$checkoutOnepage->getMessagesBlock()->getErrorMessage(),
3329
'Wrong error message is displayed.'
3430
);

‎dev/tests/functional/tests/app/Magento/Checkout/Test/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<argument name="severity" xsi:type="string">S0</argument>
2323
</arguments>
2424
</type>
25-
<type name="Magento\Checkout\Test\Constraint\AssertOrderFailedMessage">
25+
<type name="Magento\Checkout\Test\Constraint\AssertCheckoutErrorMessage">
2626
<arguments>
2727
<argument name="severity" xsi:type="string">S1</argument>
2828
</arguments>

0 commit comments

Comments
 (0)