c2cgeoportal-admin 2.5.0.100__py3-none-any.whl → 2.7.1.156__py3-none-any.whl

tests/test_interface.py

@@ -12,18 +12,18 @@ from . import AbstractViewsTests
 def interface_test_data(dbsession, transact):
     del transact
 
-    from c2cgeoportal_commons.models.main import Interface, Theme, OGCServer, LayerWMS
+    from c2cgeoportal_commons.models.main import Interface, LayerWMS, OGCServer, Theme
 
     themes = []
     for i in range(0, 5):
-        theme = Theme(name="theme_{}".format(i), ordering=1)
+        theme = Theme(name=f"theme_{i}", ordering=1)
         themes.append(theme)
 
-    servers = [OGCServer(name="server_{}".format(i)) for i in range(0, 4)]
+    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
 
     layers = []
     for i in range(0, 15):
-        layer = LayerWMS(name="layer_wms_{}".format(i))
+        layer = LayerWMS(name=f"layer_wms_{i}")
         layer.public = 1 == i % 2
         layer.ogc_server = servers[i % 4]
         dbsession.add(layer)
@@ -31,7 +31,7 @@ def interface_test_data(dbsession, transact):
 
     interfaces = []
     for i in range(0, 5):
-        interface = Interface(name="interface_{}".format(i), description="description_{}".format(i))
+        interface = Interface(name=f"interface_{i}", description=f"description_{i}")
         interface.themes = [themes[i % 2], themes[(i + 5) % 5]]
         interface.layers = [layers[i % 2], layers[(i + 4) % 5]]
 
@@ -101,7 +101,7 @@ class TestInterface(AbstractViewsTests):
         descriptions = "{}, {}".format(
             interface_test_data["interfaces"][0].description, interface_test_data["interfaces"][1].description
         )
-        resp = test_app.get("/admin/interfaces/{}".format(interface.id), status=200)
+        resp = test_app.get(f"/admin/interfaces/{interface.id}", status=200)
         form = resp.form
         form["description"] = descriptions
         assert str(interface.id) == self.get_first_field_named(form, "id").value
@@ -114,12 +114,12 @@ class TestInterface(AbstractViewsTests):
         from c2cgeoportal_commons.models.main import Interface
 
         interface = interface_test_data["interfaces"][0]
-        test_app.delete("/admin/interfaces/{}".format(interface.id), status=200)
+        test_app.delete(f"/admin/interfaces/{interface.id}", status=200)
         assert len(dbsession.query(Interface).filter(Interface.id == interface.id).all()) == 0
 
     def test_duplicate(self, interface_test_data, test_app):
         interface = interface_test_data["interfaces"][3]
-        resp = test_app.get("/admin/interfaces/{}/duplicate".format(interface.id), status=200)
+        resp = test_app.get(f"/admin/interfaces/{interface.id}/duplicate", status=200)
         form = resp.form
         assert "" == self.get_first_field_named(form, "id").value
         assert str(interface.description or "") == "description_3"

tests/test_layer_groups.py

@@ -12,7 +12,7 @@ from .test_treegroup import TestTreeGroup
 def layer_groups_test_data(dbsession, transact):
     del transact
 
-    from c2cgeoportal_commons.models.main import LayerGroup, Metadata, LayergroupTreeitem
+    from c2cgeoportal_commons.models.main import LayerGroup, LayergroupTreeitem, Metadata
 
     metadatas_protos = [
         ("copyable", "true"),
@@ -22,7 +22,7 @@ def layer_groups_test_data(dbsession, transact):
 
     groups = []
     for i in range(0, 12):
-        group = LayerGroup(name="groups_{num:02d}".format(num=i), is_expanded=False)
+        group = LayerGroup(name=f"groups_{i:02d}")
         group.metadatas = [
             Metadata(name=metadatas_protos[id][0], value=metadatas_protos[id][1])
             for id in [i % 3, (i + 2) % 3]
@@ -73,7 +73,6 @@ class TestLayersGroups(TestTreeGroup):
             ("id", "id", "true"),
             ("name", "Name"),
             ("description", "Description"),
-            ("is_expanded", "Expanded"),
             ("parents_relation", "Parents", "false"),
             ("metadatas", "Metadatas", "false"),
         ]
@@ -90,10 +89,6 @@ class TestLayersGroups(TestTreeGroup):
         assert "groups_02, groups_06" == row["parents_relation"]
         assert "disclaimer: © le momo, copyable: true" == row["metadatas"]
 
-    @pytest.mark.skip(reason="use value to be defined")
-    def test_grid_filter_on_parents(self, test_app):
-        self.check_search(test_app, "groups_11", total=4)
-
     def test_grid_search(self, test_app):
         # search on metadatas
         self.check_search(test_app, "copyable", total=8)
@@ -107,8 +102,6 @@ class TestLayersGroups(TestTreeGroup):
         assert "hidden" == self.get_first_field_named(form, "id").attrs["type"]
         assert group.name == self.get_first_field_named(form, "name").value
         assert str(group.description or "") == self.get_first_field_named(form, "description").value
-        assert group.is_expanded is False
-        assert group.is_expanded == form["is_expanded"].checked
 
         self.check_children(
             form,
@@ -125,7 +118,6 @@ class TestLayersGroups(TestTreeGroup):
         new_values = {
             "name": "new_name",
             "description": "new description",
-            "is_expanded": True,
         }
         for key, value in new_values.items():
             self.set_first_field_named(form, key, value)
@@ -148,7 +140,7 @@ class TestLayersGroups(TestTreeGroup):
         """
         groups = layer_groups_test_data["groups"]
         resp = test_app.post(
-            "{}/new".format(self._prefix),
+            f"{self._prefix}/new",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -169,7 +161,7 @@ class TestLayersGroups(TestTreeGroup):
     def test_post_new_with_children_success(self, test_app, dbsession, layer_groups_test_data):
         groups = layer_groups_test_data["groups"]
         resp = test_app.post(
-            "{}/new".format(self._prefix),
+            f"{self._prefix}/new",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -211,10 +203,12 @@ class TestLayersGroups(TestTreeGroup):
         ]
 
     def test_post_with_ancestor(self, layer_groups_test_data, test_app):
-        """Check that ancestors are refused to avoid cycles"""
+        """
+        Check that ancestors are refused to avoid cycles.
+        """
         groups = layer_groups_test_data["groups"]
         resp = test_app.post(
-            "{}/{}".format(self._prefix, groups[3].id),
+            f"{self._prefix}/{groups[3].id}",
             (
                 ("_charset_", "UTF-8"),
                 ("__formid__", "deform"),
@@ -232,7 +226,7 @@ class TestLayersGroups(TestTreeGroup):
             status=200,
         )
         assert (
-            "Value {} does not exist in table treeitem or is not allowed to avoid cycles".format(groups[1].id)
+            f"Value {groups[1].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()
         )
 
@@ -241,7 +235,7 @@ class TestLayersGroups(TestTreeGroup):
 
         group = layer_groups_test_data["groups"][1]
 
-        resp = test_app.get("{}/{}/duplicate".format(self._prefix, group.id), status=200)
+        resp = test_app.get(f"{self._prefix}/{group.id}/duplicate", status=200)
         form = resp.form
 
         group = dbsession.query(LayerGroup).filter(LayerGroup.id == group.id).one()
@@ -249,8 +243,6 @@ class TestLayersGroups(TestTreeGroup):
         assert "" == self.get_first_field_named(form, "id").value
         assert group.name == self.get_first_field_named(form, "name").value
         assert str(group.description or "") == self.get_first_field_named(form, "description").value
-        assert group.is_expanded is False
-        assert group.is_expanded == form["is_expanded"].checked
 
         self.check_children(
             form,
@@ -267,7 +259,7 @@ class TestLayersGroups(TestTreeGroup):
         duplicated = dbsession.query(LayerGroup).filter(LayerGroup.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 != group.id
         assert duplicated.children_relation[0].id != group.children_relation[0].id
@@ -275,14 +267,14 @@ class TestLayersGroups(TestTreeGroup):
 
     def test_unicity_validator(self, layer_groups_test_data, test_app):
         group = layer_groups_test_data["groups"][1]
-        resp = test_app.get("{}/{}/duplicate".format(self._prefix, group.id), status=200)
+        resp = test_app.get(f"{self._prefix}/{group.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(group.name))
+        self._check_submission_problem(resp, f"{group.name} is already used.")
 
     def test_delete(self, test_app, dbsession, layer_groups_test_data):
-        from c2cgeoportal_commons.models.main import LayerGroup, TreeGroup, TreeItem, LayergroupTreeitem
+        from c2cgeoportal_commons.models.main import LayerGroup, LayergroupTreeitem, TreeGroup, TreeItem
 
         group_id = layer_groups_test_data["groups"][9].id
 
@@ -296,7 +288,7 @@ class TestLayersGroups(TestTreeGroup):
             == dbsession.query(LayergroupTreeitem).filter(LayergroupTreeitem.treeitem_id == group_id).count()
         )
 
-        test_app.delete("/admin/layer_groups/{}".format(group_id), status=200)
+        test_app.delete(f"/admin/layer_groups/{group_id}", status=200)
 
         dbsession.expire_all()
 

tests/test_layers_vectortiles.py

@@ -14,13 +14,13 @@ def layer_vectortiles_test_data(dbsession, transact):
 
     from c2cgeoportal_commons.models.main import LayerVectorTiles, OGCServer
 
-    servers = [OGCServer(name="server_{}".format(i)) for i in range(0, 4)]
+    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
     for i, server in enumerate(servers):
-        server.url = "http://wms.geo.admin.ch_{}".format(i)
+        server.url = f"http://wms.geo.admin.ch_{i}"
         server.image_type = "image/jpeg" if i % 2 == 0 else "image/png"
 
     def layer_builder(i):
-        name = "layer_vectortiles_{}".format(i)
+        name = f"layer_vectortiles_{i}"
         layer = LayerVectorTiles(name=name)
         layer.layer = name
         layer.public = 1 == i % 2
@@ -28,12 +28,12 @@ def layer_vectortiles_test_data(dbsession, transact):
         layer.xyz = "https://vectortiles-staging.geoportail.lu/styles/roadmap/{z}/{x}/{y}.png"
         return layer
 
-    datas = factory_build_layers(layer_builder, dbsession)
-    datas["default"] = get_test_default_layers(dbsession, server)
+    data = factory_build_layers(layer_builder, dbsession)
+    data["default"] = get_test_default_layers(dbsession, server)
 
     dbsession.flush()
 
-    yield datas
+    yield data
 
 
 @pytest.mark.usefixtures("layer_vectortiles_test_data", "test_app")
@@ -85,10 +85,8 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert "" == self.get_first_field_named(form, "style").value
         assert "" == self.get_first_field_named(form, "xyz").value
 
-    @pytest.mark.skip(reason="Not working now")
     def test_grid_search(self, test_app):
-        # check search on name
-        self.check_search(test_app, "layer_vectortiles_1", total=1)
+        self.check_search(test_app, "layer_vectortiles_10", total=1)
 
     def test_base_edit(self, test_app, layer_vectortiles_test_data):
         layer = layer_vectortiles_test_data["layers"][10]
@@ -124,11 +122,11 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert str(layer.xyz or "") == form["xyz"].value
 
         interfaces = layer_vectortiles_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_vectortiles_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -148,7 +146,7 @@ class TestLayerVectortiles(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.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)
 
         dbsession.expire(layer)
@@ -157,10 +155,8 @@ class TestLayerVectortiles(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in layer.interfaces}
+        assert {ras[1].id, ras[3].id} == {ra.id for ra in layer.restrictionareas}
 
     def test_submit_new(self, dbsession, test_app, layer_vectortiles_test_data):
         from c2cgeoportal_commons.models.main import LayerVectorTiles
@@ -187,7 +183,7 @@ class TestLayerVectortiles(AbstractViewsTests):
 
         layer = layer_vectortiles_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_vectortiles/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_vectortiles/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -200,7 +196,7 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert str(layer.style or "") == form["style"].value
         assert str(layer.xyz or "") == form["xyz"].value
         interfaces = layer_vectortiles_test_data["interfaces"]
-        assert set((interfaces[3].id, interfaces[1].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[3].id, interfaces[1].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         self.set_first_field_named(form, "name", "clone")
@@ -216,11 +212,11 @@ class TestLayerVectortiles(AbstractViewsTests):
         assert layer_vectortiles_test_data["layers"][3].metadatas[1].name == layer.metadatas[1].name
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerVectorTiles, Layer, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerVectorTiles, TreeItem
 
         layer_id = dbsession.query(LayerVectorTiles.id).first().id
 
-        test_app.delete("/admin/layers_vectortiles/{}".format(layer_id), status=200)
+        test_app.delete(f"/admin/layers_vectortiles/{layer_id}", status=200)
 
         assert dbsession.query(LayerVectorTiles).get(layer_id) is None
         assert dbsession.query(Layer).get(layer_id) is None

tests/test_layers_wms.py

@@ -3,10 +3,8 @@
 import re
 
 import pytest
-from selenium.webdriver.common.by import By
 
-from . import AbstractViewsTests, factory_build_layers, get_test_default_layers, skip_if_ci
-from .selenium.page import IndexPage
+from . import AbstractViewsTests, factory_build_layers, get_test_default_layers
 
 
 @pytest.fixture(scope="function")
@@ -16,27 +14,27 @@ def layer_wms_test_data(dbsession, transact):
 
     from c2cgeoportal_commons.models.main import LayerWMS, OGCServer
 
-    servers = [OGCServer(name="server_{}".format(i)) for i in range(0, 4)]
+    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
     for i, server in enumerate(servers):
-        server.url = "http://wms.geo.admin.ch_{}".format(i)
+        server.url = f"http://wms.geo.admin.ch_{i}"
         server.image_type = "image/jpeg" if i % 2 == 0 else "image/png"
 
     def layer_builder(i):
-        layer = LayerWMS(name="layer_wms_{}".format(i))
-        layer.layer = "layer_{}".format(i)
+        layer = LayerWMS(name=f"layer_wms_{i}")
+        layer.layer = f"layer_{i}"
         layer.public = 1 == i % 2
-        layer.geo_table = "geotable_{}".format(i)
+        layer.geo_table = f"geotable_{i}"
         layer.ogc_server = servers[i % 4]
         layer.style = "décontrasté"
         return layer
 
-    datas = factory_build_layers(layer_builder, dbsession)
-    datas["servers"] = servers
-    datas["default"] = get_test_default_layers(dbsession, servers[1])
+    data = factory_build_layers(layer_builder, dbsession)
+    data["servers"] = servers
+    data["default"] = get_test_default_layers(dbsession, servers[1])
 
     dbsession.flush()
 
-    yield datas
+    yield data
 
 
 @pytest.mark.usefixtures("layer_wms_test_data", "test_app")
@@ -57,11 +55,13 @@ class TestLayerWMSViews(AbstractViewsTests):
             ("public", "Public"),
             ("geo_table", "Geo table"),
             ("exclude_properties", "Exclude properties"),
+            ("ogc_server", "OGC server"),
             ("layer", "WMS layer name"),
             ("style", "Style"),
+            ("valid", "Valid"),
+            ("invalid_reason", "Reason why I am not valid"),
             ("time_mode", "Time mode"),
             ("time_widget", "Time widget"),
-            ("ogc_server", "OGC server"),
             ("dimensions", "Dimensions", "false"),
             ("interfaces", "Interfaces"),
             ("restrictionareas", "Restriction areas", "false"),
@@ -173,11 +173,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_widget) == form["time_widget"].value
 
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -200,7 +200,7 @@ class TestLayerWMSViews(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.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)
 
         dbsession.expire(layer)
@@ -209,10 +209,8 @@ class TestLayerWMSViews(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in layer.interfaces}
+        assert {ras[1].id, ras[3].id} == {ra.id for ra in layer.restrictionareas}
 
     def test_submit_new(self, dbsession, test_app, layer_wms_test_data):
         from c2cgeoportal_commons.models.main import LayerWMS
@@ -244,7 +242,7 @@ class TestLayerWMSViews(AbstractViewsTests):
 
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -260,11 +258,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_mode) == form["time_mode"].value
         assert str(layer.time_widget) == form["time_widget"].value
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[3].id, interfaces[1].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[3].id, interfaces[1].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[3].id, ras[0].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[3].id, ras[0].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         self._check_dimensions(resp.html, layer.dimensions, duplicated=True)
@@ -282,19 +280,16 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert layer_wms_test_data["layers"][3].metadatas[1].name == layer.metadatas[1].name
 
     def test_convert_common_fields_copied(self, layer_wms_test_data, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS, LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, LayerWMTS
 
         layer = layer_wms_test_data["layers"][3]
 
         assert 0 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 1 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         assert 1 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 0 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
@@ -328,23 +323,17 @@ class TestLayerWMSViews(AbstractViewsTests):
     def test_convert_image_type_from_ogcserver(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/png" == resp.form["image_type"].value
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/jpeg" == resp.form["image_type"].value
@@ -354,25 +343,25 @@ class TestLayerWMSViews(AbstractViewsTests):
 
         dbsession.delete(LayerWMTS.get_default(dbsession))
         layer = layer_wms_test_data["layers"][3]
-        test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
 
     def test_unicity_validator(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(layer.name))
+        self._check_submission_problem(resp, f"{layer.name} is already used.")
 
     def test_unicity_validator_does_not_matter_amongst_cousin(self, layer_wms_test_data, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS, LayerGroup
+        from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS
 
         assert 1 == dbsession.query(LayerGroup).filter(LayerGroup.name == "layer_group_0").count()
 
         assert dbsession.query(LayerWMS).filter(LayerWMS.name == "layer_group_0").one_or_none() is None
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         self.set_first_field_named(resp.form, "name", "layer_group_0")
         resp = resp.form.submit("submit")
 
@@ -382,18 +371,17 @@ class TestLayerWMSViews(AbstractViewsTests):
         # assert str(layer.id) == re.match('http://localhost/admin/layers_wms/(.*)', resp.location).group(1)
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS, Layer, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerWMS, TreeItem
 
         layer_id = dbsession.query(LayerWMS.id).first().id
 
-        test_app.delete("/admin/layers_wms/{}".format(layer_id), status=200)
+        test_app.delete(f"/admin/layers_wms/{layer_id}", status=200)
 
         assert dbsession.query(LayerWMS).get(layer_id) is None
         assert dbsession.query(Layer).get(layer_id) is None
         assert dbsession.query(TreeItem).get(layer_id) is None
 
-    @pytest.mark.skip(reason="Contraint has to be added at model side, alambiced")
-    def test_submit_new_no_layer_name(self, test_app):
+    def test_submit_new_no_layer_name(self, test_app, layer_wms_test_data):
         resp = test_app.post(
             "/admin/layers_wms/new",
             {
@@ -418,31 +406,5 @@ class TestLayerWMSViews(AbstractViewsTests):
             "Errors have been highlighted below" == resp.html.select_one('div[class="error-msg-detail"]').text
         )
         assert ["WMS layer name"] == sorted(
-            [(x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")]
+            (x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")
         )
-
-
-@skip_if_ci
-@pytest.mark.selenium
-@pytest.mark.usefixtures("selenium", "selenium_app", "layer_wms_test_data")
-class TestLayerWMSSelenium:
-
-    _prefix = "/admin/layers_wms"
-
-    def test_index(self, selenium, selenium_app, layer_wms_test_data):
-        selenium.get(selenium_app + self._prefix)
-
-        layer = layer_wms_test_data["layers"][5]
-        index_page = IndexPage(selenium)
-        index_page.select_language("en")
-        index_page.check_pagination_info("Showing 1 to 25 of 26 rows", 10)
-        index_page.select_page_size(10)
-        index_page.check_pagination_info("Showing 1 to 10 of 26 rows", 10)
-        index_page.wait_jquery_to_be_active()
-
-        el = index_page.find_element(
-            By.XPATH, '//td[contains(text(),"{}")]'.format(layer.geo_table), timeout=5
-        )
-        index_page.dbl_click(el)
-
-        assert selenium.current_url.endswith("/admin/layers_wms/{}".format(layer.id))