Skip to content

Commit 5ebd323

Browse files
committed
MQE-1963: Disable single entity validation for release testing
1 parent e09facc commit 5ebd323

File tree

7 files changed

+38
-22
lines changed

7 files changed

+38
-22
lines changed

src/Magento/FunctionalTestingFramework/Console/BuildProjectCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ function ($type, $buffer) use ($output) {
107107
);
108108
}
109109

110-
// Temporary enable upgrade at build time for testing
110+
111+
// MQE-1963: Temporary enable upgrade at build time for testing
111112
//if ($input->getOption('upgrade')) {
112113
$upgradeCommand = new UpgradeTestsCommand();
113114
$upgradeOptions = new ArrayInput([]);

src/Magento/FunctionalTestingFramework/Page/Config/Dom.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,21 @@ public function initDom($xml, $filename = null)
9797
);
9898

9999
// Validate single page node per file
100+
/* MQE-1963: Disable single entity validation
100101
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
101102
$dom,
102103
'page',
103104
$filename
104105
);
105-
106-
if ($dom->getElementsByTagName('page')->length > 0) {
107-
/** @var \DOMElement $pageNode */
108-
$pageNode = $dom->getElementsByTagName('page')[0];
109-
$currentModule =
110-
$this->modulePathExtractor->getExtensionPath($filename)
111-
. '_'
112-
. $this->modulePathExtractor->extractModuleName($filename);
106+
*/
107+
//if ($dom->getElementsByTagName('page')->length > 0) {
108+
/** @var \DOMElement $pageNodes */
109+
$pageNodes = $dom->getElementsByTagName('page');
110+
$currentModule =
111+
$this->modulePathExtractor->getExtensionPath($filename)
112+
. '_'
113+
. $this->modulePathExtractor->extractModuleName($filename);
114+
foreach ($pageNodes as $pageNode) {
113115
$pageModule = $pageNode->getAttribute("module");
114116
$pageName = $pageNode->getAttribute("name");
115117
if ($pageModule !== $currentModule) {

src/Magento/FunctionalTestingFramework/Page/Config/SectionDom.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,17 @@ public function initDom($xml, $filename = null)
8080

8181
if ($dom->getElementsByTagName('sections')->length > 0) {
8282
// Validate single section node per file
83+
/* MQE-1963: Disable single entity validation
8384
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
8485
$dom,
8586
'section',
8687
$filename
8788
);
88-
if ($dom->getElementsByTagName('section')->length > 0) {
89-
/** @var \DOMElement $sectionNode */
90-
$sectionNode = $dom->getElementsByTagName('section')[0];
89+
*/
90+
//if ($dom->getElementsByTagName('section')->length > 0) {
91+
/** @var \DOMElement $sectionNodes */
92+
$sectionNodes = $dom->getElementsByTagName('section');
93+
foreach ($sectionNodes as $sectionNode) {
9194
$sectionNode->setAttribute(self::SECTION_META_FILENAME_ATTRIBUTE, $filename);
9295
$this->validationUtil->validateChildUniqueness(
9396
$sectionNode,

src/Magento/FunctionalTestingFramework/Suite/Config/SuiteDom.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@ public function initDom($xml, $filename = null)
6767

6868
if ($dom->getElementsByTagName('suites')->length > 0) {
6969
// Validate single suite node per file
70+
/* MQE-1963: Disable single entity validation
7071
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
7172
$dom,
7273
'suite',
7374
$filename
7475
);
75-
if ($dom->getElementsByTagName('suite')->length > 0) {
76-
/** @var \DOMElement $suiteNode */
77-
$suiteNode = $dom->getElementsByTagName('suite')[0];
76+
*/
77+
//if ($dom->getElementsByTagName('suite')->length > 0) {
78+
/** @var \DOMElement $suiteNodes */
79+
$suiteNodes = $dom->getElementsByTagName('suite');
80+
foreach ($suiteNodes as $suiteNode) {
7881
$suiteNode->setAttribute(self::SUITE_META_FILENAME_ATTRIBUTE, $filename);
7982
}
8083
}

src/Magento/FunctionalTestingFramework/Test/Config/ActionGroupDom.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,18 @@ public function initDom($xml, $filename = null)
3939
);
4040

4141
// Validate single action group node per file
42+
/* MQE-1963: Disable single entity validation
4243
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
4344
$dom,
4445
'actionGroup',
4546
$filename
4647
);
48+
*/
4749

48-
if ($dom->getElementsByTagName('actionGroup')->length > 0) {
49-
/** @var \DOMElement $actionGroupNode */
50-
$actionGroupNode = $dom->getElementsByTagName('actionGroup')[0];
50+
//if ($dom->getElementsByTagName('actionGroup')->length > 0) {
51+
/** @var \DOMElement $actionGroupNodes */
52+
$actionGroupNodes = $dom->getElementsByTagName('actionGroup');
53+
foreach ($actionGroupNodes as $actionGroupNode) {
5154
$actionGroupNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
5255
$this->actionsValidationUtil->validateChildUniqueness(
5356
$actionGroupNode,

src/Magento/FunctionalTestingFramework/Test/Config/Dom.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,18 @@ public function initDom($xml, $filename = null)
105105
null
106106
);
107107
// Validate single test node per file
108+
/* MQE-1963: Disable single entity validation
108109
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
109110
$dom,
110111
'test',
111112
$filename
112113
);
114+
*/
113115

114-
if ($dom->getElementsByTagName('test')->length > 0) {
115-
/** @var \DOMElement $testNode */
116-
$testNode = $dom->getElementsByTagName('test')[0];
116+
//if ($dom->getElementsByTagName('test')->length > 0) {
117+
/** @var \DOMElement $testNodes */
118+
$testNodes = $dom->getElementsByTagName('test');
119+
foreach ($testNodes as $testNode) {
117120
$testNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
118121
if ($testNode->getAttribute(self::TEST_MERGE_POINTER_AFTER) !== "") {
119122
$this->appendMergePointerToActions(

src/Magento/FunctionalTestingFramework/Upgrade/UpgradeScriptList.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public function __construct(array $scripts = [])
3131
'upgradeTestSchema' => new UpdateTestSchemaPaths(),
3232
'renameMetadataFiles' => new RenameMetadataFiles(),
3333
'removeModuleFileInSuiteFiles' => new RemoveModuleFileInSuiteFiles(),
34-
'splitMultipleEntitiesFiles' => new SplitMultipleEntitiesFiles(),
34+
// MQE-1963: Revert at MFTF 3.0.0 Release
35+
//'splitMultipleEntitiesFiles' => new SplitMultipleEntitiesFiles(),
3536
] + $scripts;
3637
}
3738

0 commit comments

Comments
 (0)