MCLOUD-6604: Fix Red FT (magento#765)

Author: BaDos

.travis.yml

@@ -15,10 +15,10 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 env:
   - TEST_SUITE=functional-ce
-  - TEST_SUITE=functional-ee
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=1
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=2
   - TEST_SUITE=functional-ee FUNCTIONAL_INDEX=3
@@ -32,30 +32,24 @@ stages:
 jobs:
   exclude:
     - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=1
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=2
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=3
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=4
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=5
-    - php: '7.1'
-      env: TEST_SUITE=functional-ee FUNCTIONAL_INDEX=6
+      env: TEST_SUITE=functional-ee
 
     - php: '7.2'
       env: TEST_SUITE=functional-ee
 
     - php: '7.3'
       env: TEST_SUITE=functional-ee
 
+    - php: '7.4'
+      env: TEST_SUITE=functional-ee
+
 install:
   - composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
   - composer config github-oauth.github.com ${GITHUB_TOKEN}
   - if [ -n "${MCC_VERSION}" ]; then composer config repositories.mcc git [email protected]:magento/magento-cloud-components.git && composer require "magento/magento-cloud-components:${MCC_VERSION}" --no-update; fi;
   - if [ -n "${MCD_VERSION}" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; fi;
   - if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git [email protected]:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
+  - if [ -n "${MQP_VERSION}" ]; then composer config repositories.mqp git [email protected]:magento/quality-patches.git && composer require "magento/quality-patches:${MQP_VERSION}" --no-update; fi;
   - composer update -n --no-suggest
 
 before_script:

codeception.dist.yml

@@ -20,6 +20,7 @@ modules:
       mcd_repo: "https://github.com/magento/magento-cloud-docker.git"
       mcc_repo: "https://github.com/magento/magento-cloud-components.git"
       mcp_repo: "https://github.com/magento/magento-cloud-patches.git"
+      mqp_repo: "https://github.com/magento/quality-patches.git"
       composer_magento_username: "%REPO_USERNAME%"
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"

src/Test/Functional/Acceptance/AbstractCest.php

@@ -18,6 +18,11 @@ abstract class AbstractCest
      */
     protected $removeEs = true;
 
+    /**
+     * @var boolean
+     */
+    protected $runComposerUpdate = true;
+
     /**
      * @var string
      */
@@ -51,12 +56,12 @@ protected function convertEnvFromArrayToJson(array $data): string
 
     /**
      * @param \CliTester $I
-     * @param string $version
+     * @param string $templateVersion
      */
-    protected function prepareWorkplace(\CliTester $I, string $version): void
+    protected function prepareWorkplace(\CliTester $I, string $templateVersion): void
     {
         $I->cleanupWorkDir();
-        $I->cloneTemplateToWorkDir($version);
+        $I->cloneTemplateToWorkDir($templateVersion);
         $I->createAuthJson();
         $I->createArtifactsDir();
         $I->createArtifactCurrentTestedCode('ece-tools', '2002.1.99');
@@ -65,6 +70,7 @@ protected function prepareWorkplace(\CliTester $I, string $version): void
         $I->addEceDockerGitRepoToComposer();
         $I->addCloudComponentsGitRepoToComposer();
         $I->addCloudPatchesGitRepoToComposer();
+        $I->addQualityPatchesGitRepoToComposer();
         $I->addDependencyToComposer(
             'magento/magento-cloud-docker',
             $I->getDependencyVersion('magento/magento-cloud-docker')
@@ -77,16 +83,40 @@ protected function prepareWorkplace(\CliTester $I, string $version): void
             'magento/magento-cloud-patches',
             $I->getDependencyVersion('magento/magento-cloud-patches')
         );
-        $I->composerUpdate();
-        $this->removeESIfExists($I);
+        $I->addDependencyToComposer(
+            'magento/quality-patches',
+            $I->getDependencyVersion('magento/quality-patches')
+        );
+
+        if ($this->runComposerUpdate) {
+            $I->composerUpdate();
+        }
+
+        $this->removeESIfExists($I, $templateVersion);
+    }
+
+    /**
+     * Checks if we can remove ES configuration for tests.
+     *
+     * @param string $templateVersion
+     * @return bool
+     */
+    protected function canESbeRemoved(string $templateVersion): bool
+    {
+        if ($templateVersion === 'master') {
+            return false;
+        }
+
+        return (bool)version_compare($templateVersion, '2.4.0', '<');
     }
 
     /**
      * @param \CliTester $I
+     * @param string $templateVersion
      */
-    protected function removeESIfExists(\CliTester $I): void
+    protected function removeESIfExists(\CliTester $I, string $templateVersion): void
     {
-        if ($this->removeEs) {
+        if ($this->removeEs && $this->canESbeRemoved($templateVersion)) {
             $services = $I->readServicesYaml();
 
             if (isset($services['elasticsearch'])) {

src/Test/Functional/Acceptance/AcceptanceCe71Cest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MagentoCloud\Test\Functional\Acceptance;
+
+use Magento\CloudDocker\Test\Functional\Codeception\Docker;
+use Robo\Exception\TaskException;
+use CliTester;
+
+/**
+ * @inheritDoc
+ *
+ * @group php71
+ * @group edition-ce
+ */
+class AcceptanceCe71Cest extends AcceptanceCeCest
+{
+    /**
+     * @var string
+     */
+    protected $magentoCloudTemplate = '2.1.17';
+}

src/Test/Functional/Acceptance/AcceptanceCe72Cest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MagentoCloud\Test\Functional\Acceptance;
+
+use Magento\CloudDocker\Test\Functional\Codeception\Docker;
+use Robo\Exception\TaskException;
+use CliTester;
+
+/**
+ * @inheritDoc
+ *
+ * @group php72
+ * @group edition-ce
+ */
+class AcceptanceCe72Cest extends AcceptanceCeCest
+{
+    /**
+     * @var string
+     */
+    protected $magentoCloudTemplate = '2.3.2';
+}

src/Test/Functional/Acceptance/AcceptanceCe73Cest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MagentoCloud\Test\Functional\Acceptance;
+
+use Magento\CloudDocker\Test\Functional\Codeception\Docker;
+use Robo\Exception\TaskException;
+use CliTester;
+
+/**
+ * @inheritDoc
+ *
+ * @group php73
+ * @group edition-ce
+ */
+class AcceptanceCe73Cest extends AcceptanceCeCest
+{
+    /**
+     * @var string
+     */
+    protected $magentoCloudTemplate = '2.3.5';
+}

src/Test/Functional/Acceptance/AcceptanceCeCest.php

@@ -14,16 +14,25 @@
 /**
  * @inheritDoc
  *
+ * @group php74
  * @group edition-ce
  */
 class AcceptanceCeCest extends AbstractCest
 {
+    /**
+     * @var boolean
+     */
+    protected $runComposerUpdate = false;
+
     public function _before(\CliTester $I): void
     {
         parent::_before($I);
 
         $I->removeDependencyFromComposer('magento/magento-cloud-metapackage');
-        $I->addDependencyToComposer('magento/product-community-edition', '@stable');
+        $I->addDependencyToComposer(
+            'magento/product-community-edition',
+            $this->magentoCloudTemplate === 'master' ? '@stable' : $this->magentoCloudTemplate
+        );
         $I->composerUpdate();
     }
 

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -20,6 +20,8 @@
  * 2. Test content presence
  * 3. Test config dump
  * 4. Test content presence
+ *
+ * @group php74
  */
 class AcceptanceCest extends AbstractCest
 {

src/Test/Functional/Acceptance/AdminCredential22Cest.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MagentoCloud\Test\Functional\Acceptance;
+
+/**
+ * @group php71
+ */
+class AdminCredential22Cest extends AdminCredentialCest
+{
+    /**
+     * @var string
+     */
+    protected $magentoCloudTemplate = '2.2.11';
+}

src/Test/Functional/Acceptance/AdminCredential23Cest.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MagentoCloud\Test\Functional\Acceptance;
+
+/**
+ * @group php73
+ */
+class AdminCredential23Cest extends AdminCredentialCest
+{
+    /**
+     * @var string
+     */
+    protected $magentoCloudTemplate = '2.3.5';
+}