Skip to content

Commit 3c5fea1

Browse files
author
Ivan Gavryshko
committed
MAGETWO-50790: Remove Updater Injection from CE unit and integration tests bootstrap
- removed Updater tests injection from unit and integration tests
1 parent bc54a51 commit 3c5fea1

File tree

4 files changed

+0
-15
lines changed

4 files changed

+0
-15
lines changed

dev/tests/integration/framework/bootstrap.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
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-
1611
$testsBaseDir = dirname(__DIR__);
1712
$fixtureBaseDir = $testsBaseDir. '/testsuite';
1813

dev/tests/integration/phpunit.xml.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
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>
2221
<exclude>testsuite/Magento/Test/Integrity</exclude>
2322
<exclude>testsuite/Magento/MemoryUsageTest.php</exclude>
2423
</testsuite>
@@ -28,13 +27,11 @@
2827
<whitelist addUncoveredFilesFromWhiteList="true">
2928
<directory suffix=".php">../../../app/code/Magento</directory>
3029
<directory suffix=".php">../../../lib/internal/Magento</directory>
31-
<directory suffix=".php">../../../update/app/code</directory>
3230
<exclude>
3331
<directory>../../../app/code/*/*/Test</directory>
3432
<directory>../../../lib/internal/*/*/Test</directory>
3533
<directory>../../../lib/internal/*/*/*/Test</directory>
3634
<directory>../../../setup/src/*/*/Test</directory>
37-
<directory>../../../update/app/code/*/*/Test</directory>
3835
</exclude>
3936
</whitelist>
4037
</filter>

dev/tests/unit/framework/bootstrap.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
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-
149
if (!defined('TESTS_TEMP_DIR')) {
1510
define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
1611
}

dev/tests/unit/phpunit.xml.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@
3131
<directory suffix=".php">../../../app/code/*</directory>
3232
<directory suffix=".php">../../../lib/internal/Magento</directory>
3333
<directory suffix=".php">../../../setup/src/*</directory>
34-
<directory suffix=".php">../../../update/app/code/*</directory>
3534
<exclude>
3635
<directory>../../../app/code/*/*/Test</directory>
3736
<directory>../../../lib/internal/*/*/Test</directory>
3837
<directory>../../../lib/internal/*/*/*/Test</directory>
3938
<directory>../../../setup/src/*/*/Test</directory>
40-
<directory>../../../update/app/code/*/*/Test</directory>
4139
</exclude>
4240
</whitelist>
4341
</filter>

0 commit comments

Comments
 (0)