Merge pull request #484 from magento-ogre/MAGETWO-50849-PR

[Ogres] [2.0] Magetwo 50849 pr

Author: Korshenko, Oleksii(okorshenko)

dev/tests/integration/framework/bootstrap.php

@@ -8,11 +8,6 @@
 require_once __DIR__ . '/../../../../app/bootstrap.php';
 require_once __DIR__ . '/autoload.php';
 
-$updateAppBootstrap = __DIR__ . '/../../../../update/app/bootstrap.php';
-if (file_exists($updateAppBootstrap)) {
-    require_once $updateAppBootstrap;
-}
-
 $testsBaseDir = dirname(__DIR__);
 $fixtureBaseDir = $testsBaseDir. '/testsuite';
 

dev/tests/integration/phpunit.xml.dist

@@ -18,7 +18,6 @@
         </testsuite>
         <testsuite name="Magento Integration Tests">
             <directory suffix="Test.php">testsuite</directory>
-            <directory suffix="Test.php">../../../update/dev/tests/integration/testsuite</directory>
             <exclude>testsuite/Magento/Test/Integrity</exclude>
             <exclude>testsuite/Magento/MemoryUsageTest.php</exclude>
         </testsuite>
@@ -28,13 +27,11 @@
         <whitelist addUncoveredFilesFromWhiteList="true">
             <directory suffix=".php">../../../app/code/Magento</directory>
             <directory suffix=".php">../../../lib/internal/Magento</directory>
-            <directory suffix=".php">../../../update/app/code</directory>
             <exclude>
                 <directory>../../../app/code/*/*/Test</directory>
                 <directory>../../../lib/internal/*/*/Test</directory>
                 <directory>../../../lib/internal/*/*/*/Test</directory>
                 <directory>../../../setup/src/*/*/Test</directory>
-                <directory>../../../update/app/code/*/*/Test</directory>
             </exclude>
         </whitelist>
     </filter>

dev/tests/unit/framework/bootstrap.php

@@ -6,11 +6,6 @@
 
 require_once __DIR__ . '/../../../../app/autoload.php';
 
-$updateAppBootstrap = __DIR__ . '/../../../../update/app/bootstrap.php';
-if (file_exists($updateAppBootstrap)) {
-    require_once $updateAppBootstrap;
-}
-
 if (!defined('TESTS_TEMP_DIR')) {
     define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
 }

dev/tests/unit/phpunit.xml.dist

@@ -17,7 +17,6 @@
         <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../update/app/code/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../vendor/*/module-*/Test/Unit</directory>
         <directory suffix="Test.php">../../../vendor/*/framework/Test/Unit</directory>
         <directory suffix="Test.php">../../../vendor/*/framework/*/Test/Unit</directory>
@@ -31,13 +30,11 @@
             <directory suffix=".php">../../../app/code/*</directory>
             <directory suffix=".php">../../../lib/internal/Magento</directory>
             <directory suffix=".php">../../../setup/src/*</directory>
-            <directory suffix=".php">../../../update/app/code/*</directory>
             <exclude>
                 <directory>../../../app/code/*/*/Test</directory>
                 <directory>../../../lib/internal/*/*/Test</directory>
                 <directory>../../../lib/internal/*/*/*/Test</directory>
                 <directory>../../../setup/src/*/*/Test</directory>
-                <directory>../../../update/app/code/*/*/Test</directory>
             </exclude>
         </whitelist>
     </filter>