Skip to content

Commit dbe003d

Browse files
committed
MAGETWO-36638: Update the CICD builds
- added updater app bootstrap to magento test framework
1 parent 385f475 commit dbe003d

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed

dev/tests/integration/framework/bootstrap.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
require_once __DIR__ . '/../../../../app/bootstrap.php';
99
require_once __DIR__ . '/autoload.php';
1010

11+
$updateAppBootstrap = __DIR__ . '/../../../../update/app/bootstrap.php';
12+
if (file_exists($updateAppBootstrap)) {
13+
require_once $updateAppBootstrap;
14+
}
15+
1116
$testsBaseDir = dirname(__DIR__);
1217
$testsTmpDir = "{$testsBaseDir}/tmp";
1318
$magentoBaseDir = realpath("{$testsBaseDir}/../../../");

dev/tests/integration/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</testsuite>
1919
<testsuite name="Magento Integration Tests">
2020
<directory suffix="Test.php">testsuite</directory>
21+
<directory suffix="Test.php">../../../update/dev/tests/integration/testsuite</directory>
2122
<exclude>testsuite/Magento/Test/Integrity</exclude>
2223
<exclude>testsuite/Magento/MemoryUsageTest.php</exclude>
2324
</testsuite>
@@ -27,6 +28,7 @@
2728
<whitelist addUncoveredFilesFromWhiteList="true">
2829
<directory suffix=".php">../../../app/code/Magento</directory>
2930
<directory suffix=".php">../../../lib/internal/Magento</directory>
31+
<directory suffix=".php">../../../update/app/code</directory>
3032
</whitelist>
3133
</filter>
3234
<!-- PHP INI settings and constants definition -->

dev/tests/unit/framework/bootstrap.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
require_once __DIR__ . '/../../../../app/autoload.php';
88

9+
$updateAppBootstrap = __DIR__ . '/../../../../update/app/bootstrap.php';
10+
if (file_exists($updateAppBootstrap)) {
11+
require_once $updateAppBootstrap;
12+
}
13+
914
if (!defined('TESTS_TEMP_DIR')) {
1015
define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
1116
}

dev/tests/unit/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
1818
<directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
1919
<directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>
20+
<directory suffix="Test.php">../../../update/dev/tests/unit/testsuite</directory>
2021
</testsuite>
2122
<php>
2223
<ini name="date.timezone" value="America/Los_Angeles"/>
@@ -26,6 +27,7 @@
2627
<directory suffix=".php">../../../app/code/*</directory>
2728
<directory suffix=".php">../../../lib/internal/Magento</directory>
2829
<directory suffix=".php">../../../setup/src/*</directory>
30+
<directory suffix=".php">../../../update/app/code/*</directory>
2931
<exclude>
3032
<directory>../../../app/code/*/*/Test</directory>
3133
<directory>../../../lib/internal/*/*/Test</directory>

0 commit comments

Comments
 (0)