Skip to content

Commit ebec6d7

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-65468' into develop-pr2
2 parents d7c7b6b + 496a2eb commit ebec6d7

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/ProductDetails/CategoryIds.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ class CategoryIds extends MultisuggestElement
4646
*/
4747
protected $advancedInventoryButton = '[data-index="advanced_inventory_button"]';
4848

49+
/**
50+
* Locator for MultiSelect element.
51+
*
52+
* @var string
53+
*/
54+
private $multiSelectElement = '.admin__action-multiselect-menu-inner-item';
55+
4956
/**
5057
* @constructor
5158
* @param BrowserInterface $browser
@@ -87,8 +94,15 @@ public function setValue($values)
8794
continue;
8895
}
8996
$this->keys([$value]);
97+
98+
// wait when some element of multiSelect will be visible.
99+
$this->waitUntil(function () {
100+
return $this->find($this->multiSelectElement)->isVisible() ? true : null;
101+
});
102+
90103
$searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
91104
$searchedItem->click();
105+
92106
$closeButton = $this->find($this->closeButton);
93107
if ($closeButton->isVisible()) {
94108
$closeButton->click();

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,6 @@
412412
<constraint name="Magento\Catalog\Test\Constraint\AssertAddToCartButtonAbsent" />
413413
</variation>
414414
<variation name="CreateSimpleProductEntityTestVariation23" summary="Create Simple Product with Creating New Category (Required Fields Only)" ticketId="MAGETWO-27293">
415-
<data name="tag" xsi:type="string">to_maintain:yes</data>
416-
<data name="issue" xsi:type="string">MAGETWO-65468: [FT] Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityTest fails on Jenkins</data>
417415
<data name="product/data/category_ids/new_category" xsi:type="string">yes</data>
418416
<data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory_without_url_key</data>
419417
<data name="product/data/website_ids/0/dataset" xsi:type="string">default</data>

0 commit comments

Comments
 (0)