MTA-344: Update page and block generators to merge blocks and pages into one file from all modules

Author: orykh

CHANGELOG.md

@@ -1,4 +1,5 @@
 * Added an ability to skip variation execution by specifying a value in 'issue' column in data set file
+* Rewrote page generator to collect related blocks from all modules
 
 1.0.0-dev.4
 =============

Mtf/Block/Block.php

@@ -59,7 +59,7 @@ abstract class Block implements BlockInterface
      * @param BlockFactory $blockFactory
      * @param array $config
      */
-    public function __construct(Element $element, BlockFactory $blockFactory, array $config)
+    public function __construct(Element $element, BlockFactory $blockFactory, array $config = [])
     {
         $this->_rootElement = $element;
         $this->blockFactory = $blockFactory;
@@ -140,20 +140,23 @@ function () use ($browser, $selector, $strategy) {
      * @param string $type
      * @param string $method
      * @param array $arguments
-     * @return void
+     * @return bool
      */
     protected function callRender($type, $method, array $arguments = [])
     {
         $block = $this->getRenderInstance($type);
-        call_user_func_array([$block, $method], $arguments);
+        if ($block !== null) {
+            call_user_func_array([$block, $method], $arguments);
+            return true;
+        }
+        return false;
     }
 
     /**
      * Get render instance by name
      *
      * @param string $renderName
      * @return BlockInterface
-     * @throws \InvalidArgumentException
      */
     protected function getRenderInstance($renderName)
     {
@@ -173,9 +176,7 @@ protected function getRenderInstance($renderName)
                     ]
                 );
             } else {
-                throw new \InvalidArgumentException(
-                    sprintf('There is no such render "%s" declared for the block "%s" ', $renderName, $class)
-                );
+                return null;
             }
 
             $this->renderInstances[$renderName] = $block;

Mtf/Block/Form.php

@@ -67,9 +67,9 @@ class Form extends Block
      * @param Element $element
      * @param BlockFactory $blockFactory
      * @param Mapper $mapper
-     * @param array $config
+     * @param array $config [optional]
      */
-    public function __construct(Element $element, BlockFactory $blockFactory, Mapper $mapper, array $config)
+    public function __construct(Element $element, BlockFactory $blockFactory, Mapper $mapper, array $config = [])
     {
         $this->mapper = $mapper;
         parent::__construct($element, $blockFactory, $config);

Mtf/ObjectManagerFactory.php

@@ -165,11 +165,11 @@ public static function configure(\Magento\Framework\ObjectManager $objectManager
         );
 
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('ui')
+            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc\\ui')
         );
 
         $objectManager->configure(
-            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('curl')
+            $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc\\curl')
         );
     }
 }

Mtf/Util/Generate/BlockFactory.php

@@ -58,10 +58,11 @@ protected function _addBlockToFactory($item)
         $realClass = $this->_resolveClass($item);
         $fallbackComment = $this->_buildFallbackComment($item, '$element');
 
+        $arguments = "\$element, \$driver = null, \$config = []";
         $this->_factoryContent .= "\n    /**\n";
         $this->_factoryContent .= "     * @return \\{$item['class']}\n";
         $this->_factoryContent .= "     */\n";
-        $this->_factoryContent .= "    public function get{$methodNameSuffix}(\$element, \$driver = null)\n";
+        $this->_factoryContent .= "    public function get{$methodNameSuffix}({$arguments})\n";
         $this->_factoryContent .= "    {";
 
         if (!empty($fallbackComment)) {
@@ -70,7 +71,7 @@ protected function _addBlockToFactory($item)
             $this->_factoryContent .= "\n";
         }
 
-        $this->_factoryContent .= '        return new \\' . $realClass . '($element, $driver);';
+        $this->_factoryContent .= '        return new \\' . $realClass . '($element, $driver, $config);';
         $this->_factoryContent .= "\n    }\n";
 
         $this->_cnt++;