Merge branch '40-mview-patch-update-version-to-be-merged' of https://github.com/skovalenk/magento2 into 40-mview-patch-update-version-to-be-merged

Author: skovalenk

lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Mview\Config;
+use Magento\Framework\Mview\View\AdditionalColumnsProcessor\ProcessorFactory;
 use Magento\Framework\Mview\View\Changelog;
 use Magento\Framework\Mview\View\ChangelogInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -41,13 +42,19 @@ class ChangelogTest extends TestCase
      */
     protected $resourceMock;
 
+    /**
+     * @var ProcessorFactory|MockObject
+     */
+    protected $processorFactory;
+
     protected function setUp(): void
     {
         $this->connectionMock = $this->createMock(Mysql::class);
         $this->resourceMock = $this->createMock(ResourceConnection::class);
         $this->mockGetConnection($this->connectionMock);
+        $this->processorFactory = $this->createMock(ProcessorFactory::class);
 
-        $this->model = new Changelog($this->resourceMock, $this->getMviewConfigMock());
+        $this->model = new Changelog($this->resourceMock, $this->getMviewConfigMock(), $this->processorFactory);
     }
 
     /**
@@ -69,7 +76,7 @@ public function testInstanceOf()
         $resourceMock =
             $this->createMock(ResourceConnection::class);
         $resourceMock->expects($this->once())->method('getConnection')->willReturn(true);
-        $model = new Changelog($resourceMock, $this->getMviewConfigMock());
+        $model = new Changelog($resourceMock, $this->getMviewConfigMock(), $this->processorFactory);
         $this->assertInstanceOf(ChangelogInterface::class, $model);
     }
 
@@ -80,7 +87,7 @@ public function testCheckConnectionException()
         $resourceMock =
             $this->createMock(ResourceConnection::class);
         $resourceMock->expects($this->once())->method('getConnection')->willReturn(null);
-        $model = new Changelog($resourceMock, $this->getMviewConfigMock());
+        $model = new Changelog($resourceMock, $this->getMviewConfigMock(), $this->processorFactory);
         $model->setViewId('ViewIdTest');
         $this->assertNull($model);
     }

lib/internal/Magento/Framework/Mview/Test/Unit/_files/mview_config.php

@@ -32,7 +32,7 @@
                     'processor' => \Magento\Framework\Mview\View\AdditionalColumnsProcessor\DefaultProcessor::class
                 ],
             ],
-            'iterator' => \Magento\Framework\Mview\View\ChangeLogBatchIterator::class
+            'walker' => \Magento\Framework\Mview\View\ChangeLogBatchWalker::class
         ],
     ]
 ];