Merge pull request alephdata#3700 from alephdata/playwright-fixes

Playwright fixes (cherry-picked from develop)

Author: stchris

.github/dependabot.yml

@@ -11,10 +11,20 @@ updates:
         patterns:
           - "bump2version"
           - "black"
-          - "playwright"
           - "pytest*"
           - "ruff"
 
+  - package-ecosystem: pip
+    directory: "/e2e"
+    schedule:
+      interval: monthly
+    open-pull-requests-limit: 99
+    target-branch: develop
+    groups:
+      e2e-dependencies:
+        patterns:
+          - "*"
+
   - package-ecosystem: npm
     directory: "/ui"
     schedule:
@@ -50,13 +60,6 @@ updates:
     open-pull-requests-limit: 99
     target-branch: develop
 
-  - package-ecosystem: docker
-    directory: "/e2e"
-    schedule:
-      interval: monthly
-    open-pull-requests-limit: 99
-    target-branch: develop
-
   - package-ecosystem: github-actions
     directory: "/"
     schedule:

Makefile

@@ -3,6 +3,7 @@ COMPOSE_E2E=docker-compose -f docker-compose.dev.yml -f docker-compose.e2e.yml
 APPDOCKER=$(COMPOSE) run --rm app
 UIDOCKER=$(COMPOSE) run --no-deps --rm ui
 ALEPH_TAG=latest
+BLACK_FLAGS=--exclude aleph/migrate
 
 all: build upgrade web
 
@@ -28,13 +29,13 @@ lint-ui:
 	$(UIDOCKER) npm run lint
 
 format:
-	black aleph/
+	black $(BLACK_FLAGS) aleph/
 
 format-ui:
 	$(UIDOCKER) npm run format
 
 format-check:
-	black --check aleph/
+	black --check $(BLACK_FLAGS) aleph/
 
 format-check-ui:
 	$(UIDOCKER) npm run format:check
@@ -75,7 +76,7 @@ build-ui:
 	docker build -t ghcr.io/alephdata/aleph-ui-production:$(ALEPH_TAG) -f ui/Dockerfile.production ui
 
 build-e2e:
-	$(COMPOSE_E2E) build
+	$(COMPOSE_E2E) build --build-arg PLAYWRIGHT_VERSION=$(shell awk -F'==' '/^playwright==/ { print $$2 }' e2e/requirements.txt)
 
 build-full: build build-ui build-e2e
 
@@ -111,9 +112,10 @@ 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" admin@admin.admin
 	$(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/
+	BASE_URL=http://ui:8080 $(COMPOSE_E2E) run --rm --build-arg PLAYWRIGHT_VERSION=$(shell awk -F'==' '/^playwright==/ { print $$2 }' e2e/requirements.txt) e2e pytest -s -v --output=/e2e/test-results/ --screenshot=only-on-failure --video=retain-on-failure e2e/
 
 e2e-local-setup: dev
+	python3 -m pip install -q -r e2e/requirements.txt
 	playwright install
 
 e2e-local:

aleph/logic/profiles.py

@@ -13,6 +13,7 @@
 
 Outside of its own collection, any entity can be linked to any number of profiles.
 """
+
 import logging
 from sqlalchemy import or_
 from sqlalchemy.orm import aliased

aleph/tests/test_profiles.py

@@ -26,9 +26,11 @@ def test_decide_xref(self):
         assert profile_t1.id == profile_t2.id, (profile_t1, profile_t2)
         assert len(profile_t2.items().all()) == 3, profile_t2
         assert all(
-            e.judgement == Judgement.POSITIVE
-            if e.entity_id.startswith("a")
-            else Judgement.NEGATIVE
+            (
+                e.judgement == Judgement.POSITIVE
+                if e.entity_id.startswith("a")
+                else Judgement.NEGATIVE
+            )
             for e in profile_t2.items()
         )
 

e2e/Dockerfile

@@ -1,9 +1,10 @@
-FROM mcr.microsoft.com/playwright/python:v1.42.0-focal
-COPY entrypoint.sh wait-for ./
+ARG PLAYWRIGHT_VERSION
+FROM mcr.microsoft.com/playwright/python:v${PLAYWRIGHT_VERSION}
+COPY entrypoint.sh wait-for requirements.txt ./
 RUN apt update -y \
     && apt install -y netcat wget \
     && apt-get -qq -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN pip install pytest-playwright
+RUN pip install -r requirements.txt
 ENTRYPOINT ["./entrypoint.sh"]

e2e/requirements.txt

@@ -0,0 +1,2 @@
+playwright==1.43.0
+pytest-playwright==0.4.4

requirements-dev.txt

@@ -1,6 +1,4 @@
 bump2version==1.0.1
 Babel==2.12.1
-black==23.12.1
-playwright==1.42.0
-pytest-playwright==0.4.3
-ruff===0.1.9
+black==24.3.0
+ruff===0.3.5