Merge remote-tracking branch 'origin/MAGETWO-63741-CreateSimpProd-FT-Fail' into okapis-mainline-2.2-pr

Author: cspruiell

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

@@ -22,6 +22,13 @@ class BlockGallery extends Section
      */
     private $imageLoader = '.image.image-placeholder .file-row';
 
+    /**
+     * Selector for first uploaded image.
+     *
+     * @var string
+     */
+    private $baseImage = '.image.item.base-image';
+
     /**
      * Selector for image upload input.
      *
@@ -43,6 +50,7 @@ public function setFieldsData(array $data, SimpleElement $element = null)
             $uploadElement = $element->find($this->imageUploadInput, Locator::SELECTOR_CSS, 'upload');
             $uploadElement->setValue($imageData['file']);
             $this->waitForElementNotVisible($this->imageLoader);
+            $this->waitForElementVisible($this->baseImage);
         }
         return $this;
     }

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

@@ -549,7 +549,6 @@
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">10</data>
             <data name="product/data/weight" xsi:type="string">50</data>
-            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">100</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductHasImageInGrid" />