Merge branch 'develop' into MQE-957

Author: imeron2433

dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/PageObjectHandlerTest.php

@@ -51,6 +51,25 @@ public function testGetPageObject()
         $this->assertNull($invalidPage);
     }
 
+    public function testGetEmptyPage()
+    {
+        $mockData = [
+            "testPage1" => [
+                "url" => "testURL1",
+                "module" => "testModule1",
+                "section" => [
+                ],
+                "area" => "test"
+            ]];
+        $this->setMockParserOutput($mockData);
+
+        // get pages
+        $page = PageObjectHandler::getInstance()->getObject('testPage1');
+
+        // Empty page has been read in and gotten without an exception being thrown.
+        $this->addToAssertionCount(1);
+    }
+
     /**
      * Function used to set mock for parser return and force init method to run between tests.
      *

dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

@@ -255,6 +255,36 @@ public function testResolveDataInUserInput()
         $this->assertEquals($expected, $actionObject->getCustomActionAttributes());
     }
 
+    /**
+     * {{EntityDataObject.values}} should be replaced with ["value1","value2"]
+     */
+    public function testResolveArrayData()
+    {
+        // Set up mocks
+        $actionObject = new ActionObject('merge123', 'fillField', [
+            'selector' => '#selector',
+            'userInput' => '{{EntityDataObject.values}}'
+        ]);
+        $entityDataObject = new EntityDataObject('EntityDataObject', 'test', [
+            'values' => [
+                'value1',
+                'value2',
+                '"My" Value'
+            ]
+        ], [], '', '');
+        $this->mockDataHandlerWithData($entityDataObject);
+
+        // Call the method under test
+        $actionObject->resolveReferences();
+
+        // Verify
+        $expected = [
+            'selector' => '#selector',
+            'userInput' => '["value1","value2","\"My\" Value"]'
+        ];
+        $this->assertEquals($expected, $actionObject->getCustomActionAttributes());
+    }
+
     /**
      * Action object should throw an exception if a reference to a parameterized selector has too few given args.
      */

src/Magento/FunctionalTestingFramework/Extension/ErrorLogger.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\Extension;
+
+/**
+ * Class ErrorLogger
+ * @package Magento\FunctionalTestingFramework\Extension
+ */
+class ErrorLogger
+{
+    /**
+     * Error Logger Instance
+     * @var ErrorLogger
+     */
+    private static $errorLogger;
+
+    /**
+     * Singleton method to return ErrorLogger.
+     * @return ErrorLogger
+     */
+    public static function getInstance()
+    {
+        if (!self::$errorLogger) {
+            self::$errorLogger = new ErrorLogger();
+        }
+
+        return self::$errorLogger;
+    }
+
+    /**
+     * ErrorLogger constructor.
+     */
+    private function __construct()
+    {
+        // private constructor
+    }
+
+    /**
+     * Loops through stepEvent for browser log entries
+     * @param \Facebook\WebDriver\Remote\RemoteWebDriver $webDriver
+     * @param \Codeception\Event\StepEvent $stepEvent
+     * @return void
+     */
+    public function logErrors($webDriver, $stepEvent)
+    {
+        //Types available should be "server", "browser", "driver". Only care about browser at the moment.
+        $browserLogEntries = $webDriver->manage()->getLog("browser");
+        foreach ($browserLogEntries as $entry) {
+            if ($entry["source"] === "javascript") {
+                $this->logError("javascript", $stepEvent, $entry);
+            }
+        }
+    }
+
+    /**
+     * Logs errors to console/report.
+     * @param string $type
+     * @param \Codeception\Event\StepEvent $stepEvent
+     * @param array $entry
+     * @return void
+     */
+    private function logError($type, $stepEvent, $entry)
+    {
+        //TODO Add to overall log
+        $stepEvent->getTest()->getScenario()->comment("{$type} ERROR({$entry["level"]}) - " . $entry["message"]);
+    }
+}

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Extension;
 
 use \Codeception\Events;
+use Magento\FunctionalTestingFramework\Extension\ErrorLogger;
 
 /**
  * Class TestContextExtension
@@ -22,6 +23,7 @@ class TestContextExtension extends \Codeception\Extension
      */
     public static $events = [
         Events::TEST_FAIL => 'testFail',
+        Events::STEP_AFTER => 'afterStep'
     ];
 
     /**
@@ -68,4 +70,16 @@ public function extractContext($trace, $class)
         }
         return null;
     }
+
+    /**
+     * Codeception event listener function, triggered after step.
+     * Calls ErrorLogger to log JS errors encountered.
+     * @param \Codeception\Event\StepEvent $e
+     * @return void
+     */
+    public function afterStep(\Codeception\Event\StepEvent $e)
+    {
+        $webDriver = $this->getModule("\Magento\FunctionalTestingFramework\Module\MagentoWebDriver")->webDriver;
+        ErrorLogger::getInstance()->logErrors($webDriver, $e);
+    }
 }

src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php

@@ -62,7 +62,7 @@ private function __construct()
             }
 
             $module = $pageData[self::MODULE];
-            $sectionNames = array_keys($pageData[self::SECTION]);
+            $sectionNames = array_keys($pageData[self::SECTION] ?? []);
             $parameterized = $pageData[self::PARAMETERIZED] ?? false;
 
             $this->pageObjects[$pageName] =

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -495,6 +495,10 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                 $this->setTimeout($obj->getElement($objField)->getTimeout());
             } elseif (get_class($obj) == EntityDataObject::class) {
                 $replacement = $this->resolveEntityDataObjectReference($obj, $match);
+
+                if (is_array($replacement)) {
+                    $replacement = '["' . implode('","', array_map('addSlashes', $replacement)) . '"]';
+                }
             }
 
             if ($replacement === null) {