MQE-741: two steps with same step key, the later step will overwrite the previous step.

Author: okolesnyk

etc/di.xml

@@ -199,7 +199,8 @@
 
     <virtualType name="Magento\FunctionalTestingFramework\Config\SchemaLocator\TestData" type="Magento\FunctionalTestingFramework\Config\SchemaLocator">
         <arguments>
-            <argument name="schemaPath" xsi:type="string">Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd</argument>
+            <argument name="schemaPath" xsi:type="string">Magento/FunctionalTestingFramework/Test/etc/mergedTestSchema.xsd</argument>
+            <argument name="perFileSchema" xsi:type="string">Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\FunctionalTestingFramework\Config\Reader\TestData" type="Magento\FunctionalTestingFramework\Config\Reader\TestFilesystem">

src/Magento/FunctionalTestingFramework/Config/SchemaLocator.php

@@ -3,34 +3,49 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\FunctionalTestingFramework\Config;
 
 /**
- * Class SchemaLocator
- * Scenario configuration schema locator
+ * Configuration schema locator.
  */
 class SchemaLocator implements \Magento\FunctionalTestingFramework\Config\SchemaLocatorInterface
 {
     /**
-     * XSD schema path
+     * Path to corresponding XSD file with validation rules for merged config.
      *
      * @var string
      */
-    protected $schemaPath;
+    private $schemaPath;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files.
+     *
+     * @var string
+     */
+    private $perFileSchema;
+
 
     /**
      * Class constructor
      *
      * @param string $schemaPath
+     * @param string|null $perFileSchema
      */
-    public function __construct($schemaPath)
+    public function __construct($schemaPath, $perFileSchema = null)
     {
         if (constant('FW_BP') && file_exists(FW_BP . DIRECTORY_SEPARATOR . $schemaPath)) {
-            $this->schemaPath =  FW_BP . DIRECTORY_SEPARATOR . $schemaPath;
+            $this->schemaPath = FW_BP . DIRECTORY_SEPARATOR . $schemaPath;
+            $this->perFileSchema = $perFileSchema === null
+                ? $this->schemaPath
+                : FW_BP . DIRECTORY_SEPARATOR . $perFileSchema;
         } else {
             $path = dirname(dirname(dirname(__DIR__)));
             $path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
-            $this->schemaPath =  $path . DIRECTORY_SEPARATOR . $schemaPath;
+            $this->schemaPath = $path . DIRECTORY_SEPARATOR . $schemaPath;
+            $this->perFileSchema = $perFileSchema === null
+                ? $this->schemaPath
+                : $path . DIRECTORY_SEPARATOR . $perFileSchema;
         }
     }
 
@@ -51,6 +66,6 @@ public function getSchema()
      */
     public function getPerFileSchema()
     {
-        return null;
+        return $this->perFileSchema;
     }
 }