Skip to content

Commit 81e8a6d

Browse files
committed
Merge branch '2.1-DEVELOP-PR' of github.com:magento-tango/magento2ce into 2.1-DEVELOP-PR
2 parents fef4884 + 94d27d4 commit 81e8a6d

File tree

1 file changed

+1
-0
lines changed
  • dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Section/Variations/Config

1 file changed

+1
-0
lines changed

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Section/Variations/Config/Attribute.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ public function fillAttributes(array $attributes)
177177

178178
//select attributes
179179
$this->getAttributesGrid()->resetFilter();
180+
$this->getTemplateBlock()->waitLoader();
180181
$attributesList = $this->browser->find($this->selectedAttributes)->getText();
181182
if ($attributesList != '--') {
182183
$this->getAttributesGrid()->deselectAttributes();

0 commit comments

Comments
 (0)