Skip to content

Commit 5e96fb4

Browse files
committed
MQE-1541: Add option to generate:tests for XSD validation on 'merged files'
1 parent 741e81d commit 5e96fb4

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function readFiles($fileList)
4141
} else {
4242
$configMerger->merge($content, $fileList->getFilename(), $exceptionCollector);
4343
}
44-
// per file debug mode - run per file validation for generate:tests -d
44+
// run per file validation with generate:tests -d
4545
if (!in_array($debugMode, MftfApplicationConfig::MFTF_DEBUG_MODES) ||
4646
$debugMode == MftfApplicationConfig::PER_FILE_DEBUG_MODE) {
4747
$this->validateSchema($configMerger, $fileList->getFilename());
@@ -55,7 +55,7 @@ public function readFiles($fileList)
5555
$this->validateSchema($configMerger, $fileList->getFilename());
5656
}
5757

58-
// default debug mode - run validation on merged file for generate:tests
58+
// run validation on merged file with generate:tests
5959
if ($debugMode == MftfApplicationConfig::DEFAULT_DEBUG_MODE) {
6060
$this->validateSchema($configMerger);
6161
}

src/Magento/FunctionalTestingFramework/Console/GenerateTestsCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7979
$json = $input->getOption('tests');
8080
$force = $input->getOption('force');
8181
$time = $input->getOption('time') * 60 * 1000; // convert from minutes to milliseconds
82-
$debug = $input->getOption('debug')?? MftfApplicationConfig::PER_FILE_DEBUG_MODE; //set to per file debug as default
82+
$debug = $input->getOption('debug')?? MftfApplicationConfig::PER_FILE_DEBUG_MODE; // set to per file if no option specified
8383
$remove = $input->getOption('remove');
8484
$verbose = $output->isVerbose();
8585

src/Magento/FunctionalTestingFramework/Test/etc/Actions/commonAttributes.xsd

-1
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@
8080
</xs:documentation>
8181
</xs:annotation>
8282
</xs:attribute>
83-
8483
</xs:schema>

0 commit comments

Comments
 (0)