Skip to content

Commit 71cfd49

Browse files
okolesnykokolesnyk
committed
MTA-3788: Add variations to place order for Braintree
- MTA-3856: Add variation with Braintree Credit Card from Admin with Basic Fraud Protection
2 parents 19da1c5 + 5869270 commit 71cfd49

File tree

3 files changed

+113
-12
lines changed

3 files changed

+113
-12
lines changed

‎dev/tests/functional/credentials.xml.dist

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@
3232
<field path="payment/authorizenet_directpost/trans_key" value="" />
3333
<field path="payment/authorizenet_directpost/trans_md5" value="" />
3434

35-
<field path="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" value="" />
36-
<field path="payment/braintree_section/braintree/braintree_required/merchant_id" value="" />
37-
<field path="payment/braintree_section/braintree/braintree_required/public_key" value="" />
38-
<field path="payment/braintree_section/braintree/braintree_required/private_key" value="" />
35+
<field replace="braintree_enabled_fraud_merchant_account_id" value="" />
36+
<field replace="braintree_enabled_fraud_merchant_id" value="" />
37+
<field replace="braintree_enabled_fraud_public_key" value="" />
38+
<field replace="braintree_enabled_fraud_private_key" value="" />
39+
40+
<field replace="braintree_disabled_fraud_merchant_account_id" value="" />
41+
<field replace="braintree_disabled_fraud_merchant_id" value="" />
42+
<field replace="braintree_disabled_fraud_public_key" value="" />
43+
<field replace="braintree_disabled_fraud_private_key" value="" />
3944

4045
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/business_account" value="" />
4146
<field path="payment/paypal_group_all_in_one/wpp_usuk/wpp_required_settings/wpp_and_express_checkout/api_username" value="" />

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

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@
1111
<field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
1212
<item name="scope" xsi:type="string">payment</item>
1313
<item name="scope_id" xsi:type="number">1</item>
14-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
15-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ID</item>
14+
<item name="label" xsi:type="string">Merchant ID</item>
15+
<item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_id%</item>
1616
</field>
1717
<field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
1818
<item name="scope" xsi:type="string">payment</item>
1919
<item name="scope_id" xsi:type="number">1</item>
20-
<item name="label" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
21-
<item name="value" xsi:type="string">PAYMENT_PAYMENT_BRAINTREE_PUBLIC_KEY</item>
20+
<item name="label" xsi:type="string">Public Key</item>
21+
<item name="value" xsi:type="string">%braintree_disabled_fraud_public_key%</item>
2222
</field>
2323
<field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
2424
<item name="scope" xsi:type="string">payment</item>
2525
<item name="scope_id" xsi:type="number">1</item>
26-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
27-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_PRIVATE_KEY</item>
26+
<item name="label" xsi:type="string">Private Key</item>
27+
<item name="value" xsi:type="string">%braintree_disabled_fraud_private_key%</item>
2828
</field>
2929
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
3030
<item name="scope" xsi:type="string">payment</item>
3131
<item name="scope_id" xsi:type="number">1</item>
32-
<item name="label" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
33-
<item name="value" xsi:type="string">PAYMENT_BRAINTREE_MERCHANT_ACCOUNT_ID</item>
32+
<item name="label" xsi:type="string">Merchant Account ID</item>
33+
<item name="value" xsi:type="string">%braintree_disabled_fraud_merchant_account_id%</item>
3434
</field>
3535
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
3636
<item name="scope" xsi:type="string">payment</item>
@@ -51,6 +51,7 @@
5151
<item name="value" xsi:type="number">1</item>
5252
</field>
5353
</dataset>
54+
5455
<dataset name="braintree_rollback">
5556
<field name="payment/braintree/active" xsi:type="array">
5657
<item name="scope" xsi:type="string">payment</item>
@@ -59,6 +60,7 @@
5960
<item name="value" xsi:type="number">0</item>
6061
</field>
6162
</dataset>
63+
6264
<dataset name="braintree_sale">
6365
<field name="payment/braintree/payment_action" xsi:type="array">
6466
<item name="scope" xsi:type="string">payment</item>
@@ -67,6 +69,7 @@
6769
<item name="value" xsi:type="string">authorize_capture</item>
6870
</field>
6971
</dataset>
72+
7073
<dataset name="braintree_3d_secure">
7174
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
7275
<item name="scope" xsi:type="string">payment</item>
@@ -75,6 +78,7 @@
7578
<item name="value" xsi:type="number">1</item>
7679
</field>
7780
</dataset>
81+
7882
<dataset name="braintree_3d_secure_rollback">
7983
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
8084
<item name="scope" xsi:type="string">payment</item>
@@ -83,6 +87,7 @@
8387
<item name="value" xsi:type="number">0</item>
8488
</field>
8589
</dataset>
90+
8691
<dataset name="braintree_3d_secure_uk">
8792
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
8893
<item name="scope" xsi:type="string">payment</item>
@@ -107,6 +112,7 @@
107112
</item>
108113
</field>
109114
</dataset>
115+
110116
<dataset name="braintree_3d_secure_uk_rollback">
111117
<field name="payment/braintree_section/braintree/braintree_3dsecure/verify_3dsecure" xsi:type="array">
112118
<item name="scope" xsi:type="string">payment</item>
@@ -121,6 +127,7 @@
121127
<item name="value" xsi:type="number">0</item>
122128
</field>
123129
</dataset>
130+
124131
<dataset name="braintree_3d_secure_not_triggered_due_threshold">
125132
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
126133
<item name="scope" xsi:type="string">payment</item>
@@ -135,6 +142,7 @@
135142
<item name="value" xsi:type="number">300</item>
136143
</field>
137144
</dataset>
145+
138146
<dataset name="braintree_3d_secure_not_triggered_due_threshold_rollback">
139147
<field name="payment/braintree/verify_3dsecure" xsi:type="array">
140148
<item name="scope" xsi:type="string">payment</item>
@@ -143,6 +151,7 @@
143151
<item name="value" xsi:type="number">0</item>
144152
</field>
145153
</dataset>
154+
146155
<dataset name="braintree_use_vault">
147156
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
148157
<item name="scope" xsi:type="string">payment</item>
@@ -151,6 +160,7 @@
151160
<item name="value" xsi:type="number">1</item>
152161
</field>
153162
</dataset>
163+
154164
<dataset name="braintree_use_vault_rollback">
155165
<field name="payment/braintree_section/braintree/braintree_cc_vault_active" xsi:type="array">
156166
<item name="scope" xsi:type="string">payment</item>
@@ -159,6 +169,7 @@
159169
<item name="value" xsi:type="number">0</item>
160170
</field>
161171
</dataset>
172+
162173
<dataset name="braintree_paypal">
163174
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
164175
<item name="scope" xsi:type="string">payment</item>
@@ -173,6 +184,7 @@
173184
<item name="value" xsi:type="string">authorize</item>
174185
</field>
175186
</dataset>
187+
176188
<dataset name="braintree_paypal_rollback">
177189
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
178190
<item name="scope" xsi:type="string">payment</item>
@@ -181,6 +193,7 @@
181193
<item name="value" xsi:type="number">0</item>
182194
</field>
183195
</dataset>
196+
184197
<dataset name="braintree_paypal_sale">
185198
<field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
186199
<item name="scope" xsi:type="string">payment</item>
@@ -189,6 +202,7 @@
189202
<item name="value" xsi:type="string">authorize_capture</item>
190203
</field>
191204
</dataset>
205+
192206
<dataset name="braintree_paypal_skip_order_review">
193207
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
194208
<item name="scope" xsi:type="string">payment</item>
@@ -197,6 +211,7 @@
197211
<item name="value" xsi:type="number">1</item>
198212
</field>
199213
</dataset>
214+
200215
<dataset name="braintree_paypal_skip_order_review_rollback">
201216
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
202217
<item name="scope" xsi:type="string">payment</item>
@@ -205,6 +220,7 @@
205220
<item name="value" xsi:type="number">0</item>
206221
</field>
207222
</dataset>
223+
208224
<dataset name="braintree_paypal_use_vault">
209225
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
210226
<item name="scope" xsi:type="string">payment</item>
@@ -213,6 +229,7 @@
213229
<item name="value" xsi:type="number">1</item>
214230
</field>
215231
</dataset>
232+
216233
<dataset name="braintree_paypal_use_vault_rollback">
217234
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
218235
<item name="scope" xsi:type="string">payment</item>
@@ -221,6 +238,7 @@
221238
<item name="value" xsi:type="number">0</item>
222239
</field>
223240
</dataset>
241+
224242
<dataset name="braintree_fraudprotection">
225243
<field name="payment/braintree/fraudprotection" xsi:type="array">
226244
<item name="scope" xsi:type="string">payment</item>
@@ -229,6 +247,7 @@
229247
<item name="value" xsi:type="number">1</item>
230248
</field>
231249
</dataset>
250+
232251
<dataset name="braintree_fraudprotection_rollback">
233252
<field name="payment/braintree/fraudprotection" xsi:type="array">
234253
<item name="scope" xsi:type="string">payment</item>
@@ -237,5 +256,59 @@
237256
<item name="value" xsi:type="number">0</item>
238257
</field>
239258
</dataset>
259+
260+
<dataset name="braintree_fraud_tool_enabled_account">
261+
<field name="payment/braintree_section/braintree/braintree_required/merchant_id" xsi:type="array">
262+
<item name="scope" xsi:type="string">payment</item>
263+
<item name="scope_id" xsi:type="number">1</item>
264+
<item name="label" xsi:type="string">Merchant ID</item>
265+
<item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_id%</item>
266+
</field>
267+
<field name="payment/braintree_section/braintree/braintree_required/public_key" xsi:type="array">
268+
<item name="scope" xsi:type="string">payment</item>
269+
<item name="scope_id" xsi:type="number">1</item>
270+
<item name="label" xsi:type="string">Public Key</item>
271+
<item name="value" xsi:type="string">%braintree_enabled_fraud_public_key%</item>
272+
</field>
273+
<field name="payment/braintree_section/braintree/braintree_required/private_key" xsi:type="array">
274+
<item name="scope" xsi:type="string">payment</item>
275+
<item name="scope_id" xsi:type="number">1</item>
276+
<item name="label" xsi:type="string">Private Key</item>
277+
<item name="value" xsi:type="string">%braintree_enabled_fraud_private_key%</item>
278+
</field>
279+
<field name="payment/braintree_section/braintree/braintree_advanced/merchant_account_id" xsi:type="array">
280+
<item name="scope" xsi:type="string">payment</item>
281+
<item name="scope_id" xsi:type="number">1</item>
282+
<item name="label" xsi:type="string">Merchant Account ID</item>
283+
<item name="value" xsi:type="string">%braintree_enabled_fraud_merchant_account_id%</item>
284+
</field>
285+
<field name="payment/braintree_section/braintree/braintree_required/payment_action" xsi:type="array">
286+
<item name="scope" xsi:type="string">payment</item>
287+
<item name="scope_id" xsi:type="number">1</item>
288+
<item name="label" xsi:type="string">Authorize</item>
289+
<item name="value" xsi:type="string">authorize</item>
290+
</field>
291+
<field name="payment/braintree_section/braintree/braintree_advanced/debug" xsi:type="array">
292+
<item name="scope" xsi:type="string">payment</item>
293+
<item name="scope_id" xsi:type="number">1</item>
294+
<item name="label" xsi:type="string">Yes</item>
295+
<item name="value" xsi:type="number">1</item>
296+
</field>
297+
<field name="payment/braintree_section/braintree/active" xsi:type="array">
298+
<item name="scope" xsi:type="string">payment</item>
299+
<item name="scope_id" xsi:type="number">1</item>
300+
<item name="label" xsi:type="string">Yes</item>
301+
<item name="value" xsi:type="number">1</item>
302+
</field>
303+
</dataset>
304+
305+
<dataset name="braintree_fraud_tool_enabled_account_rollback">
306+
<field name="payment/braintree/active" xsi:type="array">
307+
<item name="scope" xsi:type="string">payment</item>
308+
<item name="scope_id" xsi:type="number">1</item>
309+
<item name="label" xsi:type="string">No</item>
310+
<item name="value" xsi:type="number">0</item>
311+
</field>
312+
</dataset>
240313
</repository>
241314
</config>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,28 @@
6464
<constraint name="Magento\Sales\Test\Constraint\AssertCaptureInCommentsHistory" />
6565
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
6666
</variation>
67+
<variation name="CreateOrderBackendTestBraintreeVariation3" summary="Checkout with Braintree Credit Card from Admin (Basic Fraud Protection)" ticketId="MAGETWO-46470">
68+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
69+
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
70+
<data name="products/1" xsi:type="string">configurableProduct::with_one_option</data>
71+
<data name="products/2" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
72+
<data name="customer/dataset" xsi:type="string">default</data>
73+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
74+
<data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
75+
<data name="saveAddress" xsi:type="string">No</data>
76+
<data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
77+
<data name="shipping/shipping_method" xsi:type="string">Fixed</data>
78+
<data name="prices" xsi:type="array">
79+
<item name="grandTotal" xsi:type="string">145.98</item>
80+
</data>
81+
<data name="payment/method" xsi:type="string">braintree</data>
82+
<data name="creditCardClass" xsi:type="string">credit_card_braintree</data>
83+
<data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
84+
<data name="configData" xsi:type="string">braintree</data>
85+
<data name="status" xsi:type="string">Processing</data>
86+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
87+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
88+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
89+
</variation>
6790
</testCase>
6891
</config>

0 commit comments

Comments
 (0)