Skip to content

Commit 5ecf5be

Browse files
authored
Merge pull request #602 from magento/MQE-1963
MQE-1963: Update XSD Schema to verify that file has only single entity
2 parents 264aaea + 029d896 commit 5ecf5be

File tree

221 files changed

+3439
-1837
lines changed

Some content is hidden

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

221 files changed

+3439
-1837
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"ext-curl": "*",
1414
"ext-json": "*",
1515
"ext-openssl": "*",
16+
"ext-dom": "*",
1617
"allure-framework/allure-codeception": "~1.3.0",
1718
"aws/aws-sdk-php": "^3.132",
1819
"codeception/codeception": "~2.4.5",

dev/tests/_bootstrap.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,28 +102,6 @@
102102
require($unitUtilFile);
103103
}
104104

105-
106-
// Mocks suite files location getter return to get files in verification/_suite Directory
107-
// This mocks the paths of the suite files but still parses the xml files
108-
$suiteDirectory = TESTS_BP . DIRECTORY_SEPARATOR . "verification" . DIRECTORY_SEPARATOR . "_suite";
109-
110-
$paths = [
111-
$suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuite.xml',
112-
$suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml',
113-
$suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteExtends.xml'
114-
];
115-
116-
// create and return the iterator for these file paths
117-
$iterator = new Magento\FunctionalTestingFramework\Util\Iterator\File($paths);
118-
try {
119-
AspectMock\Test::double(
120-
Magento\FunctionalTestingFramework\Config\FileResolver\Root::class,
121-
['get' => $iterator]
122-
)->make();
123-
} catch (Exception $e) {
124-
echo "Suite directory not mocked.";
125-
}
126-
127105
function sortInterfaces($files)
128106
{
129107
$bottom = [];

dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupContainsStepKeyInArgText.xml<br>")
1717
*/
1818
class ActionGroupContainsStepKeyInArgTextCest
1919
{

dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupMergedViaInsertAfter.xml<br>")
1717
*/
1818
class ActionGroupMergedViaInsertAfterCest
1919
{

dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupMergedViaInsertBefore.xml<br>")
1717
*/
1818
class ActionGroupMergedViaInsertBeforeCest
1919
{

dev/tests/verification/Resources/ActionGroupSkipReadiness.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupSkipReadiness.xml<br>")
1717
*/
1818
class ActionGroupSkipReadinessCest
1919
{

dev/tests/verification/Resources/ActionGroupToExtend.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupToExtend.xml<br>")
1717
*/
1818
class ActionGroupToExtendCest
1919
{

dev/tests/verification/Resources/ActionGroupUsingCreateData.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupUsingCreateData.xml<br>")
1717
*/
1818
class ActionGroupUsingCreateDataCest
1919
{

dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1313
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
16-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest.xml<br>")
16+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ActionGroupUsingNestedArgument.xml<br>")
1717
*/
1818
class ActionGroupUsingNestedArgumentCest
1919
{

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1414

1515
/**
1616
* @group functional
17-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest.xml<br>")
17+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupWithDataOverrideTest.xml<br>")
1818
*/
1919
class ActionGroupWithDataOverrideTestCest
2020
{

0 commit comments

Comments
 (0)