Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-782-2.4-develop

Author: bubasuma

app/code/Magento/AdminAdobeIms/composer.json

@@ -33,7 +33,7 @@
             "registration.php"
         ],
         "psr-4": {
-            "Magento\\Backend\\": ""
+            "Magento\\AdminAdobeIms\\": ""
         }
     }
 }

app/code/Magento/Analytics/Model/ExportDataHandler.php

@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Archive;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -89,8 +90,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
-
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::TMP);
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
 
@@ -106,8 +106,10 @@ public function prepareExportData()
                 $this->cryptographer->encode($tmpDirectory->readFile($this->getArchiveRelativePath()))
             );
         } finally {
-            $tmpDirectory->delete($this->getTmpFilesDirRelativePath());
-            $tmpDirectory->delete($this->getArchiveRelativePath());
+            if (isset($tmpDirectory)) {
+                $tmpDirectory->delete($this->getTmpFilesDirRelativePath());
+                $tmpDirectory->delete($this->getArchiveRelativePath());
+            }
         }
 
         return true;

app/code/Magento/Analytics/README.md

@@ -1,6 +1,6 @@
 # Magento_Analytics module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 

app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php

@@ -15,7 +15,7 @@
 use Magento\Framework\Archive;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -127,7 +127,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::TMP)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -228,7 +228,7 @@ public function testPrepareExportDataWithLocalizedException()
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::TMP)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())

app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml

@@ -11,5 +11,8 @@
     <section name="AdminSystemAccountSection">
         <element name="interfaceLocale" type="select" selector="#interface_locale"/>
         <element name="currentPassword" type="text" selector="#current_password"/>
+        <element name="username" type="text" selector="#username"/>
+        <element name="newPassword" type="text" selector="#password"/>
+        <element name="passwordConfirmation" type="text" selector="#confirmation"/>
     </section>
 </sections>

app/code/Magento/Backend/Test/Mftf/Test/AdminPasswordResetSettingsTest.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPasswordResetSettingsTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="[SPM-2] Password Reset settings (for Admin)"/>
+            <title value="[SPM-2] Password Reset settings (for Admin)"/>
+            <description value="Password Reset settings for Admin"/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-27441"/>
+            <group value="Admin_UI"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Goto Configurable>Advance>Admin and expand security Tab -->
+        <amOnPage url="{{AdminConfigAdvancedAdmin.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick stepKey="expandSecurityTab" selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true"/>
+
+        <!-- Uncheck system value and enter the number for password reset limitation -->
+        <actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
+            <argument name="rowId" value="row_admin_security_max_number_password_reset_requests"/>
+        </actionGroup>
+       <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{AdminSection.passwordLimitation}}" userInput="1" stepKey="fillNumbersForPasswordLimitation"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+
+        <!-- check system value after entering the password reset limitation and save the configuration-->
+        <actionGroup ref="AdminCheckUseSystemValueActionGroup" stepKey="checkUseSystemValue">
+            <argument name="rowId" value="row_admin_security_max_number_password_reset_requests"/>
+        </actionGroup>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSaveCookieLifetimeSuccessMessage">
+            <argument name="message" value="You saved the configuration."/>
+            <argument name="messageType" value="success"/>
+        </actionGroup>
+
+        <!--Collabase Security Tab and log out -->
+        <click selector="{{AdminSection.SecurityTab}}" stepKey="minimiseSecurityTab"/>
+
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+        <!-- login with wrong password and verify the error message first time1-->
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="admin" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="Admin@1234" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="verifyErrorMessage"/>
+
+        <!-- login with wrong password and verify the error message first time2-->
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin1"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="admin" stepKey="fillUsername1"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="Admin@1" stepKey="fillPassword1"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin1"/>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="verifyErrorMessage1"/>
+
+        <!-- login with valid credentials-->
+        <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin1"/>
+
+    </test>
+</tests>

app/code/Magento/Backend/etc/menu.xsd

@@ -85,7 +85,7 @@
     <xs:simpleType name="typeId">
         <xs:annotation>
             <xs:documentation>
-                Item id attribute can has only [a-z0-9/_]. Minimal length 3 symbol. Case insensitive.
+                Item id attribute can have only [a-z0-9/_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -96,7 +96,7 @@
     <xs:simpleType name="typeAction">
         <xs:annotation>
             <xs:documentation>
-                Item action attribute can has only [a-zA-Z0-9/_]. Minimal length 3 symbol
+                Item action attribute can have only [a-zA-Z0-9/_]. Minimal length 3 characters.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -107,7 +107,7 @@
     <xs:simpleType name="typeTitle">
         <xs:annotation>
             <xs:documentation>
-                Item title attribute minimal length 3 symbol
+                Item title attribute minimal length 3 characters.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -119,7 +119,7 @@
     <xs:simpleType name="typeModule">
         <xs:annotation>
             <xs:documentation>
-                Item module attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item module attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -130,7 +130,7 @@
     <xs:simpleType name="typeResource">
         <xs:annotation>
             <xs:documentation>
-                Item resource attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item resource attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -141,7 +141,7 @@
     <xs:simpleType name="typeDependsConfig">
         <xs:annotation>
             <xs:documentation>
-                Item resource attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item dependsOnConfig attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">

app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php

@@ -11,9 +11,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
 use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
@@ -26,12 +26,12 @@ class SaveHandler implements ExtensionInterface
     /**
      * @var string[]
      */
-    private $compositeProductTypes = ['grouped', 'configurable', 'bundle'];
+    private array $compositeProductTypes = ['grouped', 'configurable', 'bundle'];
 
     /**
      * @var OptionRepository
      */
-    protected $optionRepository;
+    protected OptionRepository $optionRepository;
 
     /**
      * @var Relation
@@ -44,7 +44,7 @@ class SaveHandler implements ExtensionInterface
      */
     public function __construct(
         OptionRepository $optionRepository,
-        ?Relation $relation = null
+        ?Relation        $relation = null
     ) {
         $this->optionRepository = $optionRepository;
         $this->relation = $relation ?: ObjectManager::getInstance()->get(Relation::class);
@@ -57,6 +57,7 @@ public function __construct(
      * @param array $arguments
      * @return ProductInterface|object
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws CouldNotSaveException
      */
     public function execute($entity, $arguments = [])
     {
@@ -122,12 +123,11 @@ private function processOptionsSaving(array $options, bool $hasChangedSku, Produ
     private function isProductHasRelations(ProductInterface $product): bool
     {
         $result = true;
-        if (!in_array($product->getId(), $this->compositeProductTypes)
+        if (!in_array($product->getTypeId(), $this->compositeProductTypes)
             && $this->relation->getRelationsByChildren([$product->getId()])
         ) {
             $result = false;
         }
-
         return $result;
     }
 }

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml

@@ -24,5 +24,6 @@
         <element name="productsInCategory" type="input" selector="div[data-index='assign_products']" timeout="30"/>
         <element name="scheduleDesignUpdateTab" type="block" selector="div[data-index='schedule_design_update']" timeout="15"/>
         <element name="categoryNameRequiredField" type="text" selector="//label[@class='admin__field-error' and contains(text(),'This is a required field.')]" timeout="15"/>
+        <element name="urlExistsErrorMessage" type="text" selector="//div[@class='message message-error error']//h4[contains(text(),'The value specified in the URL Key field would generate a URL that already exists.')]" timeout="30"/>
     </section>
 </sections>