Fix broken CMS Block listing page for admin users with limited permissions

Improve test

Author: ihor-sviziev

app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php

@@ -22,7 +22,7 @@
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Authorization;
+use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
 use Magento\Ui\Component\Container;
@@ -33,49 +33,49 @@
 class DataProviderTest extends TestCase
 {
     /**
-     * @var Authorization|MockObject
+     * @var AuthorizationInterface|MockObject
      */
-    private $authorizationMock;
+    private AuthorizationInterface|MockObject $authorizationMock;
 
     /**
      * @var Reporting|MockObject
      */
-    private $reportingMock;
+    private Reporting|MockObject $reportingMock;
 
     /**
      * @var SearchCriteriaBuilder|MockObject
      */
-    private $searchCriteriaBuilderMock;
+    private SearchCriteriaBuilder|MockObject $searchCriteriaBuilderMock;
 
     /**
      * @var RequestInterface|MockObject
      */
-    private $requestInterfaceMock;
+    private RequestInterface|MockObject $requestInterfaceMock;
 
     /**
      * @var FilterBuilder|MockObject
      */
-    private $filterBuilderMock;
+    private FilterBuilder|MockObject $filterBuilderMock;
 
     /**
      * @var DataProvider
      */
-    private $dataProvider;
+    private DataProvider $dataProvider;
 
     /**
      * @var string
      */
-    private $name = 'cms_page_listing_data_source';
+    private string $name = 'cms_page_listing_data_source';
 
     /**
      * @var string
      */
-    private $primaryFieldName = 'page';
+    private string $primaryFieldName = 'page';
 
     /**
      * @var string
      */
-    private $requestFieldName = 'id';
+    private string $requestFieldName = 'id';
 
     /**
      * @var array
@@ -90,30 +90,20 @@ class DataProviderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->authorizationMock = $this->getMockBuilder(Authorization::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->authorizationMock = $this->createMock(AuthorizationInterface::class);
 
-        $this->reportingMock = $this->getMockBuilder(Reporting::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->reportingMock = $this->createMock(Reporting::class);
 
-        $this->searchCriteriaBuilderMock = $this->getMockBuilder(SearchCriteriaBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
 
-        $this->requestInterfaceMock = $this->getMockBuilder(RequestInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->requestInterfaceMock = $this->createMock(RequestInterface::class);
 
-        $this->filterBuilderMock = $this->getMockBuilder(FilterBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->filterBuilderMock = $this->createMock(FilterBuilder::class);
 
         /** @var ObjectManagerInterface|MockObject $objectManagerMock */
-        $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-        $objectManagerMock->expects($this->once())
-            ->method('get')
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $objectManagerMock->method('get')
+            ->with(AuthorizationInterface::class)
             ->willReturn($this->authorizationMock);
         ObjectManager::setInstance($objectManagerMock);
 
@@ -131,15 +121,14 @@ protected function setUp(): void
     /**
      * @covers \Magento\Cms\Ui\Component\DataProvider::prepareMetadata
      */
-    public function testPrepareMetadata()
+    public function testPrepareMetadata(): void
     {
         $this->authorizationMock->expects($this->exactly(2))
             ->method('isAllowed')
             ->willReturnMap(
                 [
                     ['Magento_Cms::save', null, false],
                     ['Magento_Cms::save_design', null, false],
-
                 ]
             );