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

tests/test_themes.py

@@ -13,33 +13,38 @@ def theme_test_data(dbsession, transact):
     del transact
 
     from c2cgeoportal_commons.models.main import (
-        Theme,
-        Role,
         Functionality,
-        LayergroupTreeitem,
         Interface,
-        Metadata,
         LayerGroup,
+        LayergroupTreeitem,
         LayerWMS,
+        Metadata,
         OGCServer,
+        Role,
+        Theme,
     )
 
     interfaces = [Interface(name) for name in ["desktop", "mobile", "edit", "routing"]]
+    dbsession.add_all(interfaces)
 
-    groups = [LayerGroup(name="layer_group_{}".format(i)) for i in range(0, 5)]
+    groups = [LayerGroup(name=f"layer_group_{i}") for i in range(0, 5)]
+    dbsession.add_all(groups)
 
     layer = LayerWMS(name="layer_wms")
     layer.ogc_server = OGCServer(name="server")
-    dbsession.add(layer)
     layers = [layer]
+    dbsession.add_all(layers)
 
+    # Note that "default_theme" is not relevant for themes
     functionalities = [
-        Functionality(name=name, value="value_{}".format(v))
-        for name in ("default_basemap", "location")
+        Functionality(name=name, value=f"value_{v}")
+        for name in ("default_basemap", "default_theme")
         for v in range(0, 4)
     ]
+    dbsession.add_all(functionalities)
 
     roles = [Role("secretary_" + str(i)) for i in range(0, 4)]
+    dbsession.add_all(roles)
 
     metadatas_protos = [
         ("copyable", "true"),
@@ -48,7 +53,7 @@ def theme_test_data(dbsession, transact):
     ]
     themes = []
     for i in range(0, 25):
-        theme = Theme(name="theme_{}".format(i), ordering=1, icon="icon_{}".format(i))
+        theme = Theme(name=f"theme_{i}", ordering=1, icon=f"icon_{i}")
         theme.public = 1 == i % 2
         theme.interfaces = [interfaces[i % 4], interfaces[(i + 2) % 4]]
         theme.metadatas = [
@@ -57,7 +62,7 @@ def theme_test_data(dbsession, transact):
         ]
         for metadata in theme.metadatas:
             metadata.item = theme
-        theme.functionalities = [functionalities[i % 8], functionalities[(i + 3) % 8]]
+        theme.functionalities = [functionalities[i % 4]]
         theme.restricted_roles = [roles[i % 4], roles[(i + 2) % 4]]
 
         dbsession.add(
@@ -86,7 +91,6 @@ def theme_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("theme_test_data", "test_app")
 class TestTheme(TestTreeGroup):
-
     _prefix = "/admin/themes"
 
     def test_index_rendering(self, test_app):
@@ -117,7 +121,7 @@ class TestTheme(TestTreeGroup):
 
         assert first_theme.id == int(first_row["_id_"])
         assert first_theme.name == first_row["name"]
-        assert "default_basemap=value_0, default_basemap=value_3" == first_row["functionalities"]
+        assert "default_basemap=value_0" == first_row["functionalities"]
         assert "secretary_0, secretary_2" == first_row["restricted_roles"]
         assert "desktop, edit" == first_row["interfaces"]
         assert 'copyable: true, snappingConfig: {"tolerance": 50}' == first_row["metadatas"]
@@ -146,16 +150,18 @@ class TestTheme(TestTreeGroup):
 
     def test_public_checkbox_edit(self, test_app, theme_test_data):
         theme = theme_test_data["themes"][10]
-        form10 = test_app.get("/admin/themes/{}".format(theme.id), status=200).form
+        form10 = test_app.get(f"/admin/themes/{theme.id}", status=200).form
         assert not form10["public"].checked
         theme = theme_test_data["themes"][11]
-        form11 = test_app.get("/admin/themes/{}".format(theme.id), status=200).form
+        form11 = test_app.get(f"/admin/themes/{theme.id}", status=200).form
         assert form11["public"].checked
 
     def test_edit(self, test_app, theme_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         theme = theme_test_data["themes"][0]
 
-        resp = test_app.get("/admin/themes/{}".format(theme.id), status=200)
+        resp = test_app.get(f"/admin/themes/{theme.id}", status=200)
         form = resp.form
 
         assert str(theme.id) == self.get_first_field_named(form, "id").value
@@ -166,21 +172,24 @@ class TestTheme(TestTreeGroup):
         assert theme.public == form["public"].checked
 
         interfaces = theme_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in theme.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in theme.interfaces}
         self._check_interfaces(form, interfaces, theme)
 
         functionalities = theme_test_data["functionalities"]
-        assert set((functionalities[0].id, functionalities[3].id)) == set(f.id for f in theme.functionalities)
+        assert {functionalities[0].id} == {f.id for f in theme.functionalities}
         self.check_checkboxes(
             form,
             "functionalities",
             [
                 {
-                    "label": "{}={}".format(f.name, f.value),
+                    "label": f"{f.name}={f.value}",
                     "value": str(f.id),
                     "checked": f in theme.functionalities,
                 }
-                for f in sorted(functionalities, key=lambda f: (f.name, f.value))
+                for f in sorted(
+                    [f for f in functionalities if f.name in ("default_basemap")],
+                    key=lambda f: (f.name, f.value),
+                )
             ],
         )
 
@@ -220,21 +229,25 @@ class TestTheme(TestTreeGroup):
                 assert value == getattr(theme, key)
             else:
                 assert str(value or "") == str(getattr(theme, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in theme.interfaces]
-        )
-        assert set([functionalities[2].id]) == set(
-            [functionality.id for functionality in theme.functionalities]
-        )
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in theme.interfaces}
+        assert {functionalities[2].id} == {functionality.id for functionality in theme.functionalities}
         assert 0 == len(theme.restricted_roles)
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "theme"
+        assert log.element_id == theme.id
+        assert log.element_name == theme.name
+        assert log.username == "test_user"
+
     def test_post_new_with_children_invalid(self, test_app, theme_test_data):
         """
         Check there is no rendering error when validation fails.
         """
         groups = theme_test_data["groups"]
         resp = test_app.post(
-            "{}/new".format(self._prefix),
+            f"{self._prefix}/new",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -254,9 +267,11 @@ class TestTheme(TestTreeGroup):
         self._check_submission_problem(resp, "Required")
 
     def test_post_new_with_children_success(self, test_app, dbsession, theme_test_data):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         groups = theme_test_data["groups"]
         resp = test_app.post(
-            "{}/new".format(self._prefix),
+            f"{self._prefix}/new",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -298,13 +313,21 @@ class TestTheme(TestTreeGroup):
             rel.treeitem_id for rel in theme.children_relation
         ]
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "theme"
+        assert log.element_id == theme.id
+        assert log.element_name == theme.name
+        assert log.username == "test_user"
+
     def test_post_new_with_child_layer(self, theme_test_data, test_app):
         """
         Check layers are rejected by the validator (also means that they are not proposed to the user).
         """
         layers = theme_test_data["layers"]
         resp = test_app.post(
-            "{}/new".format(self._prefix),
+            f"{self._prefix}/new",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -324,7 +347,7 @@ class TestTheme(TestTreeGroup):
             status=200,
         )
         assert (
-            "Value {} does not exist in table treeitem or is not allowed to avoid cycles".format(layers[0].id)
+            f"Value {layers[0].id} does not exist in table treeitem or is not allowed to avoid cycles"
             == resp.html.select_one(".item-children_relation + .help-block").getText().strip()
         )
 
@@ -333,7 +356,7 @@ class TestTheme(TestTreeGroup):
 
         theme = theme_test_data["themes"][1]
 
-        resp = test_app.get("{}/{}/duplicate".format(self._prefix, theme.id), status=200)
+        resp = test_app.get(f"{self._prefix}/{theme.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -345,22 +368,25 @@ class TestTheme(TestTreeGroup):
         assert theme.public == form["public"].checked
 
         interfaces = theme_test_data["interfaces"]
-        assert set((interfaces[1].id, interfaces[3].id)) == set(i.id for i in theme.interfaces)
+        assert {interfaces[1].id, interfaces[3].id} == {i.id for i in theme.interfaces}
 
         self._check_interfaces(form, interfaces, theme)
 
         functionalities = theme_test_data["functionalities"]
-        assert set((functionalities[1].id, functionalities[4].id)) == set(f.id for f in theme.functionalities)
+        assert {functionalities[1].id} == {f.id for f in theme.functionalities}
         self.check_checkboxes(
             form,
             "functionalities",
             [
                 {
-                    "label": "{}={}".format(f.name, f.value),
+                    "label": f"{f.name}={f.value}",
                     "value": str(f.id),
                     "checked": f in theme.functionalities,
                 }
-                for f in sorted(functionalities, key=lambda f: (f.name, f.value))
+                for f in sorted(
+                    [f for f in functionalities if f.name in ("default_basemap")],
+                    key=lambda f: (f.name, f.value),
+                )
             ],
         )
 
@@ -381,23 +407,31 @@ class TestTheme(TestTreeGroup):
         duplicated = dbsession.query(Theme).filter(Theme.name == "duplicated").one()
 
         assert str(duplicated.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
         assert duplicated.id != theme.id
         assert duplicated.children_relation[0].id != theme.children_relation[0].id
         assert duplicated.children_relation[0].treeitem.id == theme.children_relation[0].treeitem.id
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import Theme
+        from c2cgeoportal_commons.models.main import Log, LogAction, Theme
+
+        theme = dbsession.query(Theme).first()
+        test_app.delete(f"/admin/themes/{theme.id}", status=200)
+        assert dbsession.query(Theme).get(theme.id) is None
 
-        theme_id = dbsession.query(Theme.id).first().id
-        test_app.delete("/admin/themes/{}".format(theme_id), status=200)
-        assert dbsession.query(Theme).get(theme_id) is None
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "theme"
+        assert log.element_id == theme.id
+        assert log.element_name == theme.name
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, theme_test_data, test_app):
         theme = theme_test_data["themes"][1]
-        resp = test_app.get("{}/{}/duplicate".format(self._prefix, theme.id), status=200)
+        resp = test_app.get(f"{self._prefix}/{theme.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(theme.name))
+        self._check_submission_problem(resp, f"{theme.name} is already used.")

tests/test_themes_ordering.py

@@ -14,7 +14,7 @@ def theme_test_data(dbsession, transact):
 
     themes = []
     for i in range(0, 3):
-        theme = Theme(name="theme_{}".format(i), ordering=i, icon="icon_{}".format(i))
+        theme = Theme(name=f"theme_{i}", ordering=i, icon=f"icon_{i}")
 
         dbsession.add(theme)
         themes.append(theme)
@@ -28,7 +28,6 @@ def theme_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("theme_test_data", "test_app")
 class TestThemeOrdering(TestTreeGroup):
-
     _prefix = "/admin/layertree/ordering"
 
     def test_edit(self, test_app, theme_test_data, dbsession):

tests/test_treegroup.py

@@ -5,10 +5,10 @@ from . import AbstractViewsTests
 
 class TestTreeGroup(AbstractViewsTests):
     def check_children(self, form, group, expected):
-        form_group = form.html.select_one(".item-{}".format(group))
+        form_group = form.html.select_one(f".item-{group}")
         items = form_group.select(".deform-seq-item")
         assert len(expected) == len(items)
         for item, exp in zip(items, expected):
             assert exp["label"] == item.select_one(".well").getText().strip()
             for key, value in exp["values"].items():
-                assert value == item.select_one('input[name="{}"]'.format(key))["value"]
+                assert value == item.select_one(f'input[name="{key}"]')["value"]

tests/test_user.py

@@ -4,11 +4,11 @@ import email
 import re
 from unittest.mock import MagicMock, patch
 
-from pyramid.testing import DummyRequest
+import pyramid.httpexceptions
 import pytest
+from pyramid.testing import DummyRequest
 
-from . import AbstractViewsTests, skip_if_ci
-from .selenium.page import IndexPage
+from . import AbstractViewsTests
 
 
 @pytest.fixture(scope="function")
@@ -16,18 +16,18 @@ from .selenium.page import IndexPage
 def users_test_data(dbsession, transact):
     del transact
 
-    from c2cgeoportal_commons.models.static import User
     from c2cgeoportal_commons.models.main import Role
+    from c2cgeoportal_commons.models.static import User
 
     roles = []
     for i in range(0, 4):
-        roles.append(Role("secretary_{}".format(i)))
+        roles.append(Role(f"secretary_{i}"))
         dbsession.add(roles[i])
     users = []
     for i in range(0, 23):
         user = User(
-            "babar_{}".format(i),
-            email="mail{}@valid.net".format(i),
+            f"babar_{i}",
+            email=f"mail{i}@valid.net",
             settings_role=roles[i % 4],
             roles=[roles[i % 4]],
         )
@@ -49,7 +49,6 @@ EXPECTED_WELCOME_MAIL = (
 
 @pytest.mark.usefixtures("users_test_data", "test_app")
 class TestUser(AbstractViewsTests):
-
     _prefix = "/admin/users"
 
     def test_index_rendering(self, test_app):
@@ -61,6 +60,7 @@ class TestUser(AbstractViewsTests):
             ("actions", "", "false"),
             ("id", "id", "true"),
             ("username", "Username"),
+            ("display_name", "Display name", "true"),
             ("email", "Email"),
             ("last_login", "Last login"),
             ("expire_on", "Expiration date"),
@@ -71,20 +71,33 @@ class TestUser(AbstractViewsTests):
 
         self.check_grid_headers(resp, expected)
 
-    @pytest.mark.skip(reason="Translation is not finished")
+    @pytest.mark.skip(reason="Translations seems not available in tests")
     def test_index_rendering_fr(self, test_app):
         resp = self.get(test_app, locale="fr")
 
         self.check_left_menu(resp, "Utilisateurs")
 
-        expected = [("_id_", "", "false"), ("username", "Nom"), ("role_name", "Role"), ("email", "Courriel")]
-        self.check_grid_headers(resp, expected)
+        expected = [
+            ("actions", "", "false"),
+            ("id", "id", "true"),
+            ("username", "Nom d'utilisateur"),
+            ("email", "Email"),
+            ("last_login", "Dernière connection"),
+            ("expire_on", "Date d'expiration"),
+            ("deactivated", "Désactivé"),
+            ("settings_role", "Rôle de configuration"),
+            ("roles", "Rôles", "false"),
+        ]
+        self.check_grid_headers(resp, expected, new="Nouveau")
+
+    def test_view_edit(self, test_app, users_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log
 
-    def test_view_edit(self, test_app, users_test_data):
         user = users_test_data["users"][9]
         roles = users_test_data["roles"]
 
-        resp = test_app.get("/admin/users/{}".format(user.id), status=200)
+        resp = test_app.get(f"/admin/users/{user.id}", status=200)
 
         assert resp.form["username"].value == user.username
         assert resp.form["email"].value == user.email
@@ -111,17 +124,34 @@ class TestUser(AbstractViewsTests):
                 assert value == getattr(user, key)
             else:
                 assert str(value or "") == str(getattr(user, key) or "")
-        assert set([roles[2].id, roles[3].id]) == set([role.id for role in user.roles])
+        assert {roles[2].id, roles[3].id} == {role.id for role in user.roles}
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "user"
+        assert log.element_id == user.id
+        assert log.element_name == user.username
+        assert log.username == "test_user"
 
     def test_delete(self, test_app, users_test_data, dbsession):
-        from c2cgeoportal_commons.models.static import User, user_role
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log, User, user_role
 
         user = users_test_data["users"][9]
         deleted_id = user.id
-        test_app.delete("/admin/users/{}".format(deleted_id), status=200)
+        test_app.delete(f"/admin/users/{deleted_id}", status=200)
         assert dbsession.query(User).get(deleted_id) is None
         assert dbsession.query(user_role).filter(user_role.c.user_id == user.id).count() == 0
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "user"
+        assert log.element_id == user.id
+        assert log.element_name == user.username
+        assert log.username == "test_user"
+
     @patch("c2cgeoportal_commons.lib.email_.smtplib.SMTP")
     @patch("c2cgeoportal_admin.views.users.pwgenerator.generate")
     def test_submit_update(self, pw_gen_mock, smtp_mock, dbsession, test_app, users_test_data):
@@ -129,7 +159,7 @@ class TestUser(AbstractViewsTests):
         roles = users_test_data["roles"]
 
         resp = test_app.post(
-            "/admin/users/{}".format(user.id),
+            f"/admin/users/{user.id}",
             (
                 ("__formid__", "deform"),
                 ("_charset_", "UTF-8"),
@@ -137,6 +167,7 @@ class TestUser(AbstractViewsTests):
                 ("item_type", "user"),
                 ("id", user.id),
                 ("username", "new_name_withéàô"),
+                ("display_name", "New name withéàô"),
                 ("email", "new_mail@valid.net"),
                 ("settings_role_id", roles[2].id),
                 ("__start__", "roles:sequence"),
@@ -146,13 +177,13 @@ class TestUser(AbstractViewsTests):
             ),
             status=302,
         )
-        assert resp.location == "http://localhost/admin/users/{}?msg_col=submit_ok".format(user.id)
+        assert resp.location == f"http://localhost/admin/users/{user.id}?msg_col=submit_ok"
 
         dbsession.expire(user)
         assert user.username == "new_name_withéàô"
         assert user.email == "new_mail@valid.net"
         assert user.settings_role.name == "secretary_2"
-        assert set(r.id for r in user.roles) == set(roles[i].id for i in [0, 3])
+        assert {r.id for r in user.roles} == {roles[i].id for i in [0, 3]}
         assert user.validate_password("pré$ident")
 
         assert not pw_gen_mock.called, "method should not have been called"
@@ -163,7 +194,7 @@ class TestUser(AbstractViewsTests):
         roles = users_test_data["roles"]
 
         resp = test_app.post(
-            "/admin/users/{}".format(user.id),
+            f"/admin/users/{user.id}",
             {
                 "__formid__": "deform",
                 "_charset_": "UTF-8",
@@ -190,7 +221,7 @@ class TestUser(AbstractViewsTests):
         user = users_test_data["users"][7]
         roles = users_test_data["roles"]
 
-        resp = test_app.get("/admin/users/{}/duplicate".format(user.id), status=200)
+        resp = test_app.get(f"/admin/users/{user.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == form["id"].value
@@ -210,7 +241,7 @@ class TestUser(AbstractViewsTests):
         ).group(1)
         assert user.id != new_user.id
         assert user.settings_role_id == new_user.settings_role_id
-        assert set([role.id for role in user.roles]) == set([role.id for role in new_user.roles])
+        assert {role.id for role in user.roles} == {role.id for role in new_user.roles}
         assert not new_user.is_password_changed
         assert not new_user.validate_password("pré$ident")
 
@@ -224,10 +255,12 @@ class TestUser(AbstractViewsTests):
     @patch("c2cgeoportal_admin.views.users.pwgenerator.generate")
     @pytest.mark.usefixtures("test_app")
     def test_submit_new(self, pw_gen_mock, smtp_mock, dbsession, test_app, users_test_data):
+        from c2cgeoportal_commons.models.main import LogAction
+        from c2cgeoportal_commons.models.static import Log, User
+
         sender_mock = MagicMock()
         smtp_mock.return_value = sender_mock
         pw_gen_mock.return_value = "basile"
-        from c2cgeoportal_commons.models.static import User
 
         roles = users_test_data["roles"]
 
@@ -240,6 +273,7 @@ class TestUser(AbstractViewsTests):
                 ("item_type", "user"),
                 ("id", ""),
                 ("username", "new_user"),
+                ("display_name", "New user"),
                 ("email", "valid@email.net"),
                 ("settings_role_id", roles[2].id),
             ),
@@ -253,6 +287,7 @@ class TestUser(AbstractViewsTests):
         ).group(1)
 
         assert user.username == "new_user"
+        assert user.display_name == "New user"
         assert user.email == "valid@email.net"
         assert user.settings_role_id == roles[2].id
         assert user.password is not None and len(user.password)
@@ -266,6 +301,14 @@ class TestUser(AbstractViewsTests):
         ).decode("utf8")
         assert "valid@email.net" == parts[0].items()[3][1]
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "user"
+        assert log.element_id == user.id
+        assert log.element_name == user.username
+        assert log.username == "test_user"
+
     def test_invalid_email(self, test_app):
         resp = test_app.post(
             "/admin/users/new",
@@ -276,6 +319,7 @@ class TestUser(AbstractViewsTests):
                 "item_type": "user",
                 "id": "",
                 "username": "invalid_email",
+                "display_name": "Invalid email",
                 "email": "new_mail",
                 "role_name": "secretary_2",
                 "is_password_changed": "false",
@@ -291,56 +335,14 @@ class TestUser(AbstractViewsTests):
         from c2cgeoportal_admin.views.users import UserViews
 
         request = DummyRequest(dbsession=dbsession, params={"offset": 0, "limit": 10})
-        info = UserViews(request).grid()
-        assert info.status_int == 500, "Expected 500 status when db error"
+        with pytest.raises(pyramid.httpexceptions.HTTPInternalServerError):
+            UserViews(request).grid()
 
     def test_grid_settings_role_none(self, dbsession, test_app):
-        """Grid view must work even if a user's settings_role is None"""
+        """
+        Grid view must work even if a user's settings_role is None.
+        """
         from c2cgeoportal_commons.models.static import User
 
         dbsession.add(User("test", email="test@valid.net"))
         self.check_search(test_app, "test", total=1)
-
-
-@skip_if_ci
-@pytest.mark.selenium
-@pytest.mark.usefixtures("selenium", "selenium_app", "users_test_data")
-class TestUserSelenium:
-
-    _prefix = "/admin/users"
-
-    def test_index(self, selenium, selenium_app, users_test_data, dbsession):
-        from c2cgeoportal_commons.models.static import User
-
-        selenium.get(selenium_app + self._prefix)
-
-        index_page = IndexPage(selenium)
-        index_page.select_language("en")
-        index_page.check_pagination_info("Showing 1 to 23 of 23 rows", 10)
-        index_page.select_page_size(10)
-        index_page.check_pagination_info("Showing 1 to 10 of 23 rows", 10)
-
-        # delete
-        user = users_test_data["users"][3]
-        deleted_id = user.id
-        index_page.click_delete(deleted_id)
-        index_page.check_pagination_info("Showing 1 to 10 of 22 rows", 10)
-        assert dbsession.query(User).get(deleted_id) is None
-
-        # edit
-        user = users_test_data["users"][4]
-        index_page.find_item_action(user.id, "edit").click()
-
-        elem = selenium.find_element_by_xpath("//input[@name ='username']")
-        elem.clear()
-        elem.send_keys("new_name_éôù")
-        elem = selenium.find_element_by_xpath("//input[@name ='email']")
-        elem.clear()
-        elem.send_keys("new_email@valid.net")
-        elem = selenium.find_element_by_xpath("//button[@name='formsubmit']")
-        elem.click()
-
-        user = dbsession.query(User).filter(User.id == user.id).one()
-        dbsession.expire(user)
-        assert user.username == "new_name_éôù"
-        assert user.email == "new_email@valid.net"

tests/themes_ordering.py

@@ -14,7 +14,7 @@ def themes_ordering_test_data(dbsession, transact):
 
     themes = []
     for i in range(0, 25):
-        theme = Theme(name="theme_{}".format(i), ordering=100)
+        theme = Theme(name=f"theme_{i}", ordering=100)
         dbsession.add(theme)
         themes.append(theme)
 
@@ -25,7 +25,6 @@ def themes_ordering_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("themes_ordering_test_data", "test_app")
 class TestThemesOrdering(TestTreeGroup):
-
     _prefix = "/admin/layertree/ordering"
 
     def test_edit(self, test_app, themes_ordering_test_data):

c2cgeoportal_admin/templates/navigation_vertical.jinja2

@@ -1,10 +0,0 @@
-<ul id="main-menu" class="nav nav-pills nav-stacked">
-  <li role="presentation" class="{{'active' if request.matched_route.name == 'layertree' else ''}}">
-    <a href="{{request.route_url('layertree')}}">{{_("Layer tree")}}</a>
-  </li>
-  {% for table in tables %}
-  <li role="presentation" class="{{'active' if request.matchdict and request.matchdict.get('table') == table['key'] else ''}}">
-    <a href="{{request.route_url('c2cgeoform_index', table=table['key'])}}">{{table['plural']}}</a>
-  </li>
-  {% endfor %}
-</ul>