Skip to content

Commit c563a41

Browse files
okolesnykokolesnyk
committed
Merge branch 'MQE-2195' of github.com:magento-pangolin/magento-semver into MQE-2195
2 parents 9fd84bb + c9c39df commit c563a41

File tree

29 files changed

+509
-2
lines changed

29 files changed

+509
-2
lines changed

‎src/Analyzer/Mftf/ActionGroupAnalyzer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,19 @@ public function analyze($registryBefore, $registryAfter)
192192
);
193193
}
194194
}
195+
196+
// check new modules
197+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
198+
foreach ($newModuleEntities as $module => $entities) {
199+
$this->findAddedEntitiesInModule(
200+
$beforeEntities[$module] ?? [],
201+
$entities,
202+
self::MFTF_DATA_TYPE,
203+
$this->getReport(),
204+
ActionGroupAdded::class,
205+
$module . '/ActionGroup'
206+
);
207+
}
195208
return $this->getReport();
196209
}
197210
}

‎src/Analyzer/Mftf/DataAnalyzer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,19 @@ public function analyze($registryBefore, $registryAfter)
219219
);
220220
}
221221
}
222+
223+
// check new modules
224+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
225+
foreach ($newModuleEntities as $module => $entities) {
226+
$this->findAddedEntitiesInModule(
227+
$beforeEntities[$module] ?? [],
228+
$entities,
229+
self::MFTF_DATA_TYPE,
230+
$this->getReport(),
231+
DataEntityAdded::class,
232+
$module . '/Data'
233+
);
234+
}
222235
return $this->getReport();
223236
}
224237
}

‎src/Analyzer/Mftf/MetadataAnalyzer.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function analyze($registryBefore, $registryAfter)
4343
self::MFTF_DATA_TYPE,
4444
$this->getReport(),
4545
MetadataAdded::class,
46-
$module . '/ActionGroup'
46+
$module . '/Metadata'
4747
);
4848
foreach ($entities as $entityName => $beforeEntity) {
4949
if ($beforeEntity['type'] !== self::MFTF_DATA_TYPE) {
@@ -90,6 +90,19 @@ public function analyze($registryBefore, $registryAfter)
9090
);
9191
}
9292
}
93+
94+
// check new modules
95+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
96+
foreach ($newModuleEntities as $module => $entities) {
97+
$this->findAddedEntitiesInModule(
98+
$beforeEntities[$module] ?? [],
99+
$entities,
100+
self::MFTF_DATA_TYPE,
101+
$this->getReport(),
102+
MetadataAdded::class,
103+
$module . '/Metadata'
104+
);
105+
}
93106
return $this->getReport();
94107
}
95108

‎src/Analyzer/Mftf/PageAnalyzer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,19 @@ public function analyze($registryBefore, $registryAfter)
9898
);
9999
}
100100
}
101+
102+
// check new modules
103+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
104+
foreach ($newModuleEntities as $module => $entities) {
105+
$this->findAddedEntitiesInModule(
106+
$beforeEntities[$module] ?? [],
107+
$entities ?? [],
108+
self::MFTF_DATA_TYPE,
109+
$this->getReport(),
110+
PageAdded::class,
111+
$module . '/Page'
112+
);
113+
}
101114
return $this->getReport();
102115
}
103116
}

‎src/Analyzer/Mftf/SectionAnalyzer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,19 @@ public function analyze($registryBefore, $registryAfter)
140140
);
141141
}
142142
}
143+
144+
// check new modules
145+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
146+
foreach ($newModuleEntities as $module => $entities) {
147+
$this->findAddedEntitiesInModule(
148+
$beforeEntities[$module] ?? [],
149+
$entities,
150+
self::MFTF_DATA_TYPE,
151+
$this->getReport(),
152+
SectionAdded::class,
153+
$module . '/Section'
154+
);
155+
}
143156
return $this->getReport();
144157
}
145158
}

‎src/Analyzer/Mftf/SuiteAnalyzer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,19 @@ public function analyze($registryBefore, $registryAfter)
157157
);
158158
}
159159
}
160+
161+
// check new modules
162+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
163+
foreach ($newModuleEntities as $module => $entities) {
164+
$this->findAddedEntitiesInModule(
165+
$beforeEntities[$module] ?? [],
166+
$entities,
167+
self::MFTF_DATA_TYPE,
168+
$this->getReport(),
169+
SuiteAdded::class,
170+
$module . '/Suite'
171+
);
172+
}
160173
return $this->getReport();
161174
}
162175

‎src/Analyzer/Mftf/TestAnalyzer.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,20 @@ public function analyze($registryBefore, $registryAfter)
173173
);
174174
}
175175
}
176+
177+
// check new modules
178+
$newModuleEntities = array_diff_key($afterEntities, $beforeEntities);
179+
foreach ($newModuleEntities as $module => $entities) {
180+
$this->findAddedEntitiesInModule(
181+
$beforeEntities[$module] ?? [],
182+
$entities,
183+
self::MFTF_DATA_TYPE,
184+
$this->getReport(),
185+
TestAdded::class,
186+
$module . '/Test'
187+
);
188+
189+
}
176190
return $this->getReport();
177191
}
178192

‎tests/Unit/Console/Command/CompareSourceCommandMftfTest.php

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,15 @@ public function changesDataProvider()
100100
],
101101
'Minor change is detected.'
102102
],
103+
'new-module-actionGroup-added' => [
104+
$pathToFixtures . '/new-module-actionGroup-added/source-code-before',
105+
$pathToFixtures . '/new-module-actionGroup-added/source-code-after',
106+
[
107+
'Mftf (MINOR)',
108+
'ActionGroup/ActionGroup2 | <actionGroup> was added | M225'
109+
],
110+
'Minor change is detected.'
111+
],
103112
'actionGroup-argument-changed' => [
104113
$pathToFixtures . '/actionGroup-argument-changed/source-code-before',
105114
$pathToFixtures . '/actionGroup-argument-changed/source-code-after',
@@ -181,6 +190,15 @@ public function changesDataProvider()
181190
],
182191
'Minor change is detected.'
183192
],
193+
'new-module-data-added' => [
194+
$pathToFixtures . '/new-module-data-added/source-code-before',
195+
$pathToFixtures . '/new-module-data-added/source-code-after',
196+
[
197+
'Mftf (MINOR)',
198+
'Data/DataEntity2 | <entity> was added | M228'
199+
],
200+
'Minor change is detected.'
201+
],
184202
'data-array-removed' => [
185203
$pathToFixtures . '/data-array-removed/source-code-before',
186204
$pathToFixtures . '/data-array-removed/source-code-after',
@@ -276,7 +294,16 @@ public function changesDataProvider()
276294
$pathToFixtures . '/metadata-added/source-code-after',
277295
[
278296
'Mftf (MINOR)',
279-
'ActionGroup/createEntity2 | <operation> was added | M240'
297+
'Metadata/createEntity2 | <operation> was added | M240'
298+
],
299+
'Minor change is detected.'
300+
],
301+
'new-module-metadata-added' => [
302+
$pathToFixtures . '/new-module-metadata-added/source-code-before',
303+
$pathToFixtures . '/new-module-metadata-added/source-code-after',
304+
[
305+
'Mftf (MINOR)',
306+
'Metadata/createEntity2 | <operation> was added | M240'
280307
],
281308
'Minor change is detected.'
282309
],
@@ -379,6 +406,15 @@ public function changesDataProvider()
379406
],
380407
'Minor change is detected.'
381408
],
409+
'new-module-page-added' => [
410+
$pathToFixtures . '/new-module-page-added/source-code-before',
411+
$pathToFixtures . '/new-module-page-added/source-code-after',
412+
[
413+
'Mftf (MINOR)',
414+
'Page/SamplePageNew | <page> was added | M233'
415+
],
416+
'Minor change is detected.'
417+
],
382418
'page-section-removed' => [
383419
$pathToFixtures . '/page-section-removed/source-code-before',
384420
$pathToFixtures . '/page-section-removed/source-code-after',
@@ -415,6 +451,15 @@ public function changesDataProvider()
415451
],
416452
'Minor change is detected.'
417453
],
454+
'new-module-section-added' => [
455+
$pathToFixtures . '/new-module-section-added/source-code-before',
456+
$pathToFixtures . '/new-module-section-added/source-code-after',
457+
[
458+
'Mftf (MINOR)',
459+
'Section/NewSection | <section> was added | M235'
460+
],
461+
'Minor change is detected.'
462+
],
418463
'section-element-removed' => [
419464
$pathToFixtures . '/section-element-removed/source-code-before',
420465
$pathToFixtures . '/section-element-removed/source-code-after',
@@ -487,6 +532,15 @@ public function changesDataProvider()
487532
],
488533
'Minor change is detected.'
489534
],
535+
'new-module-test-added' => [
536+
$pathToFixtures . '/new-module-test-added/source-code-before',
537+
$pathToFixtures . '/new-module-test-added/source-code-after',
538+
[
539+
'Mftf (MINOR)',
540+
'Test/NewTest | <test> was added | M237'
541+
],
542+
'Minor change is detected.'
543+
],
490544
'test-action-changed' => [
491545
$pathToFixtures . '/test-action-changed/source-code-before',
492546
$pathToFixtures . '/test-action-changed/source-code-after',
@@ -640,6 +694,15 @@ public function changesDataProvider()
640694
],
641695
'Minor change is detected.'
642696
],
697+
'new-module-suite-added' => [
698+
$pathToFixtures . '/new-module-suite-added/source-code-before',
699+
$pathToFixtures . '/new-module-suite-added/source-code-after',
700+
[
701+
'Mftf (MINOR)',
702+
'Suite/Sample2Suite | <suite> was added | M407'
703+
],
704+
'Minor change is detected.'
705+
],
643706
'suite-removed' => [
644707
$pathToFixtures . '/suite-removed/source-code-before',
645708
$pathToFixtures . '/suite-removed/source-code-after',

‎tests/Unit/Console/Command/CompareSourceCommandTest/_files/mftf/new-module-actionGroup-added/source-code-after/Magento/TestModule/Test/Mftf/actionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ActionGroup1">
11+
<comment userInput="action1" stepKey="action1"/>
12+
<comment userInput="action2" stepKey="action2"/>
13+
</actionGroup>
14+
</actionGroups>

‎tests/Unit/Console/Command/CompareSourceCommandTest/_files/mftf/new-module-actionGroup-added/source-code-after/Magento/TestModuleTwo/Test/Mftf/actionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ActionGroup2">
11+
<comment userInput="action1" stepKey="action1"/>
12+
<comment userInput="action2" stepKey="action2"/>
13+
</actionGroup>
14+
</actionGroups>

0 commit comments

Comments
 (0)