Skip to content

Commit 7ad4084

Browse files
committed
MQE-1541: Add option to generate:tests for XSD validation on 'merged files'
1 parent f5d0040 commit 7ad4084

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

dev/tests/verification/Resources/BasicFunctionalTest.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ class BasicFunctionalTestCest
6060
{
6161
$I->comment("");
6262
$I->comment("");
63-
$I->skipReadinessCheck(true);
64-
$I->comment("skipReadiness");
65-
$I->skipReadinessCheck(false);
63+
$I->comment("seeComment");
6664
$someVarDefinition = $I->grabValueFrom();
6765
$I->acceptPopup();
6866
$I->amOnPage("/test/url");

dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
</after>
2525
<comment stepKey="basicCommentWithNoData" userInput="{{emptyData.noData}}"/>
2626
<comment stepKey="basicCommentWithDefinitelyNoData" userInput="{{emptyData.definitelyNoData}}"/>
27+
<comment stepKey="basicCommentWithData" userInput="seeComment"/>
2728
<grabValueFrom stepKey="someVarDefinition"/>
2829
<acceptPopup stepKey="acceptPopupKey1"/>
2930
<amOnPage stepKey="amOnPageKey1" url="/test/url"/>

dev/tests/verification/Tests/SchemaValidationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class SchemaValidationTest extends MftfTestCase
1919
*/
2020
public function testInvalidTestSchema()
2121
{
22-
AspectMock::double(MftfApplicationConfig::class, ['debugEnabled' => true]);
22+
AspectMock::double(MftfApplicationConfig::class, ['getDebugMode' => MftfApplicationConfig::DEVELOPER_MODE]);
2323
$testFile = ['testFile.xml' => "<tests><test name='testName'><annotations>a</annotations></test></tests>"];
2424
$expectedError = TESTS_MODULE_PATH .
2525
DIRECTORY_SEPARATOR .

src/Magento/FunctionalTestingFramework/Config/Reader/MftfFilesystem.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,10 @@ public function readFiles($fileList)
5151
}
5252
}
5353
$exceptionCollector->throwException();
54-
if ($fileList->valid()) {
55-
$this->validateSchema($configMerger, $fileList->getFilename());
56-
}
5754

5855
//run validation on merged file with generate:tests
5956
if ($debugMode === MftfApplicationConfig::DEFAULT_DEBUG_MODE) {
60-
$this->validateSchema($configMerger, $debugMode);
57+
$this->validateSchema($configMerger);
6158
}
6259

6360
$output = [];

0 commit comments

Comments
 (0)