Skip to content

Commit 3954db4

Browse files
author
Oleksandr Manchenko
committed
MTA-2343: Move all test data to repositories
- Fixed order grid
1 parent 9e5b44e commit 3954db4

File tree

2 files changed

+14
-28
lines changed

2 files changed

+14
-28
lines changed

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class Grid extends DataGrid
8181
*
8282
* @var string
8383
*/
84-
protected $firstRowSelector = '//tbody/tr[1]/td[@data-action="grid-row-edit"]';
84+
protected $firstRowSelector = '//tbody/tr[1]/td[contains(@class,"data-grid-actions-cell")]/a';
8585

8686
/**
8787
* Start to create new order.

dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -120,33 +120,19 @@ public function processAssert(
120120
*/
121121
protected function preparePrices($prices)
122122
{
123-
if (isset($prices['category_price'])) {
124-
unset($prices['category_price']);
125-
}
126-
if (isset($prices['category_special_price'])) {
127-
unset($prices['category_special_price']);
128-
}
129-
if (isset($prices['category_price_excl_tax'])) {
130-
unset($prices['category_price_excl_tax']);
131-
}
132-
if (isset($prices['category_price_incl_tax'])) {
133-
unset($prices['category_price_incl_tax']);
134-
}
135-
136-
if (isset($prices['product_view_price'])) {
137-
unset($prices['product_view_price']);
138-
}
139-
if (isset($prices['product_view_special_price'])) {
140-
unset($prices['product_view_special_price']);
141-
}
142-
if (isset($prices['product_view_price_excl_tax'])) {
143-
unset($prices['product_view_price_excl_tax']);
144-
}
145-
if (isset($prices['product_view_price_incl_tax'])) {
146-
unset($prices['product_view_price_incl_tax']);
147-
}
148-
149-
return $prices;
123+
return array_diff_key(
124+
$prices,
125+
array_flip([
126+
'category_price',
127+
'category_special_price',
128+
'category_price_excl_tax',
129+
'category_price_incl_tax',
130+
'product_view_price',
131+
'product_view_special_price',
132+
'product_view_price_excl_tax',
133+
'product_view_price_incl_tax'
134+
])
135+
);
150136
}
151137

152138
/**

0 commit comments

Comments
 (0)