c2cgeoportal-admin 2.6.0__py3-none-any.whl → 2.9rc44__py3-none-any.whl

tests/test_layertree.py

@@ -13,6 +13,7 @@ def layertree_test_data(dbsession, transact):
     del transact
 
     from c2cgeoportal_commons.models.main import (
+        Interface,
         LayerGroup,
         LayergroupTreeitem,
         LayerWMS,
@@ -21,26 +22,39 @@ def layertree_test_data(dbsession, transact):
         Theme,
     )
 
+    interface1 = Interface("interface1")
+    dbsession.add(interface1)
+    interface2 = Interface("interface2")
+    dbsession.add(interface2)
+
     layers_wms = []
     ogc_server = OGCServer(name="ogc_server")
     dbsession.add(ogc_server)
-    for i in range(0, 10):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
+    for i in range(10):
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        if i == 1:
+            layer_wms.interfaces = [interface1]
+        elif i > 1:
+            layer_wms.interfaces = [interface1, interface2]
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
 
     layers_wmts = []
-    for i in range(0, 10):
-        layer_wmts = LayerWMTS(name="layer_wmts_{}".format(i))
+    for i in range(10):
+        layer_wmts = LayerWMTS(name=f"layer_wmts_{i}")
+        if i == 1:
+            layer_wmts.interfaces = [interface1]
+        elif i > 1:
+            layer_wmts.interfaces = [interface1, interface2]
         layer_wmts.url = "http://localhost/wmts"
         layer_wmts.layer = layer_wmts.name
         layers_wmts.append(layer_wmts)
         dbsession.add(layer_wmts)
 
     groups = []
-    for i in range(0, 10):
-        group = LayerGroup(name="layer_group_{}".format(i))
+    for i in range(10):
+        group = LayerGroup(name=f"layer_group_{i}")
         groups.append(group)
         dbsession.add(group)
 
@@ -51,10 +65,14 @@ def layertree_test_data(dbsession, transact):
     dbsession.add(LayergroupTreeitem(group=groups[9], item=groups[8], ordering=3))
 
     themes = []
-    for i in range(0, 5):
-        theme = Theme(name="theme_{}".format(i))
+    for i in range(5):
+        theme = Theme(name=f"theme_{i}")
         themes.append(theme)
         dbsession.add(theme)
+        if i == 1:
+            theme.interfaces = [interface1]
+        elif i > 1:
+            theme.interfaces = [interface1, interface2]
 
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i], ordering=0))
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i + 5], ordering=1))
@@ -74,6 +92,7 @@ def layertree_test_data(dbsession, transact):
             "layers_wms": layers_wms,
             "layers_wmts": layers_wmts,
             "ogc_servers": [ogc_server],
+            "interfaces": [interface1, interface2],
         }
     )
 
@@ -84,7 +103,6 @@ def layertree_test_data(dbsession, transact):
 )
 @pytest.mark.usefixtures("layertree_test_data", "test_app")
 class TestLayerTreeView(AbstractViewsTests):
-
     _prefix = "/admin/layertree"
 
     def test_index(self, test_app):
@@ -93,13 +111,13 @@ class TestLayerTreeView(AbstractViewsTests):
     def check_edit_action(self, test_app, nodes, table, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "edit")
-        assert "http://localhost/admin/{}/{}".format(table, item_id) == action["url"]
+        assert f"http://localhost/admin/{table}/{item_id}" == action["url"]
         test_app.get(action["url"], status=200)
 
     def check_unlink_action(self, test_app, nodes, group_id, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "unlink")
-        assert "http://localhost/admin/layertree/unlink/{}/{}".format(group_id, item_id) == action["url"]
+        assert f"http://localhost/admin/layertree/unlink/{group_id}/{item_id}" == action["url"]
         test_app.delete(action["url"], status=200)
 
     def check_translation(self, nodes, item):
@@ -111,7 +129,7 @@ class TestLayerTreeView(AbstractViewsTests):
         node = next(n for n in nodes if n["id"] == parent_id)
         action = next(a for a in node["actions"] if a["name"] == action_name)
         assert label == action["label"]
-        assert "http://localhost/admin/{}/new?parent_id={}".format(route_table, parent_id) == action["url"]
+        assert f"http://localhost/admin/{route_table}/new?parent_id={parent_id}" == action["url"]
 
         form = test_app.get(action["url"], status=200).form
         assert form["parent_id"].value == str(parent_id)
@@ -150,12 +168,26 @@ class TestLayerTreeView(AbstractViewsTests):
             {"name": "new_name_from_layer_group"},
         )
 
-    def test_groups(self, test_app, layertree_test_data):
+    def test_groups(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
+
+        # Invert children order (to test ordering)
+        theme.children_relation[0].ordering = 1
+        theme.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(test_app, "/children?group_id={0}&path=_{0}".format(theme.id), status=200)
         nodes = resp.json
         assert 2 == len(nodes)
 
+        # check groups are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(theme.children_relation, key=lambda relation: relation.ordering)
+        ]
+        group_names = [node["name"] for node in nodes]
+        assert expected == group_names
+
         group = layertree_test_data["groups"][0]
         self.check_edit_action(test_app, nodes, "layer_groups", group.id)
         self.check_unlink_action(test_app, nodes, theme.id, group.id)
@@ -186,15 +218,29 @@ class TestLayerTreeView(AbstractViewsTests):
             },
         )
 
-    def test_layers(self, test_app, layertree_test_data):
+    def test_layers(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
         group = layertree_test_data["groups"][0]
+
+        # Invert children order (to test ordering)
+        group.children_relation[0].ordering = 1
+        group.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(
             test_app, "/children?group_id={0}&path=_{1}_{0}".format(group.id, theme.id), status=200
         )
         nodes = resp.json
         assert len(nodes) == 2
 
+        # check layers are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(group.children_relation, key=lambda relation: relation.ordering)
+        ]
+        layer_names = [node["name"] for node in nodes]
+        assert expected == layer_names
+
         layer_wms = layertree_test_data["layers_wms"][0]
         layer_wmts = layertree_test_data["layers_wmts"][0]
 
@@ -210,7 +256,7 @@ class TestLayerTreeView(AbstractViewsTests):
     def test_unlink(self, test_app, layertree_test_data, dbsession):
         group = layertree_test_data["groups"][0]
         item = layertree_test_data["layers_wms"][0]
-        test_app.delete("/admin/layertree/unlink/{}/{}".format(group.id, item.id), status=200)
+        test_app.delete(f"/admin/layertree/unlink/{group.id}/{item.id}", status=200)
         dbsession.expire_all()
         assert item not in group.children
 
@@ -226,5 +272,42 @@ class TestLayerTreeView(AbstractViewsTests):
             (layers_wms[1].id, LayerWMS),
             (groups[1].id, LayerGroup),
         ):
-            test_app.delete("/admin/layertree/delete/{}".format(item_id), status=200)
+            test_app.delete(f"/admin/layertree/delete/{item_id}", status=200)
             assert dbsession.query(model).get(item_id) is None
+
+    @pytest.mark.parametrize(
+        "params,expected",
+        [
+            ({}, ["theme_0", "theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface1"}, ["theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface2"}, ["theme_3", "theme_2", "theme_4"]),
+        ],
+    )
+    def test_themes_interfaces(self, test_app, layertree_test_data, params, expected):
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert expected == [node["name"] for node in nodes if node["item_type"] == "theme"]
+
+    @pytest.mark.parametrize(
+        "interface,index,length",
+        [
+            (None, 0, 2),
+            (None, 1, 2),
+            (None, 2, 2),
+            ("interface1", 0, 0),
+            ("interface1", 1, 2),
+            ("interface1", 2, 2),
+            ("interface2", 0, 0),
+            ("interface2", 1, 0),
+            ("interface2", 2, 2),
+        ],
+    )
+    def test_layers_interface(self, test_app, layertree_test_data, interface, index, length):
+        theme = layertree_test_data["themes"][index]
+        group = layertree_test_data["groups"][index]
+        params = {"group_id": group.id, "path": f"_{theme.id}_{group.id}"}
+        if interface:
+            params["interface"] = interface
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert length == len(nodes)

tests/test_left_menu.py

@@ -24,7 +24,6 @@ def left_menu_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("test_app")
 class TestLeftMenu(AbstractViewsTests):
-
     _prefix = "/admin/roles"
 
     def test_index(self, test_app):

tests/test_lingva_extractor_config.py

@@ -0,0 +1,64 @@
+# Copyright (c) 2022-2024, Camptocamp SA
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of the FreeBSD Project.
+
+# pylint: disable=missing-docstring
+
+from unittest.mock import Mock, mock_open, patch
+
+import pytest
+import yaml
+from c2c.template.config import config as configuration
+
+from c2cgeoportal_admin.lib.lingva_extractor import GeomapfishConfigExtractor
+
+GMF_CONFIG = """
+vars:
+  admin_interface:
+    available_metadata:
+      - name: metadata1
+        description: description1
+        translate: true
+    available_functionalities:
+      - name: functionality1
+        description: description2
+"""
+
+
+class TestGeomapfishConfigExtractor:
+    @patch(
+        "c2cgeoportal_admin.lib.lingva_extractor.open",
+        mock_open(read_data=GMF_CONFIG),
+    )
+    def test_extract_config(self):
+        extractor = GeomapfishConfigExtractor()
+
+        options = Mock()
+        options.keywords = []
+
+        messages = list(extractor("config.yaml", options))
+
+        assert {msg.msgid for msg in messages} == {"description1", "description2"}

tests/test_logs.py

@@ -0,0 +1,102 @@
+# pylint: disable=no-self-use,unsubscriptable-object
+
+import datetime
+from datetime import timezone
+
+import pytest
+
+from . import AbstractViewsTests
+
+
+@pytest.fixture(scope="function")
+@pytest.mark.usefixtures("dbsession", "transact")
+def logs_test_data(dbsession, transact):
+    del transact
+
+    from c2cgeoportal_commons.models.main import AbstractLog
+    from c2cgeoportal_commons.models.main import Log as MainLog
+    from c2cgeoportal_commons.models.main import LogAction
+    from c2cgeoportal_commons.models.static import Log as StaticLog
+
+    logs = []
+    for i in range(0, 5):
+        log = MainLog(
+            date=datetime.datetime.now(timezone.utc),
+            action=[LogAction.INSERT, LogAction.UPDATE, LogAction.DELETE][i % 3],
+            element_type="role",
+            element_id=i,
+            element_name=f"role_{i}",
+            element_url_table="roles",
+            username="testuser",
+        )
+        dbsession.add(log)
+        logs.append(log)
+
+        log = StaticLog(
+            date=datetime.datetime.now(timezone.utc),
+            action=[LogAction.INSERT, LogAction.UPDATE, LogAction.DELETE][i % 3],
+            element_type="user",
+            element_id=i,
+            element_name=f"user_{i}",
+            element_url_table="users",
+            username="testuser",
+        )
+        dbsession.add(log)
+        logs.append(log)
+
+    dbsession.flush()
+
+    yield {
+        "logs": logs,
+    }
+
+
+@pytest.mark.usefixtures("logs_test_data", "test_app")
+class TestLog(AbstractViewsTests):
+    _prefix = "/admin/logs"
+
+    def test_index_rendering(self, test_app):
+        resp = self.get(test_app)
+
+        self.check_left_menu(resp, "Logs")
+
+        expected = [
+            ("actions", "", "false"),
+            ("id", "id", "true"),
+            ("date", "Date"),
+            ("username", "Username"),
+            ("action", "Action"),
+            ("element_type", "Element type"),
+            ("element_id", "Element identifier"),
+            ("element_name", "Element name"),
+        ]
+        self.check_grid_headers(resp, expected, new=False)
+
+    def test_grid_default_sort_on_date_desc(self, test_app, logs_test_data):
+        json = self.check_search(test_app)
+        expected_ids = [
+            log.id
+            for log in sorted(
+                logs_test_data["logs"],
+                key=lambda log: log.date,
+                reverse=True,
+            )
+        ]
+        result_ids = [int(row["_id_"]) for row in json["rows"]]
+        assert result_ids == expected_ids
+
+    def test_grid_sort_on_element_type(self, test_app, logs_test_data):
+        json = self.check_search(test_app, sort="element_type")
+        expected_ids = [
+            log.id
+            for log in sorted(
+                logs_test_data["logs"],
+                key=lambda log: (log.element_type, -log.date.timestamp()),
+            )
+        ]
+        result_ids = [int(row["_id_"]) for row in json["rows"]]
+        assert result_ids == expected_ids
+
+    def test_grid_search(self, test_app):
+        self.check_search(test_app, "role", total=5)
+        self.check_search(test_app, "user_2", total=1)

tests/test_main.py

@@ -5,7 +5,9 @@ from webtest import TestApp as WebTestApp
 
 @pytest.mark.usefixtures("app_env")
 def test_main(app_env):
-    """Test dev environment"""
+    """
+    Test dev environment.
+    """
     config = testing.setUp(registry=app_env["registry"])
     app = config.make_wsgi_app()
     testapp = WebTestApp(app)

tests/test_metadatas.py

@@ -59,7 +59,6 @@ def metadatas_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("metadatas_test_data", "test_app")
 class TestMetadatasView(AbstractViewsTests):
-
     _prefix = "/admin/"
 
     def __metadata_ui_types(self):
@@ -85,7 +84,9 @@ class TestMetadatasView(AbstractViewsTests):
             return None
         return metadata.value
 
-    def _check_metadatas(self, test_app, item, metadatas):
+    def _check_metadatas(self, test_app, item, metadatas, model):
+        from c2cgeoportal_admin.schemas.metadata import metadata_definitions
+
         settings = test_app.app.registry.settings
         self._check_sequence(
             item,
@@ -96,9 +97,7 @@ class TestMetadatasView(AbstractViewsTests):
                         "name": "name",
                         "value": [
                             {"text": s_m["name"], "value": s_m["name"], "selected": s_m["name"] == m.name}
-                            for s_m in sorted(
-                                settings["admin_interface"]["available_metadata"], key=lambda m: m["name"]
-                            )
+                            for s_m in sorted(metadata_definitions(settings, model), key=lambda m: m["name"])
                         ],
                         "label": "Name",
                     },
@@ -131,7 +130,7 @@ class TestMetadatasView(AbstractViewsTests):
         resp = self._post_metadata(test_app, url, base_mapping, name, value, 200)
         assert (
             error_msg
-            == resp.html.select_one(".item-{} .help-block".format(self.__metadata_ui_type(test_app, name)))
+            == resp.html.select_one(f".item-{self.__metadata_ui_type(test_app, name)} .help-block")
             .getText()
             .strip()
         )
@@ -156,12 +155,16 @@ class TestMetadatasView(AbstractViewsTests):
         )
 
     def test_get_true_boolean_metadata(self, metadatas_test_data, test_app):
-        metadatas_test_data["layer_wms"].get_metadatas("_boolean")[0].value = "true"
-        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app)
+        from c2cgeoportal_commons.models.main import LayerWMS
+
+        metadatas_test_data["layer_wms"].get_metadata("_boolean")[0].value = "true"
+        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app, LayerWMS)
 
     def test_get_false_boolean_metadata(self, metadatas_test_data, test_app):
-        metadatas_test_data["layer_wms"].get_metadatas("_boolean")[0].value = "false"
-        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app)
+        from c2cgeoportal_commons.models.main import LayerWMS
+
+        metadatas_test_data["layer_wms"].get_metadata("_boolean")[0].value = "false"
+        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app, LayerWMS)
 
     def test_post_true_boolean_metadata(self, test_app, metadatas_test_data, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMS
@@ -175,7 +178,7 @@ class TestMetadatasView(AbstractViewsTests):
             302,
         )
         layer = dbsession.query(LayerWMS).filter(LayerWMS.name == "new_name").one()
-        assert layer.get_metadatas("_boolean")[0].value == "true"
+        assert layer.get_metadata("_boolean")[0].value == "true"
 
     def test_post_false_boolean_metadata(self, test_app, metadatas_test_data, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMS
@@ -189,7 +192,7 @@ class TestMetadatasView(AbstractViewsTests):
             302,
         )
         layer = dbsession.query(LayerWMS).filter(LayerWMS.name == "new_name").one()
-        assert layer.get_metadatas("_boolean")[0].value == "false"
+        assert layer.get_metadata("_boolean")[0].value == "false"
 
     def test_valid_float_metadata(self, test_app, metadatas_test_data):
         self._post_metadata(
@@ -304,31 +307,41 @@ class TestMetadatasView(AbstractViewsTests):
             302,
         )
 
-    def _test_edit_treeitem(self, prefix, item, test_app):
-        resp = self.get(test_app, "{}/{}".format(prefix, item.id))
-        self._check_metadatas(test_app, resp.html.select_one(".item-metadatas"), item.metadatas)
+    def _test_edit_treeitem(self, prefix, item, test_app, model):
+        resp = self.get(test_app, f"{prefix}/{item.id}")
+        self._check_metadatas(test_app, resp.html.select_one(".item-metadatas"), item.metadatas, model)
         resp.form.submit("submit", status=302)
 
     def test_layer_wms_metadatas(self, metadatas_test_data, test_app):
-        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app)
+        from c2cgeoportal_commons.models.main import LayerWMS
+
+        self._test_edit_treeitem("layers_wms", metadatas_test_data["layer_wms"], test_app, LayerWMS)
 
     def test_layer_wmts_metadatas(self, metadatas_test_data, test_app):
-        self._test_edit_treeitem("layers_wmts", metadatas_test_data["layer_wmts"], test_app)
+        from c2cgeoportal_commons.models.main import LayerWMTS
+
+        self._test_edit_treeitem("layers_wmts", metadatas_test_data["layer_wmts"], test_app, LayerWMTS)
 
     def test_theme_metadatas(self, metadatas_test_data, test_app):
-        self._test_edit_treeitem("themes", metadatas_test_data["theme"], test_app)
+        from c2cgeoportal_commons.models.main import Theme
+
+        self._test_edit_treeitem("themes", metadatas_test_data["theme"], test_app, Theme)
 
     def test_group_metadatas(self, metadatas_test_data, test_app):
-        self._test_edit_treeitem("layer_groups", metadatas_test_data["group"], test_app)
+        from c2cgeoportal_commons.models.main import LayerGroup
+
+        self._test_edit_treeitem("layer_groups", metadatas_test_data["group"], test_app, LayerGroup)
 
     def test_undefined_metadata(self, metadatas_test_data, test_app):
-        """Undefined metadata must be kept intact across submissions"""
+        """
+        Undefined metadata must be kept intact across submissions.
+        """
         from c2cgeoportal_commons.models.main import Metadata
 
         layer = metadatas_test_data["layer_wms"]
         layer.metadatas = [Metadata("_undefined", "This is an undefined metadata")]
 
-        resp = self.get(test_app, "layers_wms/{}".format(layer.id))
+        resp = self.get(test_app, f"layers_wms/{layer.id}")
         resp.form.submit("submit", status=302)
 
         metadata = layer.metadatas[0]

tests/test_oauth2_clients.py

@@ -3,6 +3,7 @@
 import re
 from uuid import uuid4
 
+import pyramid.httpexceptions
 import pytest
 from pyramid.testing import DummyRequest
 
@@ -35,7 +36,6 @@ def oauth2_clients_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("oauth2_clients_test_data", "test_app")
 class TestOAuth2Client(TestTreeGroup):
-
     _prefix = "/admin/oauth2_clients"
 
     def test_index_rendering(self, test_app):
@@ -59,7 +59,8 @@ class TestOAuth2Client(TestTreeGroup):
         self.check_search(test_app, client.client_id, total=1)
 
     def test_submit_new(self, dbsession, test_app, oauth2_clients_test_data):
-        from c2cgeoportal_commons.models.static import OAuth2Client
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log, OAuth2Client
 
         resp = test_app.post(
             "/admin/oauth2_clients/new",
@@ -84,7 +85,18 @@ class TestOAuth2Client(TestTreeGroup):
         assert oauth2_client.secret == "12345"
         assert oauth2_client.redirect_uri == "http://127.0.0.1:7070/bis"
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "oauth2_client"
+        assert log.element_id == oauth2_client.id
+        assert log.element_name == oauth2_client.client_id
+        assert log.username == "test_user"
+
     def test_edit_then_save(self, dbsession, test_app, oauth2_clients_test_data):
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log
+
         oauth2_client = oauth2_clients_test_data["oauth2_clients"][10]
 
         dbsession.expire(oauth2_client)
@@ -112,12 +124,20 @@ class TestOAuth2Client(TestTreeGroup):
         assert "New secret" == oauth2_client.secret
         assert "New redirect URI" == oauth2_client.redirect_uri
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "oauth2_client"
+        assert log.element_id == oauth2_client.id
+        assert log.element_name == oauth2_client.client_id
+        assert log.username == "test_user"
+
     def test_duplicate(self, oauth2_clients_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.static import OAuth2Client
 
         oauth2_client_proto = oauth2_clients_test_data["oauth2_clients"][7]
 
-        resp = test_app.get("/admin/oauth2_clients/{}/duplicate".format(oauth2_client_proto.id), status=200)
+        resp = test_app.get(f"/admin/oauth2_clients/{oauth2_client_proto.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -134,24 +154,33 @@ class TestOAuth2Client(TestTreeGroup):
         assert oauth2_client_proto.id != oauth2_client.id
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.static import OAuth2Client
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log, OAuth2Client
+
+        oauth2_client = dbsession.query(OAuth2Client).first()
+        test_app.delete(f"/admin/oauth2_clients/{oauth2_client.id}", status=200)
+        assert dbsession.query(OAuth2Client).get(oauth2_client.id) is None
 
-        oauth2_client_id = dbsession.query(OAuth2Client.id).first().id
-        test_app.delete("/admin/oauth2_clients/{}".format(oauth2_client_id), status=200)
-        assert dbsession.query(OAuth2Client).get(oauth2_client_id) is None
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "oauth2_client"
+        assert log.element_id == oauth2_client.id
+        assert log.element_name == oauth2_client.client_id
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, oauth2_clients_test_data, test_app):
         oauth2_client_proto = oauth2_clients_test_data["oauth2_clients"][7]
-        resp = test_app.get("/admin/oauth2_clients/{}/duplicate".format(oauth2_client_proto.id), status=200)
+        resp = test_app.get(f"/admin/oauth2_clients/{oauth2_client_proto.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(oauth2_client_proto.client_id))
+        self._check_submission_problem(resp, f"{oauth2_client_proto.client_id} is already used.")
 
     @pytest.mark.usefixtures("raise_db_error_on_query")
     def test_grid_dberror(self, dbsession):
         from c2cgeoportal_admin.views.oauth2_clients import OAuth2ClientViews
 
         request = DummyRequest(dbsession=dbsession, params={"offset": 0, "limit": 10})
-        info = OAuth2ClientViews(request).grid()
-        assert info.status_int == 500, "Expected 500 status when db error"
+        with pytest.raises(pyramid.httpexceptions.HTTPInternalServerError):
+            OAuth2ClientViews(request).grid()