CI: Fix flushVisibleEntries Acceptance Test (#1044)

.devbox/.ddev/config.yaml

@@ -26,6 +26,7 @@ hooks:
     - exec: /var/www/html/bin/typo3 cache:flush
     - exec: /var/www/html/bin/typo3 cache:warmup
     - exec: /var/www/html/bin/typo3 backend:unlock
+    - exec: mkdir -p /var/www/html/var/lock
 omit_containers: [ dba, ddev-ssh-agent ]
 webimage_extra_packages: [ cron ]
 use_dns_when_possible: true

.devbox/.ddev/docker-compose.selenium.yaml

@@ -1,6 +1,3 @@
-# To execute this docker-compose yml file use `docker-compose -f docker-compose-v3-beta-channel.yml up`
-# Add the `-d` flag at the end for detached execution
-# To stop the execution, hit Ctrl+C, and then `docker-compose -f docker-compose-v3-beta-channel.yml down`
 version: "3"
 services:
   chrome:

.github/workflows/Acceptance.yml

@@ -55,7 +55,7 @@ jobs:
           sed -i "s|$FROM_PATH|$TO_PATH|g" .ddev/docker-compose.volume.yaml
           ddev restart
           rm -rf vendor composer.lock
-          ddev composer require typo3/cms-core=${{ matrix.typo3 }}
+          ddev composer require typo3/cms-core=${{ matrix.typo3 }} tomasnorre/crawler=dev-$BRANCH_NAME
           ddev exec sudo apt remove -y php${{ matrix.php }}-uploadprogress
           ddev exec bin/typo3 backend:lock
           ddev exec bin/typo3 extension:setup

Tests/Acceptance/BackendModule/BackendModuleCest.php

@@ -20,6 +20,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+use AOE\Crawler\Tests\Acceptance\Support\Helper\ModalDialog;
 use AOE\Crawler\Tests\Acceptance\Support\Helper\PageTree;
 use AOE\Crawler\Tests\Acceptance\Support\Step\Acceptance\Admin;
 use Step\Acceptance\BackendModule;
@@ -196,30 +197,38 @@ public function crawlerUrlsContinueAndShowLogCheckDepthDropdown(
         $I->waitForText('https://crawler-devbox.ddev.site/access-restricted-page', 10);
     }
 
-    public function flushVisibleEntries(BackendModule $I, Admin $adminStep, PageTree $pageTree): void
-    {
+    public function flushVisibleEntries(
+        BackendModule $I,
+        Admin $adminStep,
+        PageTree $pageTree,
+        ModalDialog $modalDialog
+    ): void {
         // Will test twice, but done to avoid duplicate code
         $this->crawlerUrlsContinueAndShowLogCheckDepthDropdown($I, $adminStep, $pageTree);
         $I->click('Flush entire queue');
-        $I->switchToMainFrame();
-        $I->seeInPopup('Are you sure?');
-        $I->click('OK');
-        $I->switchToContentFrame();
         $I->wait(3);
+        $modalDialog->canSeeDialog();
+        $modalDialog->clickButtonInDialog('OK');
+        $I->wait(1);
         $I->canSeeNumberOfElements('a.refreshLink', 0);
         $this->crawlerUrlsContinueAndShowLogCheckDepthDropdown($I, $adminStep, $pageTree);
         $I->canSeeNumberOfElements('a.refreshLink', 9);
-        $I->selectOption('logDisplay', 'Finished');
+        $I->selectOption('displayLog', 'Finished');
         $I->canSeeNumberOfElements('a.refreshLink', 0);
         $I->click('Flush visible entries');
-        $I->acceptPopup();
         $I->wait(3);
-        $I->selectOption('logDisplay', 'All');
+        $modalDialog->canSeeDialog();
+        $modalDialog->clickButtonInDialog('OK');
+        $I->wait(1);
+        $I->switchToContentFrame();
+        $I->selectOption('displayLog', 'All');
         $I->canSeeNumberOfElements('a.refreshLink', 9);
-        $I->selectOption('logDisplay', 'Pending');
+        $I->selectOption('displayLog', 'Pending');
         $I->click('Flush visible entries');
-        $I->acceptPopup();
         $I->wait(3);
+        $modalDialog->canSeeDialog();
+        $modalDialog->clickButtonInDialog('OK');
+        $I->wait(1);
         $I->canSeeNumberOfElements('a.refreshLink', 0);
     }
 

Tests/Acceptance/Support/Helper/ModalDialog.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * (c) 2024-     Tomas Norre Mikkelsen <[email protected]>
+ *
+ * This file is part of the TYPO3 Crawler Extension.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * This is copied from
+ * https://github.com/TYPO3/typo3/blob/main/typo3/sysext/core/Tests/Acceptance/Support/Helper/ModalDialog.php
+ */
+
+namespace AOE\Crawler\Tests\Acceptance\Support\Helper;
+
+use AcceptanceTester;
+use TYPO3\TestingFramework\Core\Acceptance\Helper\AbstractModalDialog;
+
+final class ModalDialog extends AbstractModalDialog
+{
+    /**
+     * Selector for a visible modal window
+     * Adapted for Boostrap 5
+     *
+     * @var string
+     */
+    public static $openedModalSelector = '.modal.show';
+
+    /**
+     * Selector for the container in the modal where the buttons are located
+     * Adapted for Boostrap 5
+     *
+     * @var string
+     */
+    public static $openedModalButtonContainerSelector = '.modal.show .modal-footer';
+
+    /**
+     * @var AcceptanceTester
+     */
+    protected $tester;
+
+    /**
+     * Inject our core AcceptanceTester actor into ModalDialog
+     */
+    public function __construct(AcceptanceTester $I)
+    {
+        $this->tester = $I;
+    }
+
+    /**
+     * Perform a click on a link or a button, given by a locator.
+     *
+     * @param string $buttonLinkLocator the button title
+     * @see \Codeception\Module\WebDriver::click()
+     */
+    public function clickButtonInDialog(string $buttonLinkLocator): void
+    {
+        $I = $this->tester;
+        $this->canSeeDialog();
+        $I->click($buttonLinkLocator, self::$openedModalButtonContainerSelector);
+        $I->waitForElementNotVisible(self::$openedModalSelector);
+    }
+
+    /**
+     * Check if modal dialog is visible in top frame
+     */
+    public function canSeeDialog(): void
+    {
+        $I = $this->tester;
+        $I->switchToIFrame();
+        $I->waitForElement(self::$openedModalSelector);
+        // I will wait two seconds to prevent failing tests
+        $I->wait(2);
+    }
+}