MAGETWO-58144: [FT] Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest fail on Bamboo

Author: OlgaVasyltsun

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php

@@ -8,22 +8,12 @@
 use Magento\Ui\Component\Control\Container;
 use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * Class Save
  */
 class Save extends Generic
 {
-    /**
-     * @var array
-     */
-    private static $availableProductTypes = [
-        ConfigurableType::TYPE_CODE,
-        Type::TYPE_SIMPLE,
-        Type::TYPE_VIRTUAL
-    ];
-
     /**
      * {@inheritdoc}
      */
@@ -165,6 +155,6 @@ protected function getSaveAction()
      */
     protected function isConfigurableProduct()
     {
-        return in_array($this->getProduct()->getTypeId(), self::$availableProductTypes);
+        return !$this->getProduct()->isComposite() || $this->getProduct()->getTypeId() === ConfigurableType::TYPE_CODE;
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php

@@ -38,7 +38,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->productMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['isReadonly', 'isDuplicable'])
+            ->setMethods(['isReadonly', 'isDuplicable', 'isComposite'])
             ->getMockForAbstractClass();
 
         $this->registryMock->expects(static::any())

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php

@@ -10,6 +10,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable;
 
 /**
  * Test Creation for ProductTypeSwitchingOnCreation
@@ -75,18 +76,49 @@ public function __inject(
      *
      * @param string $createProduct
      * @param string $product
+     * @param string $actionName
      * @return array
      */
-    public function test($createProduct, $product)
+    public function test(string $createProduct, string $product, string $actionName = null): array
     {
         // Steps
         list($fixture, $dataset) = explode('::', $product);
         $product = $this->fixtureFactory->createByCode($fixture, ['dataset' => $dataset]);
         $this->catalogProductIndex->open();
         $this->catalogProductIndex->getGridPageActionBlock()->addProduct($createProduct);
+        if ($actionName) {
+            $this->performAction($actionName);
+        }
         $this->catalogProductNew->getProductForm()->fill($product);
         $this->catalogProductNew->getFormPageActions()->save($product);
 
         return ['product' => $product];
     }
+
+    /**
+     * Perform action.
+     *
+     * @param string $actionName
+     * @return void
+     */
+    private function performAction(string $actionName): void
+    {
+        if (method_exists(__CLASS__, $actionName)) {
+            $this->$actionName();
+        }
+    }
+
+    /**
+     * Clear downloadable product data.
+     *
+     * @return void
+     */
+    private function clearDownloadableData(): void
+    {
+        $this->catalogProductNew->getProductForm()->openSection('downloadable_information');
+        /** @var Downloadable $downloadableInfoTab */
+        $downloadableInfoTab = $this->catalogProductNew->getProductForm()->getSection('downloadable_information');
+        $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
+    }
 }

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

@@ -76,7 +76,7 @@
         <variation name="ProductTypeSwitchingOnCreationTestVariation9">
             <data name="createProduct" xsi:type="string">downloadable</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />

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

@@ -104,4 +104,21 @@ public function setFieldsData(array $fields, SimpleElement $element = null)
 
         return $this;
     }
+
+    /**
+     * Set "Is this downloadable Product?" value.
+     *
+     * @param string $downloadable
+     * @param SimpleElement|null $element
+     * @return void
+     */
+    public function setIsDownloadable(string $downloadable = 'Yes', SimpleElement $element = null): void
+    {
+        $context = $element ?: $this->_rootElement;
+        $isDownloadable = $context->find($this->isDownloadableProduct);
+        $value = 'Yes' == $downloadable ? '1' : '0';
+        if ($isDownloadable->isVisible() && $isDownloadable->getAttribute('value') != $value) {
+            $isDownloadable->click();
+        }
+    }
 }