Merge branch 'develop' into pr-809

Author: jilu1

dev/tests/functional/standalone_bootstrap.php

@@ -70,10 +70,3 @@
 
 $RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/MFTF';
 defined('TESTS_MODULE_PATH') || define('TESTS_MODULE_PATH', realpath(TESTS_BP . $RELATIVE_TESTS_MODULE_PATH));
-
-
-// add the debug flag here
-$debug_mode = $_ENV['MFTF_DEBUG'] ?? false;
-if (!(bool)$debug_mode && extension_loaded('xdebug')) {
-    xdebug_disable();
-}

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Persist/OperationDataArrayResolverTest.php

@@ -477,6 +477,60 @@ public function testNestedMetadataArrayOfDiverseObjects()
         $this->assertEquals($expectedResult, $result);
     }
 
+    public function testExtendedWithRequiredEntity()
+    {
+        $entityDataObjectBuilder = new EntityDataObjectBuilder();
+        $extEntityDataObject = $entityDataObjectBuilder
+            ->withName("extEntity")
+            ->withType("entity")
+            ->withLinkedEntities(["baseSubentity" => "subentity","extSubentity" => "subentity"])
+            ->build();
+
+        $mockDOHInstance = AspectMock::double(DataObjectHandler::class, ["getObject" => function ($name) {
+            $entityDataObjectBuilder = new EntityDataObjectBuilder();
+
+            if ($name == "baseSubentity") {
+                return $entityDataObjectBuilder
+                    ->withName("baseSubentity")
+                    ->withType("subentity")
+                    ->withDataFields(["subtest" => "BaseSubtest"])
+                    ->build();
+            }
+
+            if ($name == "extSubentity") {
+                return $entityDataObjectBuilder
+                    ->withName("extSubentity")
+                    ->withType("subentity")
+                    ->withDataFields(["subtest" => "ExtSubtest"])
+                    ->build();
+            }
+        }])->make();
+        AspectMock::double(DataObjectHandler::class, ['getInstance' => $mockDOHInstance]);
+
+        $subentityOpElementBuilder = new OperationElementBuilder();
+        $subentityOpElement = $subentityOpElementBuilder
+            ->withKey("sub")
+            ->withType("subentity")
+            ->withElementType("object")
+            ->withFields(["subtest" => "string"])
+            ->build();
+
+        $operationResolver = new OperationDataArrayResolver();
+        $result = $operationResolver->resolveOperationDataArray(
+            $extEntityDataObject,
+            [$subentityOpElement],
+            "create",
+            false
+        );
+
+        $expected = [
+            "sub" => [
+                "subtest" => "ExtSubtest"
+            ]
+        ];
+
+        $this->assertEquals($expected, $result);
+    }
     /**
      * After class functionality
      * @return void

src/Magento/FunctionalTestingFramework/Config/MftfApplicationConfig.php

@@ -100,17 +100,15 @@ private function __construct(
 
         $this->phase = $phase;
         $this->verboseEnabled = $verboseEnabled;
-        if (isset($debugLevel) && !in_array(strtolower($debugLevel), self::MFTF_DEBUG_LEVEL)) {
+        if (!in_array(strtolower($debugLevel), self::MFTF_DEBUG_LEVEL)) {
             throw new TestFrameworkException("{$debugLevel} is not a debug level. Use 'DEFAULT' or 'DEVELOPER'");
         }
         switch (strtolower($debugLevel)) {
-            case self::LEVEL_DEVELOPER:
             case self::LEVEL_DEFAULT:
-                $this->debugLevel = $debugLevel;
+                $this->debugLevel = self::LEVEL_DEFAULT;
                 break;
-            case null:
+            default:
                 $this->debugLevel = self::LEVEL_DEVELOPER;
-                break;
         }
         $this->allowSkipped = $allowSkipped;
         $this->filterList = new FilterList($filters);
@@ -196,7 +194,7 @@ public function verboseEnabled()
      */
     public function getDebugLevel()
     {
-        return $this->debugLevel ?? getenv('MFTF_DEBUG');
+        return $this->debugLevel;
     }
 
     /**

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php

@@ -245,10 +245,11 @@ private function getDependentEntitiesOfType($type)
     private function resolveOperationObjectAndEntityData($entityObject, $operationElementValue)
     {
         if ($operationElementValue != $entityObject->getType()) {
-            // if we have a mismatch attempt to retrieve linked data and return just the first linkage
+            // if we have a mismatch attempt to retrieve linked data and return just the last linkage
+            // this enables overwriting of required entity fields
             $linkName = $entityObject->getLinkedEntitiesOfType($operationElementValue);
             if (!empty($linkName)) {
-                $linkName = $linkName[0];
+                $linkName = array_pop($linkName);
                 return DataObjectHandler::getInstance()->getObject($linkName);
             }
             return null;

src/Magento/FunctionalTestingFramework/_bootstrap.php

@@ -74,9 +74,3 @@
     'TESTS_MODULE_PATH',
     realpath(TESTS_BP . $RELATIVE_TESTS_MODULE_PATH)
 );
-
-// add the debug flag here
-$debugMode = $_ENV['MFTF_DEBUG'] ?? false;
-if (!(bool)$debugMode && extension_loaded('xdebug')) {
-    xdebug_disable();
-}