Merge pull request #1940 from magento-panda/MAGETWO-83115

Bug
- MAGETWO-83115 RED BUILD [2.1.x][L4] Functional test Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest is failing on L4 build on Bamboo

Author: VladimirZaets

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

@@ -159,6 +159,20 @@ class Attribute extends Form
      */
     private $selectedAttributes = 'span[data-bind*="selectedAttributes"]';
 
+    /**
+     * Attributes grid spinner selector
+     *
+     * @var string
+     */
+    private $attributesGridSpinner = '.productFormConfigurable [data-role="spinner"]';
+
+    /**
+     * CSS Selector for attribute grid.
+     *
+     * @var string
+     */
+    private $attributesGridSelector = '#variation-steps-wizard_step1 .admin__data-grid-outer-wrap';
+
     /**
      * Fill attributes
      *
@@ -176,10 +190,12 @@ public function fillAttributes(array $attributes)
         }
 
         //select attributes
+        $this->waitAttributesGridLoad();
         $this->getAttributesGrid()->resetFilter();
+        $this->getAttributesGrid()->waitForElementNotVisible($this->attributesGridSpinner);
         $this->getTemplateBlock()->waitLoader();
         $attributesList = $this->browser->find($this->selectedAttributes)->getText();
-        if ($attributesList != '--') {
+        if ($attributesList !== '--') {
             $this->getAttributesGrid()->deselectAttributes();
         }
 
@@ -201,6 +217,17 @@ public function fillAttributes(array $attributes)
         $this->browser->find($this->nextButton)->click();
     }
 
+    /**
+     * Wait for 'Attributes Grid' loaded.
+     *
+     * @return void
+     */
+    private function waitAttributesGridLoad()
+    {
+        $this->waitForElementVisible($this->attributesGridSelector);
+        $this->waitForElementNotVisible($this->attributesGridSpinner);
+    }
+
     /**
      * @return \Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\AttributesGrid
      */