Skip to content

Commit 9da1085

Browse files
committed
MAGETWO-58019: [FT] Incorrect selector for Tier price
1 parent aa27856 commit 9da1085

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@
201201
</item>
202202
<item name="9" xsi:type="array">
203203
<item name="title" xsi:type="string">attribute_key_10</item>
204-
<item name="value" xsi:type="string">12/12/2016</item>
204+
<item name="value" xsi:type="string">12/12/2017</item>
205205
</item>
206206
<item name="10" xsi:type="array">
207207
<item name="title" xsi:type="string">attribute_key_11</item>
208-
<item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
208+
<item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
209209
</item>
210210
<item name="11" xsi:type="array">
211211
<item name="title" xsi:type="string">attribute_key_12</item>
@@ -330,11 +330,11 @@
330330
</item>
331331
<item name="7" xsi:type="array">
332332
<item name="title" xsi:type="string">attribute_key_7</item>
333-
<item name="value" xsi:type="string">12/12/2016</item>
333+
<item name="value" xsi:type="string">12/12/2017</item>
334334
</item>
335335
<item name="8" xsi:type="array">
336336
<item name="title" xsi:type="string">attribute_key_8</item>
337-
<item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
337+
<item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
338338
</item>
339339
<item name="9" xsi:type="array">
340340
<item name="title" xsi:type="string">attribute_key_9</item>

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
173173
<data name="product/data/weight_type" xsi:type="string">No</data>
174174
<data name="product/data/weight" xsi:type="string">10</data>
175-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
175+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
176176
<data name="product/data/price_view" xsi:type="string">As Low as</data>
177177
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
178178
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -349,7 +349,7 @@
349349
<data name="product/data/price/dataset" xsi:type="string">fixed-100</data>
350350
<data name="product/data/weight_type" xsi:type="string">No</data>
351351
<data name="product/data/weight" xsi:type="string">10</data>
352-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
352+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
353353
<data name="product/data/price_view" xsi:type="string">As Low as</data>
354354
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
355355
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -374,7 +374,7 @@
374374
<data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
375375
<data name="product/data/weight_type" xsi:type="string">No</data>
376376
<data name="product/data/weight" xsi:type="string">10</data>
377-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
377+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
378378
<data name="product/data/price_view" xsi:type="string">As Low as</data>
379379
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
380380
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public function assertPrice(FixtureInterface $product, View $productViewBlock)
8383
if (!$noError) {
8484
break;
8585
}
86-
if (count($match) < 2
87-
&& $match[1] != $tierPrice['price_qty']
88-
|| $match[2] !== number_format($tierPrice['price'], $this->priceFormat)
86+
$tierPriceValue = isset($tierPrice['price']) ? $tierPrice['price'] : $tierPrice['percentage_value'];
87+
if ($match[1] !== $tierPrice['price_qty']
88+
|| $match[2] !== number_format($tierPriceValue, $this->priceFormat)
8989
) {
9090
$noError = false;
9191
break;

0 commit comments

Comments
 (0)