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

tests/test_user.py

@@ -4,11 +4,10 @@ import email
 import re
 from unittest.mock import MagicMock, patch
 
-from pyramid.testing import DummyRequest
 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 +15,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]],
         )
@@ -71,20 +70,30 @@ 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):
         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,14 +120,14 @@ 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}
 
     def test_delete(self, test_app, users_test_data, dbsession):
         from c2cgeoportal_commons.models.static import 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
 
@@ -129,7 +138,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"),
@@ -146,13 +155,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 +172,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 +199,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 +219,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")
 
@@ -295,52 +304,10 @@ class TestUser(AbstractViewsTests):
         assert info.status_int == 500, "Expected 500 status when db error"
 
     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)
 

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>

c2cgeoportal_admin-2.5.0.100.dist-info/RECORD

@@ -1,84 +0,0 @@
-c2cgeoportal_admin/__init__.py,sha256=IsfveDX7hmzIRTY5sTWOk3xeC1gD7DakbwVH_wxq_NI,4677
-c2cgeoportal_admin/routes.py,sha256=FVOOEopeJJUNRxQA2QLoUFzaJSJ3u67-lLPs19pXBxY,4384
-c2cgeoportal_admin/subscribers.py,sha256=NKvpObGpgVqmTTU7q-A_EsPMEaA6eyKfa6kezlR11H4,2362
-c2cgeoportal_admin/widgets.py,sha256=aKI3VWB4MCLo0kfIrhPgkxPTrsRHdozCrGnQBJnAi6o,4276
-c2cgeoportal_admin/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-c2cgeoportal_admin/schemas/dimensions.py,sha256=NOmXFqfF5-P5aM5OOUqChXbG7HpXjrNd_SEq_JpRuKc,2070
-c2cgeoportal_admin/schemas/functionalities.py,sha256=naxGaZlyI7Oqsl8qSC9-VXJ9xa6sx0Y0NVxoyWqhoKE,2476
-c2cgeoportal_admin/schemas/interfaces.py,sha256=CesXI7TInAYYkhpPRCXnEGhiVIMfbuXOOBDHyZEiAqk,2277
-c2cgeoportal_admin/schemas/metadata.py,sha256=XV8N4P79Kf7wDrxpqdPGMut5HsbLHiSFNjQD6zp2h2g,5925
-c2cgeoportal_admin/schemas/restriction_areas.py,sha256=mumAc30YV8e6jIRlCOJ7QX99MIhXoRda9ulTGoz-Rxc,2343
-c2cgeoportal_admin/schemas/roles.py,sha256=suFYgwYCSlQ1qIWghin_Z-HXDShGy9xajjTcQRc3IEY,2253
-c2cgeoportal_admin/schemas/treegroup.py,sha256=AJ_FjeiQCwsd0hUxmUDRUqg_jnM_J0DPDOyvTOj7km0,4991
-c2cgeoportal_admin/schemas/treeitem.py,sha256=P0qZZrxbAPo878p36-yyQ0k_slxuml2ij8Ev9GeWUJE,2094
-c2cgeoportal_admin/static/layertree.css,sha256=uBXaWDb4tJKLfZU45-_SY0RCiQWYZGt7z-93kPiJj2U,2038
-c2cgeoportal_admin/static/navbar.css,sha256=BL4YfSRoVFXBF2AZHKCfQ1AyW5IeKrvPYKA3yxl5xiA,1245
-c2cgeoportal_admin/static/theme.css,sha256=NfJVztoQJ1ycdR_osMoZpC958oQAn5hMJOyei59hz3E,645
-c2cgeoportal_admin/templates/404.jinja2,sha256=m0V-yCVQjg_yHCMiXuk3vvRBqy7X7fLT8B95IaMapMw,281
-c2cgeoportal_admin/templates/edit.jinja2,sha256=CJgEKPgTuXBEutu1ry45-5aQ68h_0fXhfjt2GtnRkoA,163
-c2cgeoportal_admin/templates/home.jinja2,sha256=Wm3rl2Ap8a5FBPsPAXxSNV5LHLqyF232uNmjFhfNIac,377
-c2cgeoportal_admin/templates/index.jinja2,sha256=-lsyqoKzcwstQLhkqQqyyiMOf6kwcJxTn05_BTOMXaA,866
-c2cgeoportal_admin/templates/layertree.jinja2,sha256=PVjDbNIBy7bdwnjsxCPk-5Ed2T-_eBChNN0WfdStgrM,7952
-c2cgeoportal_admin/templates/layout.jinja2,sha256=DeWDkY22JEIvTdaO2df8HHB95tl8irCTzjxtgy-1C6E,2966
-c2cgeoportal_admin/templates/navigation_navbar.jinja2,sha256=MchXa1LGlBFrPkBwCO5qTCDhWzstZd7B75GUO8eXoEI,1962
-c2cgeoportal_admin/templates/navigation_vertical.jinja2,sha256=8uqlbGcIIWEPrdv8Ej_rbO6h2tFVhER2ILzQOGrl6mk,521
-c2cgeoportal_admin/templates/widgets/child.pt,sha256=lRyyakHSAb9uHn8xEJEvUSunVZ3YRv3W4-1lIZ6MzeQ,619
-c2cgeoportal_admin/templates/widgets/children.pt,sha256=a3RC86vcDIlGw1kc_RjCEUiTRY6Z4aFN09m2kGzK6Ps,5102
-c2cgeoportal_admin/templates/widgets/dimension.pt,sha256=Yhr5nGu2aSASoWISD-ElMc32997Y2vM8hgVVZy_VeKw,1504
-c2cgeoportal_admin/templates/widgets/dimensions.pt,sha256=TA1lz5OUKIXRzq7yWcN36dJyqtdmY0vqNZpJXo13LZQ,88
-c2cgeoportal_admin/templates/widgets/layer_fields.pt,sha256=uB2zLbuhXVhU3ywB10mWkjCNd_eKeEa2Q3fgR73BFG4,2100
-c2cgeoportal_admin/templates/widgets/layer_group_fields.pt,sha256=NeZUF19bjqZia0heFIQ_YxTxdfxGLq54MNt7-U7r3ik,1336
-c2cgeoportal_admin/templates/widgets/layer_v1_fields.pt,sha256=mV5ml6bRKYeZkNMp9BTBiJWv2R48SZVKixhCZXqNK_k,2833
-c2cgeoportal_admin/templates/widgets/metadata.pt,sha256=OFVXCIW9esL2KM0iR29nb5mg5C8dFGep8uOUfQhTpT8,2415
-c2cgeoportal_admin/templates/widgets/metadatas.pt,sha256=6PQarLFl-KQIezWs4S89W9TKizeWaRP5BalLpaLqhi4,353
-c2cgeoportal_admin/templates/widgets/ogcserver_fields.pt,sha256=eN0Jxg0y7M0q_Z0Wug7blzhl0V62P43ZUU6qssSjPHk,601
-c2cgeoportal_admin/templates/widgets/restriction_area_fields.pt,sha256=wWjSdgZpfv9pD1IO1PpnEaOXjEW4Ya_V1078bb2Enj4,807
-c2cgeoportal_admin/templates/widgets/role_fields.pt,sha256=6CmfKzilScsVde-zme5Y-jzwUfNs46aDJ3fxfn5W2_g,1285
-c2cgeoportal_admin/templates/widgets/theme_fields.pt,sha256=AkJlQ3BUM7h1MbDRyU2RNpabZ9CzL84m31omyMhO6Vc,1960
-c2cgeoportal_admin/templates/widgets/user_fields.pt,sha256=G-DMCwQVC-53ly87-B4Am4lqCTtX8av9zyzDtK6GDhM,630
-c2cgeoportal_admin/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-c2cgeoportal_admin/views/dimension_layers.py,sha256=brEA1L7RXABKQLoScK5S2tjWn7jm9xRHgzAj3BjmgHw,2465
-c2cgeoportal_admin/views/functionalities.py,sha256=SfMoEShBTOFj_20V3JHVDToOMrmHoLWd4K87Yf_TDgM,3144
-c2cgeoportal_admin/views/home.py,sha256=_WJgyna095opx_b9PuchjeVEztj3tFWCx5Low3RVK-s,1804
-c2cgeoportal_admin/views/interfaces.py,sha256=7LzocSnJ1JeSroVc-UBdJdDnOF1mZR4zGgnuOvsoutA,3438
-c2cgeoportal_admin/views/layer_groups.py,sha256=OBM48lbCDfeI772k3ypukGEbhIwzt5hW4REr-Bs78Zw,3826
-c2cgeoportal_admin/views/layers.py,sha256=OhEITd5AWEYCztGmrK_PP59CeTOcgRp2AE3g_ghdG6U,2897
-c2cgeoportal_admin/views/layers_vectortiles.py,sha256=gOAwB7j2esEKuDvZtNQEVy8SCAfICNvXWMcx61x4qiE,4103
-c2cgeoportal_admin/views/layers_wms.py,sha256=7uIAvQuLSRKC5Cbq4aq029W6cRHj0WIABUIpyw2_fjs,7178
-c2cgeoportal_admin/views/layers_wmts.py,sha256=tqNCG_X6FqHnxUh4W3FI2Ls9uWCtdjneSF7nN1fsu-I,7055
-c2cgeoportal_admin/views/layertree.py,sha256=OtviGiVJyHosC77WQ7F6Bbu5DwHeV0LVL_udv7gnrMM,7925
-c2cgeoportal_admin/views/ogc_servers.py,sha256=ABoPPdhxN_sThc_98eRXCluNOYwCG-TdNBiSgdOPfLo,3512
-c2cgeoportal_admin/views/restriction_areas.py,sha256=hUhr8pk3o6ksjNcDN_t4_PV00dlWcLK-P4hPWGHrjMc,4092
-c2cgeoportal_admin/views/roles.py,sha256=1ki172UOlSM7eYuB8adah8gAfnZ85_Pr_-uLR8RBjks,4116
-c2cgeoportal_admin/views/themes.py,sha256=q7dnR-SzsvnXbH5pHrvpYeF2FuazBLZsmvWTnjxPx88,5502
-c2cgeoportal_admin/views/themes_ordering.py,sha256=x9I9tDIuiNkub96AWR12lV91ECOHxsdUdBAI4-dThUs,4945
-c2cgeoportal_admin/views/treeitems.py,sha256=GRGHu1ixeALE2PoLw1xOAHkJbICtS6xozKqn8pSXg6U,3787
-c2cgeoportal_admin/views/users.py,sha256=bA4Ym5xmNIBgqNBk2H5bWHhdR4saYN2Ee_k1unzgrlQ,5193
-tests/__init__.py,sha256=iZt9bPZHkTFojfQqeFCqVrBMkYjewdVbcKQ79vppf-s,9311
-tests/conftest.py,sha256=ip0JDR3ujOGyKzHZ8ZaLWU1an7GYnuysjGeaeFW2qlw,2380
-tests/test_edit_url.py,sha256=tufOWTFZoOABRpr_H-aWpq6o1QPdWYgfvfMkdcgOs6s,4654
-tests/test_functionalities.py,sha256=ZgGeRP0eNLAxhgfT6Wj3zxtnClKuNqEGGl8oMVs9tZ4,3857
-tests/test_home.py,sha256=oA4i-V9jJQQgHD9Gz79mgIEMUCRw3tmIQVqdhM9Q2Fo,426
-tests/test_interface.py,sha256=RP0nkQvbSR8qYy3OtTB-pmjupJ-tD6hQcLfcYjaGHn4,4768
-tests/test_layer_groups.py,sha256=n4jaqSIk_3YiFsVt5569BaeUQMCwtPPxuUivrqPu5wA,11609
-tests/test_layers_vectortiles.py,sha256=nY2inouZBfvQrsGsjpYNag1fPbtSPVKpvBWPY8I6cIg,9590
-tests/test_layers_wms.py,sha256=QGYptpJm83d6KQCva7XSfhOkXz5JozmzbvN_sFxcs1c,19490
-tests/test_layers_wmts.py,sha256=NhVoNCkixwQSjh9KOoAQV7i2T9Uu_mWJQ4CWUzINyxI,11358
-tests/test_layertree.py,sha256=5qOF32GalHLxHb-wH_FjGVUjgSlAAHtZ06r70JhzJk0,11502
-tests/test_learn.py,sha256=tXOGW_jktJeb_QpXXlXlGzi0WD3GRKkA71wS1q8VQDI,2307
-tests/test_left_menu.py,sha256=-K_429ZcW5Hsz317StIRVz8VtU7GDMH7UCTzZDfckUo,920
-tests/test_main.py,sha256=sLkSzalgvkgLold7fFLKJYnYsjSW5n8bxYFzYoXa3JY,354
-tests/test_metadatas.py,sha256=3oBF7KTI4I59tPb9zW_eujHSdep25J_ARM9JqgLNAOg,11977
-tests/test_ogc_servers.py,sha256=_UyZOCQLcM84DvVwu2m9l1rdIS47ZwWHswAWTJVYk10,4661
-tests/test_restriction_areas.py,sha256=pEVs8E2AG5GFDkb0Mg4FZVSvnR5b0nrTRcTOWT_TNJs,5583
-tests/test_role.py,sha256=wdY38WySSxkJ3o_nKtTw3CIRlKOYZRJg70LB8lSga44,10350
-tests/test_themes.py,sha256=770fiV-5Jwz9aYjmfTntnlZ2ca4q5_n_9KL9otFTlj4,15119
-tests/test_themes_ordering.py,sha256=AqJ8HOfL6__QnZIjl7RqsQLbH352iR8pokNshctQOeQ,2260
-tests/test_treegroup.py,sha256=CBM77NxjWygcikjgci20R4MEnnwQLpFI9AExM83s118,592
-tests/test_user.py,sha256=UGbT96AY1OirMy3w4fCoCEx1uoOD9Nf69oqxCogswT4,13040
-tests/themes_ordering.py,sha256=b6PpQQbbB9RqKKiBl5iF7T3tQGgvJ18LGTJCbP31FVQ,1351
-c2cgeoportal_admin-2.5.0.100.dist-info/METADATA,sha256=_R5eERE72mN6yhKb8fnT8fLzWKdqDcWtCMF0o3TJWr4,1178
-c2cgeoportal_admin-2.5.0.100.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-c2cgeoportal_admin-2.5.0.100.dist-info/entry_points.txt,sha256=CroEMatntjAOxN-0qHPOOjVrtmBg_WxpUcUmvRtUJZA,52
-c2cgeoportal_admin-2.5.0.100.dist-info/top_level.txt,sha256=DgcTJgTvpJUB8HqwYB14PdLBPAOAFk0B8oqnSTFoAU4,25
-c2cgeoportal_admin-2.5.0.100.dist-info/RECORD,,

c2cgeoportal_admin-2.5.0.100.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[paste.app_factory]
-main = c2cgeoportal_admin:main
-