Merge pull request #42 from magento-thunder/MAGECLOUD-1062

MAGECLOUD-1062: Eliminate TestCase bootstrap

Author: shiftedreality

.travis.yml

@@ -21,10 +21,8 @@ cache:
   apt: true
   directories:
     - $HOME/.composer/cache
-install:
-  - composer install --no-interaction
-before_install:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS integration_tests;'
+before_install: ./tests/travis/before_install.sh
+install: composer install --no-interaction
 script:
   - if [ $TEST_SUITE == "static" ]; then phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n; fi;
   - if [ $TEST_SUITE == "static" ]; then phpmd src xml tests/static/phpmd-ruleset.xml; fi;

autoload.php

@@ -1,19 +1,22 @@
 <?php
-
-define('MAGENTO_ROOT', __DIR__ . '/../../../');
-define('BP', __DIR__);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define('ECE_BP', __DIR__);
 
 /**
- * This hack is to prevent Composer crash when
- * NonComposerComponentRegistration.php was moved from
- * app/etc during writable directories mounting.
+ * This hack is to prevent Composer crash when 'NonComposerComponentRegistration.php'
+ * was moved from app/etc during writable directories mounting.
  */
-if (!file_exists(MAGENTO_ROOT . '/app/etc/NonComposerComponentRegistration.php') &&
-    file_exists(MAGENTO_ROOT . '/init/app/etc/NonComposerComponentRegistration.php')
+$magentoRoot = __DIR__ . '/../../../';
+
+if (!file_exists($magentoRoot . '/app/etc/NonComposerComponentRegistration.php') &&
+    file_exists($magentoRoot . '/init/app/etc/NonComposerComponentRegistration.php')
 ) {
     copy(
-        MAGENTO_ROOT . '/init/app/etc/NonComposerComponentRegistration.php',
-        MAGENTO_ROOT . '/app/etc/NonComposerComponentRegistration.php'
+        $magentoRoot . '/init/app/etc/NonComposerComponentRegistration.php',
+        $magentoRoot . '/app/etc/NonComposerComponentRegistration.php'
     );
 }
 

bin/ece-tools

@@ -41,9 +41,9 @@ public function __construct(string $root, array $server)
      * @param array $server
      * @return Bootstrap
      */
-    public static function create(string $root = BP, array $server = [])
+    public static function create(string $root = ECE_BP, array $server = [])
     {
-        $server = $server + $_SERVER;
+        $server = array_replace($_SERVER, $server);
 
         return new self($root, $server);
     }

src/Magento/MagentoCloud/App/Bootstrap.php

@@ -15,7 +15,7 @@
 class Environment
 {
     const STATIC_CONTENT_DEPLOY_FLAG = '.static_content_deploy';
-    const REGENERATE_FLAG = MAGENTO_ROOT . 'var/.regenerate';
+    const REGENERATE_FLAG = 'var/.regenerate';
 
     const MAGENTO_PRODUCTION_MODE = 'production';
     const MAGENTO_DEVELOPER_MODE = 'developer';

src/Magento/MagentoCloud/Config/Environment.php

@@ -70,9 +70,11 @@ public function execute()
             $this->file->createDirectory($enterpriseFolder, 0777);
         }
 
-        $this->file->copy(
-            $magentoRoot . '/app/etc/enterprise/di.xml',
-            $magentoRoot . '/app/enterprise/di.xml'
-        );
+        if ($this->file->isExists($magentoRoot . '/app/etc/enterprise/di.xml')) {
+            $this->file->copy(
+                $magentoRoot . '/app/etc/enterprise/di.xml',
+                $magentoRoot . '/app/enterprise/di.xml'
+            );
+        }
     }
 }

src/Magento/MagentoCloud/Process/Build/MarshallFiles.php

@@ -6,6 +6,7 @@
 namespace Magento\MagentoCloud\Process\Deploy\InstallUpdate\Update;
 
 use Magento\MagentoCloud\Config\Environment;
+use Magento\MagentoCloud\Filesystem\DirectoryList;
 use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
@@ -37,16 +38,30 @@ class Setup implements ProcessInterface
      */
     private $file;
 
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @param LoggerInterface $logger
+     * @param Environment $environment
+     * @param ShellInterface $shell
+     * @param File $file
+     * @param DirectoryList $directoryList
+     */
     public function __construct(
         LoggerInterface $logger,
         Environment $environment,
         ShellInterface $shell,
-        File $file
+        File $file,
+        DirectoryList $directoryList
     ) {
         $this->logger = $logger;
         $this->environment = $environment;
         $this->shell = $shell;
         $this->file = $file;
+        $this->directoryList = $directoryList;
     }
 
     /**
@@ -83,9 +98,11 @@ public function execute()
      */
     private function removeRegenerateFlag()
     {
-        if ($this->file->isExists(Environment::REGENERATE_FLAG)) {
+        $magentoRoot = $this->directoryList->getMagentoRoot();
+
+        if ($this->file->isExists($magentoRoot . '/' . Environment::REGENERATE_FLAG)) {
             $this->logger->info('Removing .regenerate flag');
-            $this->file->deleteFile(Environment::REGENERATE_FLAG);
+            $this->file->deleteFile($magentoRoot . '/' . Environment::REGENERATE_FLAG);
         }
     }
 }

src/Magento/MagentoCloud/Process/Deploy/InstallUpdate/Update/Setup.php

@@ -6,6 +6,7 @@
 namespace Magento\MagentoCloud\Process\Deploy\PreDeploy;
 
 use Magento\MagentoCloud\Config\Environment;
+use Magento\MagentoCloud\Filesystem\DirectoryList;
 use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Util\BuildDirCopier;
@@ -33,22 +34,30 @@ class RestoreWritableDirectories implements ProcessInterface
      */
     private $environment;
 
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
     /**
      * @param LoggerInterface $logger
      * @param File $file
      * @param BuildDirCopier $buildDirCopier
      * @param Environment $environment
+     * @param DirectoryList $directoryList
      */
     public function __construct(
         LoggerInterface $logger,
         File $file,
         BuildDirCopier $buildDirCopier,
-        Environment $environment
+        Environment $environment,
+        DirectoryList $directoryList
     ) {
         $this->logger = $logger;
         $this->file = $file;
         $this->buildDirCopier = $buildDirCopier;
         $this->environment = $environment;
+        $this->directoryList = $directoryList;
     }
 
     /**
@@ -65,9 +74,11 @@ public function execute()
         // Restore mounted directories
         $this->logger->info('Recoverable directories were copied back.');
 
-        if ($this->file->isExists(Environment::REGENERATE_FLAG)) {
+        $magentoRoot = $this->directoryList->getMagentoRoot();
+
+        if ($this->file->isExists($magentoRoot . '/' . Environment::REGENERATE_FLAG)) {
             $this->logger->info('Removing var/.regenerate flag');
-            $this->file->deleteFile(Environment::REGENERATE_FLAG);
+            $this->file->deleteFile($magentoRoot . '/' . Environment::REGENERATE_FLAG);
         }
     }
 }

src/Magento/MagentoCloud/Process/Deploy/PreDeploy/RestoreWritableDirectories.php

@@ -8,20 +8,50 @@
 use Magento\MagentoCloud\Command\Build;
 use Magento\MagentoCloud\Command\Deploy;
 use Magento\MagentoCloud\Config\Environment;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @inheritdoc
  */
 class AcceptanceTest extends TestCase
 {
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        shell_exec(sprintf(
+            "cp -f %s %s",
+            Bootstrap::create()->getConfigFile('config.php'),
+            Bootstrap::create()->getSandboxDir() . '/app/etc/config.php'
+        ));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $sandboxDir = Bootstrap::create()->getSandboxDir();
+
+        shell_exec(sprintf(
+            "cd %s && php bin/magento setup:uninstall -n",
+            $sandboxDir
+        ));
+        shell_exec(sprintf(
+            "cd %s && rm -rf init",
+            $sandboxDir
+        ));
+    }
+
     /**
      * @param array $environment
      * @dataProvider dataProvider
      */
     public function test(array $environment)
     {
-        $application = $this->createApplication($environment);
+        $application = Bootstrap::create()->createApplication($environment);
 
         $commandTester = new CommandTester(
             $application->get(Build::NAME)
@@ -47,10 +77,11 @@ public function dataProvider(): array
             'default configuration' => [
                 'environment' => [],
             ],
-            'disabled static content symlinks ' => [
+            'disabled static content symlinks 3 jobs' => [
                 'environment' => [
                     'variables' => [
                         'STATIC_CONTENT_SYMLINK' => Environment::VAL_DISABLED,
+                        'STATIC_CONTENT_THREADS' => 3,
                     ],
                 ],
             ],