Merge remote-tracking branch 'mainline/2.4-develop' into ACP2E-2711

Author: o-dubovyk

app/code/Magento/AdminAnalytics/Test/Mftf/class-file-naming-allowlist

@@ -0,0 +1,2 @@
+CloseAllDialogBoxes
+SelectAdminUsageSetting

app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesActionGroup.xml renamed to app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesWarningActionGroup.xml

@@ -46,7 +46,7 @@ public function testShouldRenderSeverity() : void
         /** @var Column|MockObject $columnMock */
         $columnMock = $this->getMockBuilder(Column::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getIndex'])
+            ->addMethods(['getIndex'])
             ->getMock();
         $columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
         $this->sut->setColumn($columnMock);

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -12,6 +12,8 @@
 
 use Magento\AdminNotification\Block\ToolbarEntry;
 use Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
@@ -26,6 +28,17 @@ class ToolbarEntryTest extends TestCase
     protected function _getBlockInstance($unreadNotifications)
     {
         $objectManagerHelper = new ObjectManager($this);
+        $objects = [
+            [
+                JsonHelper::class,
+                $this->createMock(JsonHelper::class)
+            ],
+            [
+                DirectoryHelper::class,
+                $this->createMock(DirectoryHelper::class)
+            ]
+        ];
+        $objectManagerHelper->prepareObjectManager($objects);
         // mock collection of unread notifications
         $notificationList = $this->createPartialMock(
             Unread::class,
@@ -52,6 +65,18 @@ public function testGetLatestUnreadNotifications()
     {
         $helper = new ObjectManager($this);
 
+        $objects = [
+            [
+                JsonHelper::class,
+                $this->createMock(JsonHelper::class)
+            ],
+            [
+                DirectoryHelper::class,
+                $this->createMock(DirectoryHelper::class)
+            ]
+        ];
+        $helper->prepareObjectManager($objects);
+
         // 1. Create mocks
         $notificationList = $this->createMock(Unread::class);
 

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -225,13 +225,15 @@ protected function setUp(): void
             'initWebsites',
             'initCategories'
         ];
+        $mockAddMethods = [
+            '_headerColumns'
+        ];
         $mockMethods = array_merge($constructorMethods, [
             '_customHeadersMapping',
             '_prepareEntityCollection',
             '_getEntityCollection',
             'getWriter',
             'getExportData',
-            '_headerColumns',
             '_customFieldsMapping',
             'getItemsPerPage',
             'paginateCollection',
@@ -243,7 +245,8 @@ protected function setUp(): void
         $this->advancedPricing = $this->getMockBuilder(
             AdvancedPricing::class
         )
-            ->setMethods($mockMethods)
+            ->addMethods($mockAddMethods)
+            ->onlyMethods($mockMethods)
             ->disableOriginalConstructor()
             ->getMock();
         foreach ($constructorMethods as $method) {

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -67,14 +67,13 @@ public function testCreate(): void
         $clientOptionsMock = $this->getMockForAbstractClass(ClientOptionsInterface::class);
 
         $this->objectManager->expects($this->exactly(2))->method('create')
-            ->withConsecutive(
-                [$this->equalTo('engineFactoryClass')],
-                [$this->equalTo('engineOptionClass')]
-            )
-            ->willReturnOnConsecutiveCalls(
-                $factoryMock,
-                $clientOptionsMock
-            );
+            ->willReturnCallback(function ($className) use ($factoryMock, $clientOptionsMock) {
+                if ($className == 'engineFactoryClass') {
+                    return $factoryMock;
+                } elseif ($className == 'engineOptionClass') {
+                    return $clientOptionsMock;
+                }
+            });
 
         $clientOptionsMock->expects($this->once())->method('prepareClientOptions')
             ->with([])

app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php

@@ -58,12 +58,11 @@ protected function setUp(): void
         $this->objectManager = new ObjectManager($this);
         $this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
 
         $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->onlyMethods([])
             ->getMock();
 
         $this->model = $this->objectManager->getObject(
@@ -171,7 +170,7 @@ public function testValidateNoOptions()
     /**
      * @return array
      */
-    public function getCreateConfigDataProvider()
+    public static function getCreateConfigDataProvider()
     {
         return [
             [

app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -49,7 +49,8 @@ protected function setUp(): void
         $this->subscriptionStatusProviderMock = $this->createMock(SubscriptionStatusProvider::class);
         $this->contextMock = $this->createMock(Context::class);
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getElementHtml'])
+            ->addMethods(['getComment'])
+            ->onlyMethods(['getElementHtml'])
             ->disableOriginalConstructor()
             ->getMock();
 

app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml renamed to app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigGeneralAnalyticsPage.xml

@@ -41,7 +41,8 @@ class VerticalTest extends TestCase
     protected function setUp(): void
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel', 'getHint', 'getElementHtml'])
+            ->addMethods(['getComment', 'getLabel', 'getHint'])
+            ->onlyMethods(['getElementHtml'])
             ->disableOriginalConstructor()
             ->getMock();