MAGETWO-51544: [Github] Cannot upgrade to Magento 2.0.4 #4013

- Code updates based on review comments
- Updates to fix failing unit tests

Author: ark99

setup/src/Magento/Setup/Model/PathBuilder.php

@@ -12,9 +12,7 @@
  */
 class PathBuilder
 {
-    const MAGENTO_BASE_PACKAGE_RELATIVE_PATH = 'magento/magento2-base';
-
-    const COMPOSER_JSON_FILE_NAME = 'composer.json';
+    const MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE = 'magento/magento2-base/composer.json';
 
     const COMPOSER_KEY_EXTRA = 'extra';
 
@@ -52,18 +50,10 @@ public function build()
         $vendorPath = $this->directoryList->getPath(DirectoryList::CONFIG) . '/' . self::VENDOR_PATH_FILE;
         $vendorDir = require "{$vendorPath}";
 
-        $basePackageComposerFilePath =
-            $vendorDir
-            . '/'
-            . self::MAGENTO_BASE_PACKAGE_RELATIVE_PATH
-            . '/' . self::COMPOSER_JSON_FILE_NAME;
+        $basePackageComposerFilePath = $vendorDir . '/' . self::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE;
         if (!file_exists($basePackageComposerFilePath)) {
             throw new \Magento\Setup\Exception(
-                'Could not locate '
-                . self::MAGENTO_BASE_PACKAGE_RELATIVE_PATH
-                . ' '
-                . self::COMPOSER_JSON_FILE_NAME
-                . ' file.'
+                'Could not locate ' . self::MAGENTO_BASE_PACKAGE_COMPOSER_JSON_FILE . ' file.'
             );
         }
         $composerJsonFileData = json_decode(file_get_contents($basePackageComposerFilePath), true);

setup/src/Magento/Setup/Test/Unit/Model/Cron/ReadinessCheckTest.php

@@ -69,6 +69,7 @@ public function setUp()
         $this->filesystem->expects($this->once())->method('getDirectoryWrite')->willReturn($this->write);
         $this->phpReadinessCheck = $this->getMock('Magento\Setup\Model\PhpReadinessCheck', [], [], '', false);
         $this->pathBuilder = $this->getMock('Magento\Setup\Model\PathBuilder', [], [], '', false);
+        $this->pathBuilder->expects($this->once())->method('build')->willReturn([__FILE__]);
         $this->readinessCheck = new ReadinessCheck(
             $this->dbValidator,
             $this->deploymentConfig,
@@ -100,6 +101,10 @@ public function testRunReadinessCheckNoDbAccess()
                 'error' => 'Connection failure'
             ],
             ReadinessCheck::KEY_PHP_CHECKS => $this->expected,
+            ReadinessCheck::KEY_DIR_AND_FILE_PATHS => [
+                ReadinessCheck::KEY_LIST => [__FILE__],
+                ReadinessCheck::KEY_ERROR => ""
+            ],
             ReadinessCheck::KEY_CURRENT_TIMESTAMP => 100
         ];
         $expectedJson = json_encode($expected, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
@@ -122,6 +127,10 @@ public function testRunReadinessCheckNoDbWriteAccess()
                 'error' => 'Database user username does not have write access.'
             ],
             ReadinessCheck::KEY_PHP_CHECKS => $this->expected,
+            ReadinessCheck::KEY_DIR_AND_FILE_PATHS => [
+                ReadinessCheck::KEY_LIST => [__FILE__],
+                ReadinessCheck::KEY_ERROR => ""
+            ],
             ReadinessCheck::KEY_CURRENT_TIMESTAMP => 100
         ];
         $expectedJson = json_encode($expected, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
@@ -139,6 +148,10 @@ public function testRunReadinessCheck()
         $expected = [
             ReadinessCheck::KEY_READINESS_CHECKS => [ReadinessCheck::KEY_DB_WRITE_PERMISSION_VERIFIED => true],
             ReadinessCheck::KEY_PHP_CHECKS => $this->expected,
+            ReadinessCheck::KEY_DIR_AND_FILE_PATHS => [
+                ReadinessCheck::KEY_LIST => [__FILE__],
+                ReadinessCheck::KEY_ERROR => ""
+            ],
             ReadinessCheck::KEY_CURRENT_TIMESTAMP => 100
         ];
         $expectedJson = json_encode($expected, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
@@ -156,6 +169,10 @@ public function testRunReadinessCheckLastTimestamp()
         $expected = [
             ReadinessCheck::KEY_READINESS_CHECKS => [ReadinessCheck::KEY_DB_WRITE_PERMISSION_VERIFIED => true],
             ReadinessCheck::KEY_PHP_CHECKS => $this->expected,
+            ReadinessCheck::KEY_DIR_AND_FILE_PATHS => [
+                ReadinessCheck::KEY_LIST => [__FILE__],
+                ReadinessCheck::KEY_ERROR => ""
+            ],
             ReadinessCheck::KEY_LAST_TIMESTAMP => 50,
             ReadinessCheck::KEY_CURRENT_TIMESTAMP => 100,
         ];