Skip to content

Commit d2eb58a

Browse files
soumyausoumyau
authored
Merge branch 'develop' into MQE-1581
2 parents f559e75 + 20e1c7e commit d2eb58a

File tree

90 files changed

+835
-1777
lines changed

Some content is hidden

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

90 files changed

+835
-1777
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/Test/Objects/ActionObjectTest.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ public function testResolveUrl()
233233
*/
234234
public function testResolveUrlWithNoAttribute()
235235
{
236+
$this->expectException(TestReferenceException::class);
237+
236238
// Set up mocks
237239
$actionObject = new ActionObject('merge123', 'amOnPage', [
238240
'url' => '{{PageObject}}'
@@ -247,19 +249,6 @@ public function testResolveUrlWithNoAttribute()
247249

248250
// Call the method under test
249251
$actionObject->resolveReferences();
250-
251-
// Expect this warning to get generated
252-
TestLoggingUtil::getInstance()->validateMockLogStatement(
253-
"warning",
254-
"page url attribute not found and is required",
255-
['action' => $actionObject->getType(), 'url' => '{{PageObject}}', 'stepKey' => $actionObject->getStepKey()]
256-
);
257-
258-
// Verify
259-
$expected = [
260-
'url' => '{{PageObject}}'
261-
];
262-
$this->assertEquals($expected, $actionObject->getCustomActionAttributes());
263252
}
264253

265254
/**

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionGroupAnnotationExtractorTest.php

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,49 +44,6 @@ public function testActionGroupExtractAnnotations()
4444
$this->assertEquals("someDescription", $returnedAnnotations['description']);
4545
}
4646

47-
/**
48-
* Annotation extractor should throw warning when required annotations are missing
49-
*
50-
* @throws \Exception
51-
*/
52-
public function testActionGroupMissingAnnotations()
53-
{
54-
// Action Group Data, missing description
55-
$testAnnotations = [];
56-
// Perform Test
57-
$extractor = new ActionGroupAnnotationExtractor();
58-
AspectMock::double($extractor, ['isCommandDefined' => true]);
59-
$extractor->extractAnnotations($testAnnotations, "fileName");
60-
61-
// Asserts
62-
TestLoggingUtil::getInstance()->validateMockLogStatement(
63-
'warning',
64-
'DEPRECATION: Action Group File fileName is missing required annotations.',
65-
[
66-
'actionGroup' => 'fileName',
67-
'missingAnnotations' => "description"
68-
]
69-
);
70-
}
71-
72-
/**
73-
* Annotation extractor should not throw warning when required
74-
* annotations are missing if command is not generate:docs
75-
*
76-
* @throws \Exception
77-
*/
78-
public function testActionGroupMissingAnnotationsNoWarning()
79-
{
80-
// Action Group Data, missing description
81-
$testAnnotations = [];
82-
// Perform Test
83-
$extractor = new ActionGroupAnnotationExtractor();
84-
$extractor->extractAnnotations($testAnnotations, "fileName");
85-
86-
// Asserts
87-
TestLoggingUtil::getInstance()->validateMockLogEmpty();
88-
}
89-
9047
/**
9148
* After class functionality
9249
* @return void

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

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)