Removed duplicated BDD tests.

Author: AlexSkrypnyk

.vortex/installer/composer.json

@@ -18,7 +18,7 @@
     },
     "require": {
         "php": ">=8.2",
-        "alexskrypnyk/file": "^0.10",
+        "alexskrypnyk/file": "^0.11",
         "alexskrypnyk/str2name": "^1.4",
         "composer/composer": "^2.8",
         "cweagans/composer-patches": "^1.7",

.vortex/installer/composer.lock

@@ -12,7 +12,7 @@
         "php": ">=8.2"
     },
     "require-dev": {
-        "alexskrypnyk/file": "dev-main",
+        "alexskrypnyk/file": "^0.11.0",
         "alexskrypnyk/phpunit-helpers": "^0.10",
         "alexskrypnyk/shellvar": "^1.2",
         "czproject/git-php": "^4.4",

.vortex/tests/composer.json

@@ -8,23 +8,30 @@
 use AlexSkrypnyk\PhpunitHelpers\Traits\AssertArrayTrait;
 use AlexSkrypnyk\PhpunitHelpers\Traits\EnvTrait;
 use AlexSkrypnyk\PhpunitHelpers\Traits\LocationsTrait;
+use AlexSkrypnyk\PhpunitHelpers\Traits\LoggerTrait;
 use AlexSkrypnyk\PhpunitHelpers\Traits\ProcessTrait;
 use AlexSkrypnyk\PhpunitHelpers\UnitTestCase;
 use DrevOps\Vortex\Tests\Traits\AssertProjectFilesTrait;
 use DrevOps\Vortex\Tests\Traits\GitTrait;
-use AlexSkrypnyk\PhpunitHelpers\Traits\LoggerTrait;
 use DrevOps\Vortex\Tests\Traits\Steps\StepBuildTrait;
-use DrevOps\Vortex\Tests\Traits\Steps\StepDownloadDbTrait;
+use DrevOps\Vortex\Tests\Traits\Steps\StepDatabaseTrait;
 use DrevOps\Vortex\Tests\Traits\Steps\StepPrepareSutTrait;
-use DrevOps\Vortex\Tests\Traits\Steps\StepTestBddAllTrait;
-use DrevOps\Vortex\Tests\Traits\Steps\StepTestBddTrait;
+use DrevOps\Vortex\Tests\Traits\Steps\StepTestTrait;
 use Symfony\Component\Process\Process;
 
 /**
  * Base class for functional tests.
  */
 class FunctionalTestCase extends UnitTestCase {
 
+  /**
+   * URL to the test demo database.
+   *
+   * Tests use demo database and 'ahoy download-db' command, so we need
+   * to set the CURL DB to test DB.
+   */
+  const VORTEX_INSTALLER_DEMO_DB_TEST = 'https://github.com/drevops/vortex/releases/download/25.4.0/db_d11_2.test.sql';
+
   use AssertArrayTrait;
   use AssertProjectFilesTrait;
   use EnvTrait;
@@ -35,10 +42,9 @@ class FunctionalTestCase extends UnitTestCase {
     ProcessTrait::processRun as traitProcessRun;
   }
   use StepBuildTrait;
-  use StepDownloadDbTrait;
   use StepPrepareSutTrait;
-  use StepTestBddAllTrait;
-  use StepTestBddTrait;
+  use StepTestTrait;
+  use StepDatabaseTrait;
 
   protected function setUp(): void {
     self::locationsInit(File::cwd() . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
@@ -165,4 +171,70 @@ public function volumesMounted(): bool {
     return getenv('VORTEX_DEV_VOLUMES_SKIP_MOUNT') != 1;
   }
 
+  protected function trimFile(string $file): void {
+    $content = File::read($file);
+    $lines = explode("\n", $content);
+    // Remove last line.
+    array_pop($lines);
+    File::dump($file, implode("\n", $lines));
+  }
+
+  protected function stepWarmCaches(): void {
+    $this->logSubstep('Warming up caches');
+    $this->cmd('ahoy drush cr');
+    $this->cmd('ahoy cli curl -- -sSL -o /dev/null -w "%{http_code}" http://nginx:8080 | grep -q 200');
+  }
+
+  protected function addVarToFile(string $file, string $var, string $value): void {
+    // Backup original file first.
+    $this->backupFile($file);
+    $content = File::read($file);
+    $content .= sprintf('%s%s=%s%s', PHP_EOL, $var, $value, PHP_EOL);
+    File::dump($file, $content);
+  }
+
+  protected function backupFile(string $file): void {
+    $backup_dir = '/tmp/bkp';
+    if (!is_dir($backup_dir)) {
+      mkdir($backup_dir, 0755, TRUE);
+    }
+    File::copy($file, $backup_dir . '/' . basename($file));
+  }
+
+  protected function restoreFile(string $file): void {
+    $backup_file = '/tmp/bkp/' . basename($file);
+    if (file_exists($backup_file)) {
+      File::copy($backup_file, $file);
+    }
+  }
+
+  protected function createDevelopmentSettings(string $webroot = 'web'): void {
+    File::copy($webroot . '/sites/default/example.settings.local.php', $webroot . '/sites/default/settings.local.php');
+    // Assert manually created local settings file exists.
+    $this->assertFileExists($webroot . '/sites/default/settings.local.php');
+
+    File::copy($webroot . '/sites/default/example.services.local.yml', $webroot . '/sites/default/services.local.yml');
+    // Assert manually created local services file exists.
+    $this->assertFileExists($webroot . '/sites/default/services.local.yml');
+  }
+
+  protected function removeDevelopmentSettings(string $webroot = 'web'): void {
+    File::remove([
+      $webroot . '/sites/default/settings.local.php',
+      $webroot . '/sites/default/services.local.yml',
+    ]);
+    $this->assertFileDoesNotExist($webroot . '/sites/default/settings.local.php');
+    $this->assertFileDoesNotExist($webroot . '/sites/default/services.local.yml');
+  }
+
+  protected function assertFilesPresent(string $webroot): void {
+    // Use existing method from base class with correct signature.
+    $this->assertCommonFilesPresent($webroot);
+  }
+
+  protected function assertGitRepo(): void {
+    // @todp Use gitAssertIsRepository().
+    $this->assertDirectoryExists('.git');
+  }
+
 }

.vortex/tests/composer.lock

@@ -9,7 +9,8 @@
 use DrevOps\Vortex\Tests\Traits\Steps\StepEnvironmentTrait;
 use DrevOps\Vortex\Tests\Traits\Steps\StepFrontendTrait;
 use DrevOps\Vortex\Tests\Traits\Steps\StepServicesTrait;
-use DrevOps\Vortex\Tests\Traits\Steps\StepTestingTrait;
+use DrevOps\Vortex\Tests\Traits\Steps\StepTestTrait;
+use DrevOps\Vortex\Tests\Traits\Steps\StepLintTrait;
 
 /**
  * Tests DB-driven workflow.
@@ -20,8 +21,9 @@ class WorkflowInstallDbTest extends FunctionalTestCase {
   use StepDatabaseTrait;
   use StepEnvironmentTrait;
   use StepFrontendTrait;
+  use StepLintTrait;
   use StepServicesTrait;
-  use StepTestingTrait;
+  use StepTestTrait;
 
   protected function setUp(): void {
     parent::setUp();

.vortex/tests/phpunit/Functional/FunctionalTestCase.php

@@ -34,14 +34,14 @@ public function testIdempotence(): void {
     $this->stepBuild();
     $this->assertFilesTrackedInGit();
 
-    $this->stepTestBdd();
+    $this->stepAhoyTestBddFast();
 
     $this->logSubstep('Re-build project to check that the results are identical.');
     $this->stepBuild();
     $this->assertFilesTrackedInGit(skip_commit: TRUE);
 
     $this->logSubstep('Run BDD tests again on re-built project');
-    $this->stepTestBdd();
+    $this->stepAhoyTestBddFast();
   }
 
   /**
@@ -101,7 +101,7 @@ public function testDockerComposeNoAhoy(): void {
 
     $this->assertFilesTrackedInGit();
 
-    $this->stepTestBdd();
+    $this->stepAhoyTestBdd();
   }
 
 }

.vortex/tests/phpunit/Functional/WorkflowInstallDbTest.php

@@ -11,6 +11,22 @@
  */
 trait StepDatabaseTrait {
 
+  protected function stepDownloadDb(): void {
+    $this->logStepStart();
+
+    File::remove('.data/db.sql');
+    $this->assertFileDoesNotExist('.data/db.sql', 'File .data/db.sql should not exist before downloading the database.');
+
+    $this->logSubstep('Downloading demo database from ' . static::VORTEX_INSTALLER_DEMO_DB_TEST);
+    $this->cmd('ahoy download-db', env: [
+      'VORTEX_DB_DOWNLOAD_URL' => static::VORTEX_INSTALLER_DEMO_DB_TEST,
+    ]);
+
+    $this->assertFileExists('.data/db.sql', 'File .data/db.sql should exist after downloading the database.');
+
+    $this->logStepFinish();
+  }
+
   protected function stepAhoyExportDb(string $filename = ''): void {
     $this->logStepStart();