Merge pull request #11525 from camptocamp/backport/11524-to-master

[Backport master] Force to use https in dev mode
camptocamp · Nov 12, 2024 · 5981e70 · 5981e70
2 parents 7d7d445 + 8042730
commit 5981e70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...l_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml b/...l_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml
@@ -22,6 +22,7 @@ services:
       # - PRINT_URL=http://print:8080/print/
       - PYTHONWARNINGS=default::DeprecationWarning
       - SQLALCHEMY_WARN_20=true
+      - C2CWSGIUTILS_FORCE_PROTO=https
     ports:
       - 5678:5678 # For remote debugging using Visual Studio Code
 

diff --git a/...tal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py b/...tal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py
@@ -34,7 +34,7 @@ def test_desktop_alt(url: str) -> None:
     assert response.status_code == 200, response.text
 
     assert re.search(
-        r'<script src="https?://front/static-ngeo-dist/desktop-.*\.js" crossorigin="anonymous"></script>',
+        r'<script src="https://front/static-ngeo-dist/desktop-.*\.js" crossorigin="anonymous"></script>',
         response.text,
     ), response.text
     assert re.search(r'<html lang="{{"{{mainCtrl.lang}}"}}" ', response.text), response.text