Skip to content

Commit 1e534e1

Browse files
tomreecetomreece
authored
Merge branch 'develop' into MQE-2018
2 parents 2601074 + 4098f44 commit 1e534e1

File tree

76 files changed

+616
-1275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+616
-1275
lines changed

‎dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="DeprecatedCommentActionGroup" deprecated="This Action Group is outdated and will be deleted next release.">
1111
<comment userInput="Action group to demonstrate deprecation notices." stepKey="comment" />
1212
</actionGroup>

‎dev/tests/functional/tests/MFTF/DevDocs/Data/DeprecatedMessageData.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="DeprecatedMessageData" deprecated="Entity is deprecated. Please use 'MessageData'.">
1212
<data key="message">Introduction to the Magento Functional Testing Framework</data>
1313
</entity>

‎dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="MessageData">
1212
<data key="message">Introduction to the Magento Functional Testing Framework</data>
1313
</entity>

‎dev/tests/functional/tests/MFTF/DevDocs/Page/DeprecatedMFTFDocPage.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="DeprecatedMFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs" deprecated="New page was introduced. Please use 'MFTFDocPage'">
1212
<section name="contentSection" />
1313
</page>

‎dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="MFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs">
1212
<section name="contentSection" />
1313
</page>

‎dev/tests/functional/tests/MFTF/DevDocs/Section/ContentSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="contentSection">
1212
<element name="pageIntro" type="text" selector=".page-intro"/>
1313
<element name="deprecatedPageIntro" type="text" selector=".page-intro-old" deprecated="New element was introduced. Please use 'contentSection.pageIntro'"/>

‎dev/tests/functional/tests/MFTF/DevDocs/Section/DeprecatedContentSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="DeprecatedContentSection" deprecated="New section was introduces. Please use 'contentSection'">
1212
<element name="pageIntro" type="text" selector=".page-intro"/>
1313
</section>

‎dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="DeprecatedDevDocsTest" deprecated="Test is deprecated due to more stable test was introduces. Please use 'DevDocsTest'.">
1212
<annotations>
1313
<!-- Comment in Annotations for DevDocs Test are not affecting test generation -->

‎dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="DevDocsTest">
1212
<annotations>
1313
<!-- Comment in Annotations for DevDocs Test are not affecting test generation -->

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php‎

Lines changed: 137 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public function testGetModulePathsAlreadySet()
5757
*/
5858
public function testGetModulePathsAggregate()
5959
{
60-
6160
$this->mockForceGenerate(false);
6261
$this->setMockResolverClass(
6362
false,
@@ -89,6 +88,50 @@ public function testGetModulePathsAggregate()
8988
);
9089
}
9190

91+
/**
92+
* Validate aggregateTestModulePaths() when module path part of DEV_TESTS
93+
*
94+
* @throws \Exception
95+
*/
96+
public function testAggregateTestModulePathsDevTests()
97+
{
98+
$origin = TESTS_MODULE_PATH;
99+
$modulePath = ModuleResolver::DEV_TESTS . DIRECTORY_SEPARATOR . "Magento";
100+
putenv("TESTS_MODULE_PATH=$modulePath");
101+
102+
$this->mockForceGenerate(false);
103+
$mockResolver = $this->setMockResolverClass(
104+
true,
105+
[],
106+
null,
107+
null,
108+
[],
109+
[],
110+
[],
111+
null,
112+
null,
113+
[],
114+
[],
115+
null,
116+
function ($arg) {
117+
return $arg;
118+
},
119+
function ($arg) {
120+
return $arg;
121+
}
122+
);
123+
$resolver = ModuleResolver::getInstance();
124+
$this->setMockResolverProperties($resolver, null, null);
125+
$this->assertEquals(
126+
[],
127+
$resolver->getModulesPath()
128+
);
129+
130+
$mockResolver->verifyNeverInvoked('globRelevantPaths', [$modulePath, '']);
131+
132+
putenv("TESTS_MODULE_PATH=$origin");
133+
}
134+
92135
/**
93136
* Validate correct path locations are fed into globRelevantPaths
94137
* @throws \Exception
@@ -409,6 +452,81 @@ public function testMergeFlipAndFilterModulePathsNoForceGenerate()
409452
);
410453
}
411454

455+
/**
456+
* Validate mergeModulePaths() and flipAndSortModulePathsArray()
457+
*
458+
* @throws \Exception
459+
*/
460+
public function testMergeFlipNoSortModulePathsNoForceGenerate()
461+
{
462+
$this->mockForceGenerate(false);
463+
$this->setMockResolverClass(
464+
false,
465+
null,
466+
null,
467+
null,
468+
null,
469+
null,
470+
null,
471+
null,
472+
null,
473+
[
474+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR
475+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleA' =>
476+
[
477+
'Magento_ModuleA'
478+
],
479+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR
480+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleBC' =>
481+
[
482+
'Magento_ModuleB',
483+
'Magento_ModuleC',
484+
],
485+
],
486+
[
487+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR
488+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleCD' =>
489+
[
490+
'Magento_ModuleC',
491+
'Magento_ModuleD'
492+
],
493+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR
494+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleE' =>
495+
[
496+
'Magento_ModuleE'
497+
],
498+
],
499+
[
500+
'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example' => ['Magento_Example'],
501+
'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample' => ['Magento_Sample'],
502+
]
503+
);
504+
505+
$resolver = ModuleResolver::getInstance();
506+
$this->setMockResolverProperties(
507+
$resolver,
508+
null,
509+
[
510+
0 => 'Magento_ModuleB',
511+
1 => 'Magento_ModuleC',
512+
2 => 'Magento_ModuleE',
513+
3 => 'Magento_Example',
514+
4 => 'Magento_Otherexample'
515+
]
516+
);
517+
518+
$this->assertEquals(
519+
[
520+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
521+
. 'ModuleE',
522+
'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example',
523+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
524+
. 'ModuleBC'
525+
],
526+
$resolver->getModulesPath()
527+
);
528+
}
529+
412530
/**
413531
* Validate mergeModulePaths() and flipAndSortModulePathsArray()
414532
*
@@ -428,23 +546,27 @@ public function testMergeFlipAndSortModulePathsForceGenerate()
428546
null,
429547
null,
430548
[
431-
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'pathA' =>
549+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR
550+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleA' =>
432551
[
433552
'Magento_ModuleA'
434553
],
435-
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'pathB' =>
554+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR
555+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleBC' =>
436556
[
437557
'Magento_ModuleB',
438558
'Magento_ModuleC',
439559
],
440560
],
441561
[
442-
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathA' =>
562+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR
563+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleCD' =>
443564
[
444565
'Magento_ModuleC',
445566
'Magento_ModuleD'
446567
],
447-
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathB' =>
568+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR
569+
. 'Magento' . DIRECTORY_SEPARATOR . 'ModuleD' =>
448570
[
449571
'Magento_ModuleD'
450572
],
@@ -467,14 +589,19 @@ public function testMergeFlipAndSortModulePathsForceGenerate()
467589
4 => 'Magento_Otherexample'
468590
]
469591
);
592+
470593
$this->assertEquals(
471594
[
472595
'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example',
473-
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'pathA',
474-
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'pathB',
475-
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathA',
476-
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathB',
477-
'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample'
596+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
597+
. 'ModuleA',
598+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
599+
. 'ModuleD',
600+
'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample',
601+
'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
602+
. 'ModuleBC',
603+
'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR
604+
. 'ModuleCD'
478605
],
479606
$resolver->getModulesPath()
480607
);

0 commit comments

Comments
 (0)