Skip to content

Commit 7014ea6

Browse files
committed
MQE-839: object in metadata file will be overwritten by object merged in from another metadata file
- configure di.xml to use new schema changes for merging metadata paths
1 parent 187e4d0 commit 7014ea6

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

etc/di.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,18 @@
182182
<argument name="schemaPath" xsi:type="string">Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd</argument>
183183
</arguments>
184184
</virtualType>
185-
<virtualType name="Magento\FunctionalTestingFramework\Config\Reader\Metadata" type="Magento\FunctionalTestingFramework\Config\Reader\Filesystem">
185+
<virtualType name="Magento\FunctionalTestingFramework\Config\Reader\Metadata" type="Magento\FunctionalTestingFramework\DataGenerator\Config\Reader\Filesystem">
186186
<arguments>
187187
<argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Module</argument>
188188
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
189+
<argument name="domDocumentClass" xsi:type="string">Magento\FunctionalTestingFramework\DataGenerator\Config\Dom</argument>
189190
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Metadata</argument>
190191
<argument name="idAttributes" xsi:type="array">
191192
<item name="/operations/operation" xsi:type="string">name</item>
192-
<item name="/operations/operation/(field|array|object)" xsi:type="string">key</item>
193+
<item name="/operations/operation/(field|array)" xsi:type="string">key</item>
194+
</argument>
195+
<argument name="mergeablePaths" xsi:type="array">
196+
<item name="/operations/operation/object" xsi:type="string"/>
193197
</argument>
194198
<argument name="fileName" xsi:type="string">*-meta.xml</argument>
195199
<argument name="defaultScope" xsi:type="string">Metadata</argument>

0 commit comments

Comments
 (0)