Merge pull request #3877 from alephdata/chore/fix-e2e-locator

e2e test fix: Use newer locator API, make worker start up properly

Author: stchris

Makefile

@@ -107,20 +107,20 @@ e2e/test-results:
 
 services-e2e:
 	$(COMPOSE_E2E) up -d --remove-orphans \
-		postgres elasticsearch ingest-file \
+		postgres elasticsearch ingest-file rabbitmq worker \
 
 e2e: services-e2e e2e/test-results
 	$(COMPOSE_E2E) run --rm app aleph upgrade
 	$(COMPOSE_E2E) run --rm app aleph createuser --name="E2E Admin" --admin --password="admin" [email protected]
-	$(COMPOSE_E2E) up -d api ui worker
-	BASE_URL=http://ui:8080 $(COMPOSE_E2E) run --rm e2e pytest -s -v --output=/e2e/test-results/ --screenshot=only-on-failure --video=retain-on-failure e2e/
+	$(COMPOSE_E2E) up -d api ui
+	BASE_URL=http://ui:8080 $(COMPOSE_E2E) run --rm e2e pytest -s -v --output=/e2e/test-results/ --screenshot=only-on-failure --video=retain-on-failure --tracing retain-on-failure e2e/
 
 e2e-local-setup: dev
 	python3 -m pip install -q -r e2e/requirements.txt
 	playwright install
 
 e2e-local:
-	pytest -s -v --screenshot only-on-failure e2e/
+	pytest -s -v --screenshot only-on-failure --tracing retain-on-failure e2e/
 
 .PHONY: build services e2e
 

docker-compose.dev.yml

@@ -1,5 +1,3 @@
-version: "3.2"
-
 services:
   postgres:
     image: postgres:15
@@ -161,6 +159,8 @@ services:
       - aleph.env
 
   worker:
+    build:
+      context: .
     image: alephdata/aleph:${ALEPH_TAG:-latest}
     command: aleph worker
     restart: on-failure
@@ -169,6 +169,7 @@ services:
       - elasticsearch
       - redis
       - ingest-file
+      - rabbitmq
     tmpfs:
       - /tmp
     volumes:

docker-compose.e2e.yml

@@ -1,5 +1,3 @@
-version: "3.2"
-
 services:
   postgres:
     environment:
@@ -15,6 +13,10 @@ services:
     volumes:
       - redis-data-e2e:/data
 
+  rabbitmq:
+    volumes:
+      - rabbitmq-data-e2e:/var/lib/rabbitmq
+
   api:
     volumes:
       - archive-data-e2e:/data
@@ -39,6 +41,7 @@ services:
     environment:
       ALEPH_DATABASE_URI: "postgresql://aleph:aleph@postgres/aleph_e2e"
       FTM_STORE_URI: "postgresql://aleph:aleph@postgres/aleph_e2e"
+      TAGS_DATABASE_URI: "sqlite:///tags.db"
 
   ui:
     environment:
@@ -60,9 +63,11 @@ services:
       ALEPH_DATABASE_URI: "postgresql://aleph:aleph@postgres/aleph_e2e"
       APP_NAME: "aleph-e2e"
       FTM_STORE_URI: "postgresql://aleph:aleph@postgres/aleph_e2e"
+      PROMETHEUS_ENABLE: False
 
 volumes:
   archive-data-e2e: {}
   elasticsearch-data-e2e: {}
   postgres-data-e2e: {}
   redis-data-e2e: {}
+  rabbitmq-data-e2e: {}

e2e/models/investigations.py

@@ -35,7 +35,8 @@ def upload_document(self, filename: str):
         self.page.get_by_role("dialog", name="Upload documents").get_by_role(
             "button", name="Close"
         ).first.click()
-        self.page.wait_for_selector("div[role='progressbar']", state="detached")
+        progress_bar = self.page.locator("div[role='progressbar']").first
+        progress_bar.wait_for(state="detached")
 
     def open_document(self, name: str):
         # TODO can't use exact=True below because the name is actually `Documents 0`