File tree Expand file tree Collapse file tree 7 files changed +38
-22
lines changed
src/Magento/FunctionalTestingFramework Expand file tree Collapse file tree 7 files changed +38
-22
lines changed Original file line number Diff line number Diff line change @@ -107,7 +107,8 @@ function ($type, $buffer) use ($output) {
107
107
);
108
108
}
109
109
110
- // Temporary enable upgrade at build time for testing
110
+
111
+ // MQE-1963: Temporary enable upgrade at build time for testing
111
112
//if ($input->getOption('upgrade')) {
112
113
$ upgradeCommand = new UpgradeTestsCommand ();
113
114
$ upgradeOptions = new ArrayInput ([]);
Original file line number Diff line number Diff line change @@ -97,19 +97,21 @@ public function initDom($xml, $filename = null)
97
97
);
98
98
99
99
// Validate single page node per file
100
+ /* MQE-1963: Disable single entity validation
100
101
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
101
102
$dom,
102
103
'page',
103
104
$filename
104
105
);
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 ) {
113
115
$ pageModule = $ pageNode ->getAttribute ("module " );
114
116
$ pageName = $ pageNode ->getAttribute ("name " );
115
117
if ($ pageModule !== $ currentModule ) {
Original file line number Diff line number Diff line change @@ -80,14 +80,17 @@ public function initDom($xml, $filename = null)
80
80
81
81
if ($ dom ->getElementsByTagName ('sections ' )->length > 0 ) {
82
82
// Validate single section node per file
83
+ /* MQE-1963: Disable single entity validation
83
84
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
84
85
$dom,
85
86
'section',
86
87
$filename
87
88
);
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 ) {
91
94
$ sectionNode ->setAttribute (self ::SECTION_META_FILENAME_ATTRIBUTE , $ filename );
92
95
$ this ->validationUtil ->validateChildUniqueness (
93
96
$ sectionNode ,
Original file line number Diff line number Diff line change @@ -67,14 +67,17 @@ public function initDom($xml, $filename = null)
67
67
68
68
if ($ dom ->getElementsByTagName ('suites ' )->length > 0 ) {
69
69
// Validate single suite node per file
70
+ /* MQE-1963: Disable single entity validation
70
71
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
71
72
$dom,
72
73
'suite',
73
74
$filename
74
75
);
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 ) {
78
81
$ suiteNode ->setAttribute (self ::SUITE_META_FILENAME_ATTRIBUTE , $ filename );
79
82
}
80
83
}
Original file line number Diff line number Diff line change @@ -39,15 +39,18 @@ public function initDom($xml, $filename = null)
39
39
);
40
40
41
41
// Validate single action group node per file
42
+ /* MQE-1963: Disable single entity validation
42
43
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
43
44
$dom,
44
45
'actionGroup',
45
46
$filename
46
47
);
48
+ */
47
49
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 ) {
51
54
$ actionGroupNode ->setAttribute (self ::TEST_META_FILENAME_ATTRIBUTE , $ filename );
52
55
$ this ->actionsValidationUtil ->validateChildUniqueness (
53
56
$ actionGroupNode ,
Original file line number Diff line number Diff line change @@ -105,15 +105,18 @@ public function initDom($xml, $filename = null)
105
105
null
106
106
);
107
107
// Validate single test node per file
108
+ /* MQE-1963: Disable single entity validation
108
109
$this->singleNodePerFileValidationUtil->validateSingleNodeForTag(
109
110
$dom,
110
111
'test',
111
112
$filename
112
113
);
114
+ */
113
115
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 ) {
117
120
$ testNode ->setAttribute (self ::TEST_META_FILENAME_ATTRIBUTE , $ filename );
118
121
if ($ testNode ->getAttribute (self ::TEST_MERGE_POINTER_AFTER ) !== "" ) {
119
122
$ this ->appendMergePointerToActions (
Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ public function __construct(array $scripts = [])
31
31
'upgradeTestSchema ' => new UpdateTestSchemaPaths (),
32
32
'renameMetadataFiles ' => new RenameMetadataFiles (),
33
33
'removeModuleFileInSuiteFiles ' => new RemoveModuleFileInSuiteFiles (),
34
- 'splitMultipleEntitiesFiles ' => new SplitMultipleEntitiesFiles (),
34
+ // MQE-1963: Revert at MFTF 3.0.0 Release
35
+ //'splitMultipleEntitiesFiles' => new SplitMultipleEntitiesFiles(),
35
36
] + $ scripts ;
36
37
}
37
38
You can’t perform that action at this time.
0 commit comments