Merging develop into main

src/Handler.php

@@ -256,11 +256,8 @@ class Handler extends BaseHandler {
 
   /**
    * Configure Drupal Project for Docker.
-   *
-   * @param bool $overwrite
-   *   Whether to overwrite existing config files.
    */
-  public function configureProject(bool $overwrite = FALSE): void {
+  public function configureProject(): void {
 
     // We only do the fancy stuff for developers.
     if (!$this->isDevMode()) {
@@ -387,7 +384,7 @@ class Handler extends BaseHandler {
         }
         continue;
       }
-      if (($overwrite && empty($def['add2git'])) || !$fs->exists($file)) {
+      if (empty($def['add2git']) || !$fs->exists($file)) {
         $source = isset($def['source']) && is_file($pluginRoot . '/templates/' . $def['source']) ?
           $pluginRoot . '/templates/' . $def['source'] :
           $pluginRoot . '/templates/' . ($def['source'] ?? '') . $template . '.twig';
@@ -454,6 +451,11 @@ class Handler extends BaseHandler {
     $this->gitIgnore('tests/backstop/backstop_data/html_report');
     $this->gitLFS('tests/backstop/**/*.png');
 
+    // Ignore some Cypress directories
+    $this->gitIgnore('tests/cypress/downloads');
+    $this->gitIgnore('tests/cypress/screenshots');
+    $this->gitIgnore('tests/cypress/videos');
+
     if (getenv('LAKEDROPS_BUILD_NG') !== 'yes') {
       $this->updateTraefik();
     }
@@ -561,23 +563,27 @@ class Handler extends BaseHandler {
         'dest' => $projectRoot . '/tests',
       ],
     ];
-    if ($this->config->readValue(['cypress', 'enable'])) {
-      $files['cypress.config.js'] = [
-        'source' => 'tests/',
-        'dest' => $projectRoot . '/tests',
-        'add2git' => TRUE,
-      ];
-      $files['commands.js'] = [
-        'source' => 'tests/cypress/support/',
-        'dest' => $projectRoot . '/tests/cypress/support',
-        'add2git' => TRUE,
-      ];
-      $files['e2e.js'] = [
-        'source' => 'tests/cypress/support/',
-        'dest' => $projectRoot . '/tests/cypress/support',
-        'add2git' => TRUE,
-      ];
-    }
+    $files['cypress.config.js'] = [
+      'source' => 'tests/',
+      'dest' => $projectRoot . '/tests',
+      'add2git' => TRUE,
+    ];
+    $files['cypress-run'] = [
+      'source' => 'tests/',
+      'dest' => $projectRoot . '/tests',
+      'add2git' => FALSE,
+      'mode' => 0775,
+    ];
+    $files['commands.js'] = [
+      'source' => 'tests/cypress/support/',
+      'dest' => $projectRoot . '/tests/cypress/support',
+      'add2git' => TRUE,
+    ];
+    $files['e2e.js'] = [
+      'source' => 'tests/cypress/support/',
+      'dest' => $projectRoot . '/tests/cypress/support',
+      'add2git' => TRUE,
+    ];
     if (getenv('LAKEDROPS_BUILD_NG') === 'yes') {
       if ($this->config->readValue(['backup', 'enable'])) {
         $files['config.yaml'] = [