CI: Update Selenium Images + Small test adjustments. (#1043)

tomasnorre · Mar 9, 2024 · f515e8b · f515e8b
1 parent 4c7d37e
commit f515e8b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 31 deletions.
diff --git a/.devbox/.ddev/docker-compose.selenium.yaml b/.devbox/.ddev/docker-compose.selenium.yaml
@@ -1,19 +1,22 @@
-# To execute this docker-compose yml file use `docker-compose -f <file_name> up`
+# 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
-version: '3.6'
+# To stop the execution, hit Ctrl+C, and then `docker-compose -f docker-compose-v3-beta-channel.yml down`
+version: "3"
 services:
-  selenium-hub:
-    image: selenium/hub:3.141.59-20200326
-    container_name: selenium-hub
-    ports:
-      - "4444:4444"
-
   chrome:
-    image: selenium/node-chrome:3.141.59-20200326
-    volumes:
-      - /dev/shm:/dev/shm
+    image: selenium/node-chrome:latest
+    shm_size: 2gb
     depends_on:
       - selenium-hub
     environment:
-      - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
+      - SE_EVENT_BUS_HOST=selenium-hub
+      - SE_EVENT_BUS_PUBLISH_PORT=4442
+      - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
+
+  selenium-hub:
+    image: selenium/hub:latest
+    container_name: selenium-hub
+    ports:
+      - "4442:4442"
+      - "4443:4443"
+      - "4444:4444"
diff --git a/Tests/Acceptance/BackendModule/BackendModuleCest.php b/Tests/Acceptance/BackendModule/BackendModuleCest.php
@@ -40,7 +40,7 @@ public function signInSuccessfully(Admin $I): void
     public function canSeeCrawlerModule(Admin $I): void
     {
         $I->loginAsAdmin();
-        $I->canSee('Crawler', '#web_site_crawler');
+        $I->canSee('Crawler', '[data-modulemenu-identifier="web_site_crawler"]');
     }
 
     public function canSelectCrawlerModuleStartCrawling(BackendModule $I, Admin $adminStep, PageTree $pageTree): void

diff --git a/Tests/Acceptance/BackendModule/CrawlerConfigurationCest.php b/Tests/Acceptance/BackendModule/CrawlerConfigurationCest.php
@@ -25,10 +25,10 @@
 
 class CrawlerConfigurationCest
 {
-    public function canCreateCrawlerConfigration(BackendModule $I, Admin $adminStep, PageTree $pageTree): void
+    public function canCreateCrawlerConfiguration(BackendModule $I, Admin $adminStep, PageTree $pageTree): void
     {
         $adminStep->loginAsAdmin();
-        $I->click('#web_list');
+        $I->click('[data-moduleroute-identifier="web_list"]');
         // Due to slow response time.
         $I->waitForElementNotVisible('#nprogress', 120);
         $I->waitForElement('#typo3-pagetree-treeContainer', 120);

diff --git a/Tests/Acceptance/Support/Step/Acceptance/Admin.php b/Tests/Acceptance/Support/Step/Acceptance/Admin.php
@@ -25,7 +25,11 @@ class Admin extends \AcceptanceTester
     public function loginAsAdmin(): void
     {
         $I = $this;
-        $I->amOnPage('/typo3');
+        if ($I->tryToSeeCookie('be_typo_user')) {
+            return;
+        }
+
+        $I->amOnPage('/typo3/login');
         $I->waitForText('Login', 30);
         $I->fillField('#t3-username', 'admin');
         $I->fillField('#t3-password', 'password');

diff --git a/Tests/Acceptance/Support/Step/Acceptance/BackendModule.php b/Tests/Acceptance/Support/Step/Acceptance/BackendModule.php
@@ -24,19 +24,6 @@
 
 class BackendModule extends \AcceptanceTester
 {
-    public function openCrawlerBackendModule(Admin $I, PageTree $pageTree): void
-    {
-        $I->click('#web_site_crawler');
-        // Due to slow response time.
-        $I->waitForElementNotVisible('#nprogress', 120);
-        $I->waitForElement('#typo3-pagetree-treeContainer', 120);
-        $pageTree->openPath(['Welcome']);
-        // Due to slow response time.
-        $I->waitForElementNotVisible('#nprogress', 120);
-        $I->switchToContentFrame();
-        $I->waitForText('Crawl', 10);
-    }
-
     public function openCrawlerBackendModuleStartCrawling(Admin $I, PageTree $pageTree): void
     {
         $this->openCrawlerBackendModule($I, $pageTree);
@@ -70,4 +57,16 @@ public function addProcessOnProcess(Admin $I, PageTree $pageTree): void
         $I->waitForElementNotVisible('#nprogress', 120);
         $I->waitForText('New process has been started');
     }
+    private function openCrawlerBackendModule(Admin $I, PageTree $pageTree): void
+    {
+        $I->click('[data-moduleroute-identifier="web_site_crawler"]');
+        // Due to slow response time.
+        $I->waitForElementNotVisible('#nprogress', 120);
+        $I->waitForElement('#typo3-pagetree-treeContainer', 120);
+        $pageTree->openPath(['Welcome']);
+        // Due to slow response time.
+        $I->waitForElementNotVisible('#nprogress', 120);
+        $I->switchToContentFrame();
+        $I->waitForText('Crawl', 10);
+    }
 }
diff --git a/composer.json b/composer.json
@@ -81,7 +81,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "AOE\\Crawler\\Tests\\": "Tests"
+            "AOE\\Crawler\\Tests\\": "Tests",
+            "TYPO3\\CMS\\Core\\Tests\\": ".Build/vendor/typo3/cms-core/Tests"
         }
     },
     "config": {