magento
diff --git a/‎…f/Test/AdminDashboardWithChartsChart.xml‎ ‎…tf/Test/AdminDashboardWithChartsTest.xml‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml renamed to app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/‎…f/Test/AdminDashboardWithChartsChart.xml‎ ‎…tf/Test/AdminDashboardWithChartsTest.xml‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml renamed to app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
diff --git a/‎…f/Test/AdminMassDeleteBundleProducts.xml‎ ‎…st/AdminMassDeleteBundleProductsTest.xml‎app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/‎…f/Test/AdminMassDeleteBundleProducts.xml‎ ‎…st/AdminMassDeleteBundleProductsTest.xml‎app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
diff --git a/‎app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Catalog/Helper/Product/Compare.php‎
Lines changed: 2 additions & 2 deletions b/‎app/code/Magento/Catalog/Helper/Product/Compare.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCategoryExistInCategoryListActionGroup.xml‎
Lines changed: 26 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCategoryExistInCategoryListActionGroup.xml‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCategoryNotExistInCategoryListActionGroup.xml‎
Lines changed: 26 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormCategoryNotExistInCategoryListActionGroup.xml‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml‎
Lines changed: 18 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎…eOptionTextInputLengthValidationHint.xml‎ ‎…ionTextInputLengthValidationHintTest.xml‎app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml renamed to app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHintTest.xml b/‎…eOptionTextInputLengthValidationHint.xml‎ ‎…ionTextInputLengthValidationHintTest.xml‎app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml renamed to app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHintTest.xml
diff --git a/‎…t/Mftf/Data/ExtensionAttributeSimple.xml‎ ‎…tf/Data/ExtensionAttributeSimpleData.xml‎app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml renamed to app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimpleData.xml b/‎…t/Mftf/Data/ExtensionAttributeSimple.xml‎ ‎…tf/Data/ExtensionAttributeSimpleData.xml‎app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml renamed to app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimpleData.xml
diff --git a/‎app/code/Magento/Customer/view/frontend/email/change_email.html‎
Lines changed: 0 additions & 3 deletions b/‎app/code/Magento/Customer/view/frontend/email/change_email.html‎
Lines changed: 0 additions & 3 deletions
@@ -149,7 +149,7 @@ public function getItems()
             $this->_compareProduct->setAllowUsedFlat(false);
 
             $this->_items = $this->_itemCollectionFactory->create();
-            $this->_items->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
+            $this->_items->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
 
             if ($this->httpContext->getValue(Context::CONTEXT_AUTH)) {
                 $this->_items->setCustomerId($this->currentCustomer->getCustomerId());
 
@@ -279,7 +279,7 @@ public function getItemCollection()
             // cannot be placed in constructor because of the cyclic dependency which cannot be fixed with proxy class
             // collection uses this helper in constructor when calling isEnabledFlat() method
             $this->_itemCollection = $this->_itemCollectionFactory->create();
-            $this->_itemCollection->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
+            $this->_itemCollection->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
 
             if ($this->_customerSession->isLoggedIn()) {
                 $this->_itemCollection->setCustomerId($this->_customerSession->getCustomerId());
@@ -313,7 +313,7 @@ public function calculate($logout = false)
     {
         /** @var $collection Collection */
         $collection = $this->_itemCollectionFactory->create()
-            ->useProductItem(true);
+            ->useProductItem();
         if (!$logout && $this->_customerSession->isLoggedIn()) {
             $collection->setCustomerId($this->_customerSession->getCustomerId());
         } elseif ($this->_customerId) {
 
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminProductFormCategoryExistInCategoryListActionGroup">
+        <annotations>
+            <description>Check Category exist in Category list for Assign to Product.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="{{categoryName}}"
+                   stepKey="fillSearchCategory"/>
+        <see selector="{{AdminProductFormSection.selectCategory(categoryName)}}" userInput="{{categoryName}}"
+             stepKey="seeCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+    </actionGroup>
+</actionGroups>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminProductFormCategoryNotExistInCategoryListActionGroup">
+        <annotations>
+            <description>Check Category not exist in Category list for Assign to Product.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="{{categoryName}}"
+                   stepKey="fillSearchCategory"/>
+        <dontSee selector="{{AdminProductFormSection.selectCategory(categoryName)}}" userInput="{{categoryName}}"
+                 stepKey="seeCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+    </actionGroup>
+</actionGroups>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSubmitCategoriesPopupActionGroup">
+        <annotations>
+            <description>Clicks the "Done" button on the Search Categories popup.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
+    </actionGroup>
+</actionGroups>
@@ -18,8 +18,5 @@
     {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
 </p>
-<br>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}