Skip to content

Commit b04892b

Browse files
committed
Merge branch 'develop' into MQE-812
2 parents c9fbac0 + 097ebe8 commit b04892b

Some content is hidden

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

41 files changed

+1067
-92
lines changed

composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
"squizlabs/php_codesniffer": "1.5.3",
2525
"sebastian/phpcpd": "~3.0",
2626
"brainmaestro/composer-git-hooks": "^2.3",
27-
"codeception/aspect-mock": "^2.0",
28-
"goaop/framework": "2.1.2",
27+
"doctrine/cache": "<1.7.0",
28+
"codeception/aspect-mock": "^3.0",
29+
"goaop/framework": "2.2.0",
2930
"codacy/coverage": "^1.4",
3031
"phpmd/phpmd": "^2.6.0",
3132
"rregeer/phpunit-coverage-check": "^0.1.4",

composer.lock

+99-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/.cache/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore

dev/tests/_bootstrap.php

+29-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
$kernel = \AspectMock\Kernel::getInstance();
1414
$kernel->init([
1515
'debug' => true,
16-
'includePaths' => [PROJECT_ROOT . '/src']
16+
'includePaths' => [PROJECT_ROOT . '/src'],
17+
'cacheDir' => PROJECT_ROOT .
18+
DIRECTORY_SEPARATOR .
19+
'dev' .
20+
DIRECTORY_SEPARATOR .
21+
'tests' .
22+
DIRECTORY_SEPARATOR .
23+
'.cache'
1724
]);
1825

1926
// set mftf appplication context
@@ -62,6 +69,27 @@
6269
require($unitUtilFile);
6370
}
6471

72+
73+
// Mocks suite files location getter return to get files in verification/_suite Directory
74+
// This mocks the paths of the suite files but still parses the xml files
75+
$suiteDirectory = TESTS_BP . DIRECTORY_SEPARATOR . "verification" . DIRECTORY_SEPARATOR . "_suite";
76+
77+
$paths = [
78+
$suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuite.xml',
79+
$suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml'
80+
];
81+
82+
// create and return the iterator for these file paths
83+
$iterator = new Magento\FunctionalTestingFramework\Util\Iterator\File($paths);
84+
try {
85+
AspectMock\Test::double(
86+
Magento\FunctionalTestingFramework\Config\FileResolver\Root::class,
87+
['get' => $iterator]
88+
)->make();
89+
} catch (Exception $e) {
90+
echo "Suite directory not mocked.";
91+
}
92+
6593
function sortInterfaces($files)
6694
{
6795
$bottom = [];

0 commit comments

Comments
 (0)