From 5951f685da0ada37e8aadbaa6de08d75a9099ec9 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Wed, 13 Feb 2019 21:04:01 +0300
Subject: [PATCH 1/3] MAGETWO-51459: [FT] CreateCategoryEntityTest fail when
 system message about indexers update is displayed

- Fixed MFT test;
---
 .../app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php  | 2 ++
 .../Catalog/Test/Block/Product/ProductList/TopToolbar.php       | 2 +-
 .../Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 2035e7e83200f..30a323eebb736 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -187,6 +187,8 @@ public function assignCategory($parentCategoryName, $childCategoryName)
      */
     public function expandAllCategories()
     {
+        $this->getTemplateBlock()->waitLoader();
         $this->_rootElement->find($this->expandAll)->click();
+        $this->getTemplateBlock()->waitLoader();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
index 090042140a548..48769126d88ea 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
@@ -48,7 +48,7 @@ public function getSelectSortType()
     public function getSortType()
     {
         $content = $this->_rootElement->find($this->sorter)->getText();
-        return explode("\n", $content);
+        return array_values(array_filter(array_map('trim', explode("\n", $content))));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index c6a66beac7c79..ea6808ee2a7f5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -96,6 +96,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
+            <data name="tag" xsi:type="string">test_type:acceptance_test</data>
             <data name="description" xsi:type="string">Create anchor subcategory with all fields</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>

From 51cf5897005ebb77d73ca088ce5c2e5fc53ca963 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Wed, 6 Mar 2019 15:58:17 +0000
Subject: [PATCH 2/3] MAGETWO-53037: Product duplication allows to save
 non-unique values for product attributes

- Add message for unique value
---
 .../Controller/Adminhtml/Product/Save.php     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index e84d9ff12906e..825d0ee032d6c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -159,6 +159,7 @@ public function execute()
                 if ($redirectBack === 'duplicate') {
                     $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
+                    $this->checkUniqueAttributes($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -343,4 +344,25 @@ private function persistMediaData(ProductInterface $product, array $data)
 
         return $data;
     }
+
+    /**
+     * Check unique attributes and add error to message manager
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     */
+    private function checkUniqueAttributes(\Magento\Catalog\Model\Product $product)
+    {
+        $uniqueLabels = [];
+        foreach ($product->getAttributes() as $attribute) {
+            if ($attribute->getIsUnique() && $attribute->getIsUserDefined()
+                && $product->getData($attribute->getAttributeCode()) !== null
+            ) {
+                $uniqueLabels[] = $attribute->getDefaultFrontendLabel();
+            }
+        }
+        if ($uniqueLabels) {
+            $uniqueLabels = implode('", "', $uniqueLabels);
+            $this->messageManager->addErrorMessage(__('The value of attribute(s) "%1" must be unique', $uniqueLabels));
+        }
+    }
 }

From b7e67007bcf62a1cd41a2d8039cb72709eb311ee Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 21 Mar 2019 19:01:36 +0300
Subject: [PATCH 3/3] MAGETWO-51459: [FT] CreateCategoryEntityTest fail when
 system message about indexers update is displayed

- Skip flaky MFTF test AdminCreateCustomProductAttributeWithDropdownFieldTest
---
 .../AdminCreateCustomProductAttributeWithDropdownFieldTest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 5b6a0b7f2ab3e..288941e487646 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-10905"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-15474"/>
+            </skip>
         </annotations>
 
         <before>