Skip to content

Commit 2e8446d

Browse files
author
Maksym Aposov
committed
MAGETWO-44516: Provide fix for Functional Tests MX
1 parent 481bc3b commit 2e8446d

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
</dataset>
5757

5858
<dataset name="fixed-100-custom-options">
59-
<field name="price_from" xsi:type="string">244.00</field>
60-
<field name="cart_price" xsi:type="string">244.00</field>
59+
<field name="price_from" xsi:type="string">270.00</field>
60+
<field name="cart_price" xsi:type="string">270.00</field>
6161
</dataset>
6262

6363
<dataset name="fixed-110">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<data name="product/data/sku_type" xsi:type="string">Dynamic</data>
215215
<data name="product/data/sku" xsi:type="string">sku_bundle_dynamic_%isolation%</data>
216216
<data name="product/data/price_type" xsi:type="string">Dynamic</data>
217-
<data name="product/data/price/dataset" xsi:type="string">dynamic-32</data>
217+
<data name="product/data/price/dataset" xsi:type="string">dynamic-40</data>
218218
<data name="product/data/bundle_selections/dataset" xsi:type="string">default_dynamic</data>
219219
<data name="product/data/bundle_selections/products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar</data>
220220
<data name="product/data/checkout_data/dataset" xsi:type="string">bundle_default</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ class CustomOptions extends Form
3030
*
3131
* @var string
3232
*/
33-
protected $optionElement = '#product-options-wrapper .field';
33+
protected $optionElement = '#product-options-wrapper > * > .field';
3434

3535
/**
3636
* Selector for title of option
3737
*
3838
* @var string
3939
*/
40-
protected $title = 'label';
40+
protected $title = 'label > span:nth-child(1), legend > span:nth-child(1)';
4141

4242
/**
4343
* Selector for required option
@@ -381,7 +381,7 @@ protected function getOptionNotice(SimpleElement $option, $number)
381381
*/
382382
protected function parseOptionText($optionText)
383383
{
384-
preg_match('`^(.*?)\+\$(\d.*?)$`', $optionText, $match);
384+
preg_match('`^(.*?) \+ ?\$([\d\.,]*?)$`', $optionText, $match);
385385
$optionPrice = isset($match[2]) ? str_replace(',', '', $match[2]) : 0;
386386
$optionTitle = isset($match[1]) ? trim($match[1]) : $optionText;
387387

dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/ProductForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<tabs>
99
<downloadable_information>
1010
<class>\Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable</class>
11-
<selector>#product_info_tabs_downloadable_items</selector>
11+
<selector>#product_info_tabs_product-details</selector>
1212
<strategy>css selector</strategy>
1313
</downloadable_information>
1414
</tabs>

dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class View extends ParentView
2020
*
2121
* @var string
2222
*/
23-
protected $groupedProductBlock = '.table-wrapper.grouped';
23+
protected $groupedProductBlock = '[class="table-wrapper grouped"]';
2424

2525
/**
2626
* This member holds the class name of the tier price block.
@@ -81,8 +81,7 @@ public function itemPriceProductBlock($index)
8181
*/
8282
public function getOptions(FixtureInterface $product)
8383
{
84-
$groupedOptions = $this->getGroupedProductBlock()->getOptions($product);
85-
return ['grouped_options' => $groupedOptions] + parent::getOptions($product);
84+
return ['grouped_options' => $this->getGroupedProductBlock()->getOptions($product)];
8685
}
8786

8887
/**

0 commit comments

Comments
 (0)