docs/changelog.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 2.7.3 - 2024-12-10
-
-### Bug fixes
-* correctly reset Dialog’s returnValue by @davidbgk in #2356
-
 ## 2.7.2 - 2024-11-15
 
 ### Bug fixes

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.26.1"]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.7.3"
+VERSION = "2.7.2"

umap/static/umap/js/modules/ui/dialog.js

@@ -78,6 +78,7 @@ export default class Dialog extends WithTemplate {
         event.preventDefault()
         this.dialog.returnValue = 'accept'
         this.close()
+        this.dialog.returnValue = undefined
       })
     }
     this.dialog.addEventListener('keydown', (e) => {
@@ -142,7 +143,6 @@ export default class Dialog extends WithTemplate {
 
   close() {
     this.toggle(false)
-    this.dialog.returnValue = undefined
   }
 
   toggle(open = false) {

umap/tests/base.py

@@ -1,6 +1,5 @@
 import copy
 import json
-from pathlib import Path
 
 import factory
 from django.contrib.auth import get_user_model
@@ -41,7 +40,7 @@ class LicenceFactory(factory.django.DjangoModelFactory):
 
 class TileLayerFactory(factory.django.DjangoModelFactory):
     name = "Test zoom layer"
-    url_template = "https://{s}.test.org/osmfr/{z}/{x}/{y}.png"
+    url_template = "http://{s}.test.org/{z}/{x}/{y}.png"
     attribution = "Test layer attribution"
 
     class Meta:
@@ -151,8 +150,3 @@ def login_required(response):
     redirect_url = reverse("login")
     assert j["login_required"] == redirect_url
     return True
-
-
-def mock_tiles(route):
-    path = Path(__file__).parent / "fixtures/empty_tile.png"
-    route.fulfill(path=path)

umap/tests/integration/conftest.py

@@ -6,8 +6,6 @@ from pathlib import Path
 import pytest
 from playwright.sync_api import expect
 
-from ..base import mock_tiles
-
 
 @pytest.fixture(scope="session")
 def browser_context_args(browser_context_args):
@@ -25,7 +23,7 @@ def set_timeout(context):
 @pytest.fixture(autouse=True)
 def mock_osm_tiles(page):
     if not bool(os.environ.get("PWDEBUG", False)):
-        page.route("*/**/osmfr/**", mock_tiles)
+        page.route("*/**/osmfr/**", lambda route: route.fulfill())
 
 
 @pytest.fixture

umap/tests/integration/test_import.py

@@ -1,4 +1,5 @@
 import json
+import os
 import platform
 import re
 from pathlib import Path
@@ -9,7 +10,6 @@ from playwright.sync_api import expect
 
 from umap.models import DataLayer
 
-from ..base import mock_tiles
 from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
@@ -72,8 +72,6 @@ def test_umap_import_from_file(live_server, tilelayer, page):
 
 
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
-    page.route("https://tile.openstreetmap.fr/hot/**", mock_tiles)
-
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("button", name="Open browser").click()