Skip to content

Commit 5fe2d3f

Browse files
VasylKozyrenkoVasylKozyrenko
committed
MTA-3787: Add variations to CheckoutWithBraintreePaypalCartTest
1 parent 3a8df23 commit 5fe2d3f

File tree

6 files changed

+112
-1
lines changed

6 files changed

+112
-1
lines changed

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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,14 +193,31 @@
181193
<item name="value" xsi:type="number">0</item>
182194
</field>
183195
</dataset>
196+
184197
<dataset name="braintree_paypal_sale">
198+
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
199+
<item name="scope" xsi:type="string">payment</item>
200+
<item name="scope_id" xsi:type="number">1</item>
201+
<item name="label" xsi:type="string">Yes</item>
202+
<item name="value" xsi:type="number">1</item>
203+
</field>
185204
<field name="payment/braintree_section/braintree/braintree_paypal/payment_action" xsi:type="array">
186205
<item name="scope" xsi:type="string">payment</item>
187206
<item name="scope_id" xsi:type="number">1</item>
188207
<item name="label" xsi:type="string">Authorize and Capture</item>
189208
<item name="value" xsi:type="string">authorize_capture</item>
190209
</field>
191210
</dataset>
211+
212+
<dataset name="braintree_paypal_sale_rollback">
213+
<field name="payment/braintree_section/braintree/active_braintree_paypal" xsi:type="array">
214+
<item name="scope" xsi:type="string">payment</item>
215+
<item name="scope_id" xsi:type="number">1</item>
216+
<item name="label" xsi:type="string">No</item>
217+
<item name="value" xsi:type="number">0</item>
218+
</field>
219+
</dataset>
220+
192221
<dataset name="braintree_paypal_skip_order_review">
193222
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
194223
<item name="scope" xsi:type="string">payment</item>
@@ -197,6 +226,7 @@
197226
<item name="value" xsi:type="number">1</item>
198227
</field>
199228
</dataset>
229+
200230
<dataset name="braintree_paypal_skip_order_review_rollback">
201231
<field name="payment/braintree_section/braintree/braintree_paypal/skip_order_review" xsi:type="array">
202232
<item name="scope" xsi:type="string">payment</item>
@@ -205,6 +235,7 @@
205235
<item name="value" xsi:type="number">0</item>
206236
</field>
207237
</dataset>
238+
208239
<dataset name="braintree_paypal_use_vault">
209240
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
210241
<item name="scope" xsi:type="string">payment</item>
@@ -213,6 +244,7 @@
213244
<item name="value" xsi:type="number">1</item>
214245
</field>
215246
</dataset>
247+
216248
<dataset name="braintree_paypal_use_vault_rollback">
217249
<field name="payment/braintree_section/braintree/braintree_paypal/braintree_paypal_vault_active" xsi:type="array">
218250
<item name="scope" xsi:type="string">payment</item>
@@ -221,6 +253,7 @@
221253
<item name="value" xsi:type="number">0</item>
222254
</field>
223255
</dataset>
256+
224257
<dataset name="braintree_fraudprotection">
225258
<field name="payment/braintree/fraudprotection" xsi:type="array">
226259
<item name="scope" xsi:type="string">payment</item>
@@ -229,6 +262,7 @@
229262
<item name="value" xsi:type="number">1</item>
230263
</field>
231264
</dataset>
265+
232266
<dataset name="braintree_fraudprotection_rollback">
233267
<field name="payment/braintree/fraudprotection" xsi:type="array">
234268
<item name="scope" xsi:type="string">payment</item>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ public function loginCustomer(FixtureInterface $customer)
9090
$this->waitForElementNotVisible($this->loadingMask);
9191
}
9292

93+
/**
94+
* Fill required fields for guest checkout.
95+
*
96+
* @param FixtureInterface $customer
97+
* @return void
98+
*/
99+
public function fillGuestFields(FixtureInterface $customer)
100+
{
101+
$mapping = $this->dataMapping();
102+
$this->_rootElement->find($mapping['email']['selector'], $mapping['email']['strategy'])
103+
->setValue($customer->getEmail());
104+
$this->waitForElementNotVisible($this->loadingMask);
105+
}
106+
93107
/**
94108
* Click continue on checkout method block.
95109
*

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ public function run()
8787
} else {
8888
$this->checkoutOnepage->getLoginBlock()->loginCustomer($this->customer);
8989
}
90+
} elseif ($this->checkoutMethod === 'guest') {
91+
$this->checkoutOnepage->getLoginBlock()->fillGuestFields($this->customer);
9092
}
9193
}
9294

‎dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Invoices grid on order view page.
1111
*/
12-
class Grid extends \Magento\Backend\Test\Block\Widget\Grid
12+
class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
1313
{
1414
/**
1515
* Locator value for link in action column.
@@ -34,6 +34,9 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
3434
'id' => [
3535
'selector' => 'input[name="increment_id"]',
3636
],
37+
'order_id' => [
38+
'selector' => 'input[name="order_increment_id"]',
39+
],
3740
'status' => [
3841
'selector' => 'select[name="state"]',
3942
'input' => 'select',

‎dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Test\Constraint;
8+
9+
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
10+
use Magento\Mtf\Constraint\AbstractConstraint;
11+
12+
/**
13+
* Assert invoice status on order page in Admin.
14+
*/
15+
class AssertInvoiceStatusInOrdersGrid extends AbstractConstraint
16+
{
17+
/**
18+
* Assert invoice status on order page in Admin.
19+
*
20+
* @param SalesOrderView $salesOrderView
21+
* @param string $invoiceStatus
22+
* @param string $orderId
23+
* @return void
24+
*/
25+
public function processAssert(
26+
SalesOrderView $salesOrderView,
27+
$invoiceStatus,
28+
$orderId
29+
) {
30+
$salesOrderView->open(['order_id' => $orderId]);
31+
$salesOrderView->getOrderForm()->openTab('invoices');
32+
/** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices\Grid $grid */
33+
$grid = $salesOrderView->getOrderForm()->getTab('invoices')->getGridBlock();
34+
$filter = [
35+
'order_id' => $orderId,
36+
'status' => $invoiceStatus,
37+
];
38+
\PHPUnit_Framework_Assert::assertTrue(
39+
$grid->isRowVisible($filter),
40+
'Invoice status is incorrect.'
41+
);
42+
}
43+
44+
/**
45+
* Returns a string representation of the object.
46+
*
47+
* @return string
48+
*/
49+
public function toString()
50+
{
51+
return 'Invoice status is correct.';
52+
}
53+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<argument name="severity" xsi:type="string">S0</argument>
1212
</arguments>
1313
</type>
14+
<type name="Magento\Sales\Test\Constraint\AssertInvoiceStatusInOrdersGrid">
15+
<arguments>
16+
<argument name="severity" xsi:type="string">S1</argument>
17+
</arguments>
18+
</type>
1419
<type name="Magento\Sales\Test\Constraint\AssertOrderStatusDuplicateStatus">
1520
<arguments>
1621
<argument name="severity" xsi:type="string">S0</argument>

0 commit comments

Comments
 (0)