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

c2cgeoportal_admin/widgets.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2018-2020, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,12 +25,16 @@
 # of the authors and should not be interpreted as representing official policies,
 # either expressed or implied, of the FreeBSD Project.
 
+from typing import Any, Optional
 
 import colander
+import pyramid.request
 from colander import Mapping, SchemaNode
 from deform import widget
 from deform.widget import MappingWidget, SequenceWidget
 
+from c2cgeoportal_commons.models.main import TreeItem
+
 registry = widget.default_resource_registry
 registry.set_js_resources(
     "magicsuggest", None, "c2cgeoportal_admin:node_modules/magicsuggest-alpine/magicsuggest-min.js"
@@ -52,51 +54,100 @@ widget.DateTimeInputWidget._pstruct_schema = SchemaNode(  # pylint: disable=prot
 )
 
 
-class ChildWidget(MappingWidget):
+class ChildWidget(MappingWidget):  # type: ignore
+    """
+    Extension of the widget ````deform.widget.MappingWidget``.
 
-    template = "child"
+    To be used in conjunction with ChildrenWidget, to manage n-m relationships.
 
-    def serialize(self, field, cstruct, **kw):
-        from c2cgeoportal_commons.models.main import TreeItem  # pylint: disable=import-outside-toplevel
+    Do not embed complete children forms, but just an hidden input for child primary key.
 
-        if cstruct["treeitem_id"] == colander.null:
-            kw["treeitem"] = TreeItem()
-        else:
-            kw["treeitem"] = field.schema.dbsession.query(TreeItem).get(int(cstruct["treeitem_id"]))
-        return super().serialize(field, cstruct, **kw)
+    **Attributes/Arguments**
+
+    input_name (required)
+        Form input name namely the name of the schema field identifying the child in the relation.
+
+    model (required)
+        The child model class.
+
+    label_field (required)
+        The name of the field used for display.
+
+    icon_class (optional)
+        A function which takes a child as parameter and returns a CSS class.
 
+    edit_url (optional)
+        A function taking request and child as parameter and returning
+        an URL to the corresponding resource.
 
-class ThemeOrderWidget(MappingWidget):
+    For further attributes, please refer to the documentation of
+    ``deform.widget.MappingWidget`` in the deform documentation:
+    <https://deform.readthedocs.org/en/latest/api.html>
+    """
 
     template = "child"
+    input_name = "treeitem_id"
+    model = TreeItem
+    label_field = "name"
 
-    def serialize(self, field, cstruct, **kw):
-        from c2cgeoportal_commons.models.main import TreeItem  # pylint: disable=import-outside-toplevel
+    def icon_class(self, child: Any) -> Optional[str]:  # pylint: disable=no-self-use,useless-return
+        del child
+        return None
+
+    def edit_url(  # pylint: disable=no-self-use,useless-return
+        self, request: pyramid.request.Request, child: Any
+    ) -> Optional[str]:
+        del request
+        del child
+        return None
 
-        if cstruct["id"] == colander.null:
-            kw["treeitem"] = TreeItem()
+    def serialize(self, field, cstruct, **kw):
+        if cstruct[self.input_name] == colander.null:
+            kw["child"] = self.model()
         else:
-            kw["treeitem"] = field.schema.dbsession.query(TreeItem).get(int(cstruct["id"]))
+            kw["child"] = field.schema.dbsession.query(self.model).get(int(cstruct[self.input_name]))
         return super().serialize(field, cstruct, **kw)
 
 
-class ChildrenWidget(SequenceWidget):
+class ChildrenWidget(SequenceWidget):  # type: ignore
+    """
+    Extension of the widget ````deform.widget.SequenceWidget``.
+
+    To be used in conjunction with ChildWidget, to manage n-m relationships.
+
+    Use Magicsuggest for searching into parent schema candidates property, which should be a list of
+    dictionaries of the form:
+    {
+        "id": "Value to be set in child identifier input (child_input_name)",
+        "label": "The text to display in MagicSuggest",
+        "icon_class": "An optional icon class for the MagisSuggest entries",
+        "edit_url": "An optional url to edit the child resource",
+        "group": "An optional group name for grouping entries in MagicSuggest",
+    }
+
+    **Attributes/Arguments**
+
+    child_input_name (required)
+        The name of the child input to fill with selected child primary key.
+
+    For further attributes, please refer to the documentation of
+    ``deform.widget.SequenceWidget`` in the deform documentation:
+    <https://deform.readthedocs.org/en/latest/api.html>
+    """
 
     template = "children"
+    category = "structural"
     add_subitem = True
+    orderable = True
+    child_input_name = "treeitem_id"
     requirements = SequenceWidget.requirements + (("magicsuggest", None),)
 
-    def __init__(self, **kw):
-        SequenceWidget.__init__(self, orderable=True, **kw)
-
     def deserialize(self, field, pstruct):
-        for i, dict_ in enumerate(pstruct):
-            dict_["ordering"] = str(i)
+        if self.orderable and pstruct != colander.null:
+            for i, dict_ in enumerate(pstruct):
+                dict_["ordering"] = str(i)
         return super().deserialize(field, pstruct)
 
     def serialize(self, field, cstruct, **kw):
-        kw["treeitems"] = [
-            {"id": item.id, "name": item.name, "item_type": item.item_type, "group": group}
-            for item, group in field.schema.treeitems
-        ]
+        kw["candidates"] = field.schema.candidates
         return super().serialize(field, cstruct, **kw)

{c2cgeoportal_admin-2.5.0.100.dist-info → c2cgeoportal_admin-2.7.1.156.dist-info}/METADATA

@@ -1,19 +1,22 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-admin
-Version: 2.5.0.100
+Version: 2.7.1.156
 Summary: c2cgeoportal admin
-Home-page: https://www.camptocamp.com/solutions/geospatial/
+Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp
 Author-email: info@camptocamp.com
-License: UNKNOWN
-Platform: UNKNOWN
+Keywords: web gis geoportail c2cgeoportal geocommune pyramid
+Classifier: Development Status :: 6 - Mature
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Pyramid
+Classifier: Intended Audience :: Other Audience
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Framework :: Pyramid
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Topic :: Scientific/Engineering :: GIS
+Classifier: Typing :: Typed
 Description-Content-Type: text/markdown
 Requires-Dist: c2cgeoform
 Requires-Dist: c2cwsgiutils
@@ -28,6 +31,10 @@ Requires-Dist: pyramid-tm
 Requires-Dist: sqlalchemy
 Requires-Dist: zope.event
 Requires-Dist: translationstring
+Requires-Dist: jinja2 (>=2.11.3)
+Requires-Dist: pygments (>=2.7.4)
+Requires-Dist: setuptools (>=65.5.1)
+Requires-Dist: requests (>=2.31.0)
 
 # c2cgeoportal admin interface
 
@@ -41,5 +48,3 @@ make serve
 ```
 
 Now open http://localhost:8888/ in your favorite browser.
-
-

c2cgeoportal_admin-2.7.1.156.dist-info/RECORD

@@ -0,0 +1,92 @@
+c2cgeoportal_admin/__init__.py,sha256=4UYLGCcfxd8mfHojIalTFmaYNgD67WFbgVhw2sl5yok,4959
+c2cgeoportal_admin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/routes.py,sha256=So17Lj2v8UigkxVwfYJrK_piDejRkvekPiFibyr3qiw,4676
+c2cgeoportal_admin/subscribers.py,sha256=P1CaccDTpuxrWak_gMN2qBurz3OrAZ6aZ1LA7P3avu8,2430
+c2cgeoportal_admin/widgets.py,sha256=tW6brDW-95LuRnSsRd_8xVRKNAkwkYtdi8zQ44TBj18,6132
+c2cgeoportal_admin/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/lib/lingua_extractor.py,sha256=Dw4vo46TcUnJ7vvxgFezPYidfEdL2pHJUM0qxAaJ1KE,3380
+c2cgeoportal_admin/lib/ogcserver_synchronizer.py,sha256=NuCV8EpUso01to2PYbh6NpXPcD702pQOSslah__Bzus,15421
+c2cgeoportal_admin/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/schemas/dimensions.py,sha256=rPMEuIdGiVGS5e0xqXUu-COVKlrWg9rpp-xe-8aHbOQ,2290
+c2cgeoportal_admin/schemas/functionalities.py,sha256=AptqKn2oyy74qivzihNfeNvmaDILsl36bSoJdSNXh9Y,3941
+c2cgeoportal_admin/schemas/interfaces.py,sha256=0NCRDZOqbw7Bwj-l3GNsVwYDHck4F0q1fCSo1kTYoOY,2578
+c2cgeoportal_admin/schemas/metadata.py,sha256=px0Teh0vtyimQfzL7zXHXIEkWtBbD00OsadfDDeqSkY,8991
+c2cgeoportal_admin/schemas/restriction_areas.py,sha256=48hFUgFznl_1bYsl490YSXLbXfjCY_f6gURQtB_7eIk,2598
+c2cgeoportal_admin/schemas/roles.py,sha256=4JJrgZNKsj_wru_YGOWxZTEXGVm0hahbAkYf2aePGzI,2507
+c2cgeoportal_admin/schemas/treegroup.py,sha256=-s_aKAzwYwS9zVsuqQAp_7M_-c00LVq-R6dC8BiUWk0,7039
+c2cgeoportal_admin/schemas/treeitem.py,sha256=qnjrLd2LD7NCBjXqzw7aRn83cw_hYZbepJdLzOz0rBk,2117
+c2cgeoportal_admin/static/layertree.css,sha256=tk54KGW0yRRmdrY35gOCZG3qTsqWtGNEwvBYPQKhaVs,3177
+c2cgeoportal_admin/static/navbar.css,sha256=QIaAQsb4n17OfwdKEQdmNDVPCP23Yu-oGW4xsSaHyW0,2307
+c2cgeoportal_admin/static/theme.css,sha256=eHtBEJcBtDhyZJvCKNxE5hgril0VpLtcDKfNFdgCSVw,2025
+c2cgeoportal_admin/templates/404.jinja2,sha256=F05OZUzJljcieoCFMP7Oz1F6Jb-VZ06hTOSc9mrb87g,1420
+c2cgeoportal_admin/templates/edit.jinja2,sha256=rkBQiz0JZdL7VDq8XrhRLTv6JaiFt_QB8CwP3NMHWQY,1302
+c2cgeoportal_admin/templates/home.jinja2,sha256=WDQwmBGMZxsiOLw9YeYPLuca_mjjntjrTh529euzd1o,1516
+c2cgeoportal_admin/templates/index.jinja2,sha256=HPgilbqh5dv-yc_T_bc1hV2DEtV2wD617_aAERC2VSk,2005
+c2cgeoportal_admin/templates/layertree.jinja2,sha256=1ys5XDY3nb4gAu8JazkwSFeJUdGRadT7WaBuvin_hYg,9830
+c2cgeoportal_admin/templates/layout.jinja2,sha256=KCDwATUYBu-ZXv7ijo0S0PlTmKtU-JxW8gMhvPA_kAE,4105
+c2cgeoportal_admin/templates/navigation_navbar.jinja2,sha256=XzVQDpo3ClIiRxWf5eDULHZi9u-veYOmndiE_Twqxog,4166
+c2cgeoportal_admin/templates/ogcserver_synchronize.jinja2,sha256=rdQfbHBzrV5VUq5TC97QR7pv8bRvrdKaUUZpnQyldoE,4327
+c2cgeoportal_admin/templates/widgets/child.pt,sha256=JjxI0oVADhS3SoFgg0iN8P4ca1I_UGr7fWRp3wpZXsE,2159
+c2cgeoportal_admin/templates/widgets/children.pt,sha256=0TPpatvmZcU2TxbcZMjDz8VQcLGtoHkuDJ-eAGvjXho,6625
+c2cgeoportal_admin/templates/widgets/dimension.pt,sha256=1BXmE7s9JpzaJSHAQEtZk0DHB11pQ4FNQPaG_4c8CYo,2627
+c2cgeoportal_admin/templates/widgets/dimensions.pt,sha256=LjWjsgdcFYZxpB_30-3NOfvq5KYkKTu49F-P-r9d5Jg,1211
+c2cgeoportal_admin/templates/widgets/functionality_fields.pt,sha256=8TvwXCmQOtYFkiqsa4AHFUYsWk92LLnthz8bDrLmMBc,1969
+c2cgeoportal_admin/templates/widgets/layer_fields.pt,sha256=RJBYt8ji6YQp9ZaNZJD-caLgy856a6rzlKSMnuZWphw,3223
+c2cgeoportal_admin/templates/widgets/layer_group_fields.pt,sha256=xnqIqFjPPan81OqLwKeDnvNtlhEvYss6h2J9txH5neE,2459
+c2cgeoportal_admin/templates/widgets/layer_v1_fields.pt,sha256=w-MujUevHWmnOkOTbbvES6alDoL_UO1eiMj8SCxcQEY,3956
+c2cgeoportal_admin/templates/widgets/metadata.pt,sha256=jWiLmS0J-cwFkqUxxZwKnkPNX9ShTG2zj0tUCq4TMjQ,3735
+c2cgeoportal_admin/templates/widgets/metadatas.pt,sha256=ErgAH0DA94MO7gqEJ2iZdQ9LRptP2YKH78yze-jdl2Q,1476
+c2cgeoportal_admin/templates/widgets/ogcserver_fields.pt,sha256=x0bDmgrnj9SA6RCVpg3k2lTkkXPkuBFPKMScDgDeyGU,1724
+c2cgeoportal_admin/templates/widgets/restriction_area_fields.pt,sha256=pZVE0KcitAF7HXc3ZlniLr0QwSD05TOhlgieLUR1i7Q,1731
+c2cgeoportal_admin/templates/widgets/role_fields.pt,sha256=gVd9eRYaqw8fGmZauqEUS_Igmyxaa71qcmdC1KUx5nY,2623
+c2cgeoportal_admin/templates/widgets/theme_fields.pt,sha256=68G1Ya8-Dc6pCeP-taQ0ofCIpnY_v0rouazkFhfQflU,3083
+c2cgeoportal_admin/templates/widgets/user_fields.pt,sha256=twmajhUYL1xa47Eu-iATKifNPA5lu3SGpqdKajH6gL8,1753
+c2cgeoportal_admin/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+c2cgeoportal_admin/views/dimension_layers.py,sha256=jupwqX_kO37ukcWE-SsO290JdKENEmfoYxk4sRWb25Y,2598
+c2cgeoportal_admin/views/functionalities.py,sha256=U51DvRd6Jg40VQm66kyVy363cDGGEol0WwaQC8b2ZKM,4002
+c2cgeoportal_admin/views/home.py,sha256=h_hJWIKpzJeSmXl58J0nvZdEg7avSYOOVUEEnlV-r0k,1943
+c2cgeoportal_admin/views/interfaces.py,sha256=3Sl-57PchMlUw_RrvL7F4KTpa57ifpNjOxk-nWqMXpk,3465
+c2cgeoportal_admin/views/layer_groups.py,sha256=CbuURDXMcRXnWbW9aEhXP9nSiSiFq4m3JdtgQS6agxs,3956
+c2cgeoportal_admin/views/layers.py,sha256=xjvcRvKVpeD-LRuVwE8PGkDT-Kih9ADX0beEDcOP1bE,3039
+c2cgeoportal_admin/views/layers_vectortiles.py,sha256=lREdMc7bo2TVqdf-s6MzNXZoauReqFS_K-Hng49NUT4,4932
+c2cgeoportal_admin/views/layers_wms.py,sha256=p3g2zc2waMBBrlFQjgTUn9YTg3WcXQofx5Yw1b3ozAg,7954
+c2cgeoportal_admin/views/layers_wmts.py,sha256=IxvF_knk3HYsa8gKhIaZsyi5Uhmv_Qrmd50gU8BPla8,7731
+c2cgeoportal_admin/views/layertree.py,sha256=x1nTVwyf-ZK7M0gIDpsDdySMZm3XmE6yGEE9j8VYQ4Y,8589
+c2cgeoportal_admin/views/oauth2_clients.py,sha256=hovhxGKK3et_Lny7UuXsterP_OUSZ1HW7YqhawEXrOw,3740
+c2cgeoportal_admin/views/ogc_servers.py,sha256=rK0dIS2XLTc5EDeGrnDf_mpHlNXJsCEyUpci_lIexR8,7476
+c2cgeoportal_admin/views/restriction_areas.py,sha256=0Zpo8p5Zsw3JdPCH8kqWr020boBpNiKMhARKcgCsOVU,5549
+c2cgeoportal_admin/views/roles.py,sha256=7BjQ0zLcsf6JW8OgBKJukaMRksUB-VKTeILfhP9bLG0,5858
+c2cgeoportal_admin/views/themes.py,sha256=Qv6sZ7op90JEd7ASGuTU68rjTdsRrGlf0clYqqumuFI,5710
+c2cgeoportal_admin/views/themes_ordering.py,sha256=NYN3I2tDwLW5E4G-695DwV0dCbHUAObWVFYZ8Bir1-o,5590
+c2cgeoportal_admin/views/treeitems.py,sha256=p-Ba_v3UFtUZEmlct4MZmkwv7jzMoxNKnCVa_FX2hxg,3860
+c2cgeoportal_admin/views/users.py,sha256=YzyKYDDTVn69NQPkrlkmbpgrtsIkK_cxqlcWa6utAVA,5355
+tests/__init__.py,sha256=JbVMbOZgS0u5_MhWBnyzT1gdv3cXwhkXyLQgDqpZAik,9525
+tests/conftest.py,sha256=ah7JmR2epDZul2rmMH5wuUzkSpXIjm8dd-cgGjK6_k0,2119
+tests/test_edit_url.py,sha256=00Q9E3QOtsEEB0YJQehllFr1ztQCU3wc9OyayXCHYI4,4495
+tests/test_functionalities.py,sha256=CPHxBueoCt8W76VJN2sCouxQyc7LD7ccusRah5UK2ys,4126
+tests/test_home.py,sha256=oA4i-V9jJQQgHD9Gz79mgIEMUCRw3tmIQVqdhM9Q2Fo,426
+tests/test_interface.py,sha256=ml1yM4t1o6jIQEHZRwMywjt7mjkUhP-34VKBgHOmWes,4704
+tests/test_layer_groups.py,sha256=Bb1Rsy8QkzGee6edY4UQY8hcxvp54PE7gXUcHoi__JA,11062
+tests/test_layers_vectortiles.py,sha256=DjOLkm3o8nPJJbd010Xi_pwHTK5roiHoQBYAuNaZW5c,9395
+tests/test_layers_wms.py,sha256=MISvkAjEZ4oSD1xg7Zah_GKiBHNu60D8kT03f241wuc,18175
+tests/test_layers_wmts.py,sha256=jjO3AbOQgHgC2yXdYke339W11Ygz1b8DpuAn4OXLnxE,11185
+tests/test_layertree.py,sha256=uu-2AzVtqr87eqq9w_5EWPR_KIXFFjEipEA0_ImnkCU,11336
+tests/test_learn.py,sha256=gQwe-Bim0eihZH0rbBWDn6_rIBxvQD_lyu9MlOljupM,2307
+tests/test_left_menu.py,sha256=-K_429ZcW5Hsz317StIRVz8VtU7GDMH7UCTzZDfckUo,920
+tests/test_lingua_extractor_config.py,sha256=3dqgIdCB1M3YPzXrgDCFQ74t0t4QRXwdQZSy6AMqKp8,2515
+tests/test_main.py,sha256=_gUdMrMMAEzvGIf1QwkoHQkd0eBACz05ycTidCHP5Ao,365
+tests/test_metadatas.py,sha256=dawAKLxyWy4Ok3TWAR5zsB_IN_Ci_VJdjNE9fU5NVjE,12089
+tests/test_oauth2_clients.py,sha256=UaTz7jE0-V2JJ4VkjA3W0FlzgkfacI1jchiynXNNYbc,5782
+tests/test_ogc_servers.py,sha256=qPrbLFw8zaPOpk-fbydJUtfgLl9nxA81jOUNd1l8EUI,6436
+tests/test_restriction_areas.py,sha256=S97lbxHghyhz9h8Sv78jYt2EOQEgwlUp8zCfOtmV-OU,7925
+tests/test_role.py,sha256=99Rk4PCTtoVzbiTP3cR3cVkuIArdLywBl2Hx8Pk5lnE,11820
+tests/test_themes.py,sha256=e-OGon6beHfY4q8xOGsYjW-_pm0-wTA18DPBOz6F9iM,15181
+tests/test_themes_ordering.py,sha256=qIEgLgIjSYpWqMVXBAhOk6BKBUAPXkiXsxWB_A1Dy4s,2244
+tests/test_treegroup.py,sha256=Plv119G4TWlurWLE7Z1mWGeHHPScK_fWKcDmDzMUlIU,576
+tests/test_user.py,sha256=pW2Fsbw8wIP2H3BxAMUojSonhMMyr63jsWFmEteaogk,11659
+tests/themes_ordering.py,sha256=mbjTJHl63UVdv5SsfgDrjOx-1z6C5L4wDSCzIh7LPAE,1343
+c2cgeoportal_admin-2.7.1.156.dist-info/METADATA,sha256=cRegyrlS02-K1HNMG99ohp7l0WSyWQpqnPMJC7zInU4,1492
+c2cgeoportal_admin-2.7.1.156.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+c2cgeoportal_admin-2.7.1.156.dist-info/entry_points.txt,sha256=ZF-xnP-Q_zr7y6yRmVqjIGVZ1L2iKi5uaOxjxJQBuG4,164
+c2cgeoportal_admin-2.7.1.156.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
+c2cgeoportal_admin-2.7.1.156.dist-info/RECORD,,

{c2cgeoportal_admin-2.5.0.100.dist-info → c2cgeoportal_admin-2.7.1.156.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

c2cgeoportal_admin-2.7.1.156.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[lingua.extractors]
+geomapfish-admin-config = c2cgeoportal_admin.lib.lingua_extractor:GeomapfishConfigExtractor
+
+[paste.app_factory]
+main = c2cgeoportal_admin:main

tests/__init__.py

@@ -9,7 +9,7 @@ skip_if_ci = pytest.mark.skipif(os.environ.get("CI", "false") == "true", reason=
 
 
 def get_test_default_layers(dbsession, default_ogc_server):
-    from c2cgeoportal_commons.models.main import LayerWMTS, LayerWMS, LayerVectorTiles
+    from c2cgeoportal_commons.models.main import LayerVectorTiles, LayerWMS, LayerWMTS
 
     default_wms = LayerWMS("wms-defaults")
     default_wms.ogc_server = default_ogc_server
@@ -30,15 +30,15 @@ def get_test_default_layers(dbsession, default_ogc_server):
 
 def factory_build_layers(layer_builder, dbsession, add_dimension=True):
     from c2cgeoportal_commons.models.main import (
-        RestrictionArea,
-        LayergroupTreeitem,
-        Interface,
         Dimension,
-        Metadata,
+        Interface,
         LayerGroup,
+        LayergroupTreeitem,
+        Metadata,
+        RestrictionArea,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
 
     interfaces = [Interface(name) for name in ["desktop", "mobile", "edit", "routing"]]
 
@@ -50,7 +50,7 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
         ("snappingConfig", '{"tolerance": 50}'),
     ]
 
-    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)]
 
     layers = []
     for i in range(0, 25):
@@ -91,25 +91,25 @@ def factory_build_layers(layer_builder, dbsession, add_dimension=True):
 
 class AbstractViewsTests:
 
-    _prefix = None  # url prefix (index view url). Example : /users
+    _prefix = None  # url prefix (index view url). Example: /users
 
     def get(self, test_app, path="", locale="en", status=200, **kwargs):
         return test_app.get(
-            "{}{}".format(self._prefix, path),
-            headers={"Cookie": "_LOCALE_={}".format(locale)},
+            f"{self._prefix}{path}",
+            headers={"Cookie": f"_LOCALE_={locale}"},
             status=status,
             **kwargs,
         )
 
     def get_item(self, test_app, item_id, **kwargs):
-        return self.get(test_app, "/{}".format(item_id), **kwargs)
+        return self.get(test_app, f"/{item_id}", **kwargs)
 
     def check_left_menu(self, resp, title):
         link = resp.html.select_one(".navbar li.active a")
-        assert "http://localhost{}".format(self._prefix) == link.attrs["href"]
+        assert f"http://localhost{self._prefix}" == link.attrs["href"]
         assert title == link.getText()
 
-    def check_grid_headers(self, resp, expected_col_headers):
+    def check_grid_headers(self, resp, expected_col_headers, new="New"):
         pp = pprint.PrettyPrinter(indent=4)
         effective_cols = [
             (th.attrs["data-field"], th.getText(), th.attrs["data-sortable"]) for th in resp.html.select("th")
@@ -120,11 +120,11 @@ class AbstractViewsTests:
         )
         actions = resp.html.select_one('th[data-field="actions"]')
         assert "false" == actions.attrs["data-sortable"]
-        assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == "New", resp.html.findAll("a"))))
+        assert 1 == len(list(filter(lambda x: next(x.stripped_strings) == new, resp.html.findAll("a"))))
 
     def check_search(self, test_app, search="", offset=0, limit=10, sort="", order="", total=None):
         json = test_app.post(
-            "{}/grid.json".format(self._prefix),
+            f"{self._prefix}/grid.json",
             params={"offset": offset, "limit": limit, "search": search, "sort": sort, "order": order},
             status=200,
         ).json
@@ -135,8 +135,8 @@ class AbstractViewsTests:
     def check_checkboxes(self, form, name, expected):
         for i, exp in enumerate(expected):
             field = form.get(name, index=i)
-            checkbox = form.html.select_one("#{}".format(field.id))
-            label = form.html.select_one("label[for={}]".format(field.id))
+            checkbox = form.html.select_one(f"#{field.id}")
+            label = form.html.select_one(f"label[for={field.id}]")
             assert exp["label"] == list(label.stripped_strings)[0]
             assert exp["value"] == checkbox["value"]
             assert exp["checked"] == field.checked
@@ -187,7 +187,12 @@ class AbstractViewsTests:
         for exp in expected:
             input_tag = mapping_item.select_one('[name="{}"]'.format(exp["name"]))
             if "value" in exp:
-                if input_tag.name == "select":
+                if input_tag.attrs.get("type") == "checkbox":
+                    if exp["value"] is True:
+                        assert input_tag.attrs.get("checked") == "checked"
+                    else:
+                        assert input_tag.attrs.get("checked") is None
+                elif input_tag.name == "select":
                     self._check_select(input_tag, exp["value"])
                 elif input_tag.name == "textarea":
                     assert (exp["value"] or "") == (input_tag.string or "")

tests/conftest.py

@@ -1,11 +1,8 @@
-import threading
-from wsgiref.simple_server import make_server
-
+import pytest
+import transaction
 from pyramid import testing
 from pyramid.paster import bootstrap
-import pytest
 from sqlalchemy.exc import DBAPIError
-import transaction
 from webtest import TestApp as WebTestApp  # Avoid warning with pytest
 
 from c2cgeoportal_commons.testing import generate_mappers, get_engine, get_session_factory, get_tm_session
@@ -59,6 +56,7 @@ def app(app_env, dbsession):
     config.add_request_method(lambda request: dbsession, "dbsession", reify=True)
     config.add_route("user_add", "user_add")
     config.add_route("users_nb", "users_nb")
+    config.add_route("base", "/", static=True)
     config.scan(package="tests")
     app = config.make_wsgi_app()
     yield app
@@ -70,17 +68,8 @@ def settings(app_env):
     yield app_env.get("registry").settings
 
 
-@pytest.fixture(scope="session")  # noqa: F811
+@pytest.fixture(scope="session")  # noqa: ignore=F811
 @pytest.mark.usefixtures("app")
 def test_app(request, app):
     testapp = WebTestApp(app)
     yield testapp
-
-
-@pytest.fixture(scope="session")  # noqa: F811
-@pytest.mark.usefixtures("app")
-def selenium_app(app):
-    srv = make_server("", 6544, app)
-    threading.Thread(target=srv.serve_forever).start()
-    yield ("http://localhost:6544")
-    srv.shutdown()

tests/test_edit_url.py

@@ -13,23 +13,23 @@ def edit_url_test_data(dbsession, transact):
     del transact
 
     from c2cgeoportal_commons.models.main import (
+        Functionality,
+        Interface,
+        LayerGroup,
+        LayerWMS,
         LayerWMTS,
+        OGCServer,
         RestrictionArea,
-        Interface,
         Role,
-        LayerWMS,
-        LayerGroup,
         Theme,
-        OGCServer,
-        Functionality,
     )
 
-    restrictionareas = [RestrictionArea(name="restrictionarea_{}".format(i)) for i in range(0, 5)]
+    restrictionareas = [RestrictionArea(name=f"restrictionarea_{i}") for i in range(0, 5)]
     functionalities = {}
-    for name in ("default_basemap", "location"):
+    for name in ("default_basemap", "default_theme"):
         functionalities[name] = []
         for v in range(0, 4):
-            functionality = Functionality(name=name, value="value_{}".format(v))
+            functionality = Functionality(name=name, value=f"value_{v}")
             dbsession.add(functionality)
             functionalities[name].append(functionality)
 
@@ -38,10 +38,10 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wmts = []
     for i in range(0, 5):
-        name = "layer_wmts_{}".format(i)
+        name = f"layer_wmts_{i}"
         layer_wmts = LayerWMTS(name=name)
         layer_wmts.layer = name
-        layer_wmts.url = "https://server{}.net/wmts".format(i)
+        layer_wmts.url = f"https://server{i}.net/wmts"
         layer_wmts.restrictionareas = [restrictionareas[i % 5], restrictionareas[(i + 2) % 5]]
         if i % 10 != 1:
             layer_wmts.interfaces = [interfaces[i % 4], interfaces[(i + 2) % 4]]
@@ -52,8 +52,8 @@ def edit_url_test_data(dbsession, transact):
 
     layers_wms = []
     for i in range(0, 5):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
-        layer_wms.layer = "wms_layer_{}".format(i)
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        layer_wms.layer = f"wms_layer_{i}"
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
@@ -63,9 +63,7 @@ def edit_url_test_data(dbsession, transact):
     for i in range(0, 5):
         role = Role("secretary_" + str(i))
         role.functionalities = [
-            functionalities["default_basemap"][0],
-            functionalities["location"][0],
-            functionalities["location"][1],
+            functionalities["default_theme"][0],
         ]
         role.restrictionareas = [restrictionareas[0], restrictionareas[1]]
         dbsession.add(role)
@@ -98,12 +96,12 @@ class TestUrlEdit(AbstractViewsTests):
     _prefix = "/admin/"
 
     def _get(self, test_app, tablename, pk):
-        path = "/{}/{}".format(tablename, pk)
+        path = f"/{tablename}/{pk}"
         return test_app.get(path, status=200)
 
     def _check_link(self, test_app, resp, item, table, status):
-        link = resp.html.select_one(".form-group.item-{} a".format(item))
-        assert re.match(r"http://localhost/admin/{}/\d+".format(table), link["href"]) is not None
+        link = resp.html.select_one(f".form-group.item-{item} a")
+        assert re.match(rf"http://localhost/admin/{table}/\d+", link["href"]) is not None
         test_app.get(link.get("href"), status=status)
 
     def test_layer_wms_edit(self, edit_url_test_data, test_app):

tests/test_functionalities.py

@@ -9,15 +9,18 @@ from . import AbstractViewsTests
 
 @pytest.fixture(scope="function")
 @pytest.mark.usefixtures("dbsession", "transact")
-def functionality_test_data(dbsession, transact):
+def functionality_test_data(dbsession, transact, settings):
     del transact
 
     from c2cgeoportal_commons.models.main import Functionality
 
     functionalities = []
     for i in range(0, 4):
-        functionality = Functionality(name="functionality_{}".format(i), value="value_{}".format(i))
-        functionality.description = "description_{}".format(i)
+        functionality = Functionality(
+            settings["admin_interface"]["available_functionalities"][i]["name"],
+            value=f"value_{i}",
+        )
+        functionality.description = f"description_{i}"
         dbsession.add(functionality)
         functionalities.append(functionality)
 
@@ -47,7 +50,7 @@ class TestFunctionality(AbstractViewsTests):
 
     def test_grid_search(self, test_app):
         # search on functionality name
-        self.check_search(test_app, "functionality_0", total=1)
+        self.check_search(test_app, "default_basemap", total=1)
 
     def test_submit_new(self, dbsession, test_app):
         from c2cgeoportal_commons.models.main import Functionality
@@ -65,7 +68,7 @@ class TestFunctionality(AbstractViewsTests):
 
     def test_edit(self, test_app, functionality_test_data):
         functionality = functionality_test_data["functionalities"][0]
-        resp = test_app.get("/admin/functionalities/{}".format(functionality.id), status=200)
+        resp = test_app.get(f"/admin/functionalities/{functionality.id}", status=200)
         form = resp.form
         assert str(functionality.id) == self.get_first_field_named(form, "id").value
         assert "hidden" == self.get_first_field_named(form, "id").attrs["type"]
@@ -79,20 +82,30 @@ class TestFunctionality(AbstractViewsTests):
 
         functionality = functionality_test_data["functionalities"][0]
         deleted_id = functionality.id
-        test_app.delete("/admin/functionalities/{}".format(deleted_id), status=200)
+        test_app.delete(f"/admin/functionalities/{deleted_id}", status=200)
         assert dbsession.query(Functionality).get(deleted_id) is None
 
     def test_duplicate(self, functionality_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import Functionality
 
         functionality = functionality_test_data["functionalities"][3]
-        resp = test_app.get("/admin/functionalities/{}/duplicate".format(functionality.id), status=200)
+
+        resp = test_app.get(f"/admin/functionalities/{functionality.id}/duplicate", status=200)
+
         form = resp.form
-        assert "" == self.get_first_field_named(form, "id").value
-        self.set_first_field_named(form, "name", "clone")
+        assert form["name"].value == functionality.name
+        assert form["description"].value == functionality.description
+        assert form["value"].value == functionality.value
+        form["value"].value = "another_value"
         resp = form.submit("submit")
+
         assert resp.status_int == 302
-        functionality = dbsession.query(Functionality).filter(Functionality.name == "clone").one()
+        functionality = (
+            dbsession.query(Functionality)
+            .filter(Functionality.name == functionality.name)
+            .filter(Functionality.value == "another_value")
+            .one()
+        )
         assert str(functionality.id) == re.match(
             r"http://localhost/admin/functionalities/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)