MAGETWO-59626: Error saving configurable product after disabling child products

Author: Stanislav Idolov

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

@@ -11,17 +11,26 @@
 use Magento\Ui\Test\Block\Adminhtml\Section;
 
 /**
- * Class for product gallery block
+ * Class for product gallery block.
  */
 class BlockGallery extends Section
 {
     /**
+     * Selector for image loader container.
+     *
      * @var string
      */
     private $imageLoader = '.image.image-placeholder .file-row';
 
     /**
-     * Upload product images
+     * Selector for image upload input.
+     *
+     * @var string
+     */
+    private $imageUploadInput = '[name="image"]';
+
+    /**
+     * Upload product images.
      *
      * @param array $data
      * @param SimpleElement|null $element
@@ -31,7 +40,7 @@ class BlockGallery extends Section
     public function setFieldsData(array $data, SimpleElement $element = null)
     {
         foreach ($data['image']['value'] as $imageData) {
-            $uploadElement = $element->find('[name="image"]', Locator::SELECTOR_CSS, 'upload');
+            $uploadElement = $element->find($this->imageUploadInput, Locator::SELECTOR_CSS, 'upload');
             $uploadElement->setValue($imageData['file']);
             $this->waitForElementNotVisible($this->imageLoader);
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCanSaveProduct.php

@@ -7,12 +7,12 @@
 namespace Magento\Catalog\Test\Constraint;
 
 /**
- * Assert that can save already exist product
+ * Assert that can save already exist product.
  */
 class AssertCanSaveProduct extends \Magento\Mtf\Constraint\AbstractConstraint
 {
     /**
-     * Assert that can save already exist product
+     * Assert that can save already existing product.
      *
      * @param \Magento\Mtf\Fixture\FixtureInterface $product
      * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit $catalogProductEdit
@@ -30,12 +30,12 @@ public function processAssert(
 
         \PHPUnit_Framework_Assert::assertNotEmpty(
             $catalogProductEdit->getMessagesBlock()->getSuccessMessage(),
-            'Cant save existing product.'
+            'Can\'t save existing product.'
         );
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */