imio.smartweb.core 1.2.12__py3-none-any.whl → 1.2.68__py3-none-any.whl

imio/smartweb/core/tests/test_rest.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from base64 import b64encode
 from freezegun import freeze_time
 from imio.smartweb.core import config
 from imio.smartweb.core.contents.rest.base import BaseEndpoint
@@ -8,16 +9,22 @@ from imio.smartweb.core.contents.rest.events.endpoint import EventsEndpoint
 from imio.smartweb.core.contents.rest.news.endpoint import NewsEndpoint
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_ACCEPTANCE_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
+from imio.smartweb.core.tests.utils import FakeResponse
 from imio.smartweb.core.tests.utils import get_json
+from imio.smartweb.core.tests.utils import make_named_image
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_PASSWORD
+from plone.namedfile.file import NamedBlobImage
 from plone.restapi.testing import RelativeSession
 from unittest.mock import patch
 from urllib.parse import urlparse
 from urllib.parse import parse_qs
 from zope.component import queryMultiAdapter
+from zope.event import notify
 from zope.publisher.browser import TestRequest
+from ZPublisher.pubevents import PubStart
 
 import json
 import requests_mock
@@ -73,6 +80,21 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
     def tearDown(self):
         self.api_session.close()
 
+    def traverse(self, path="/plone", method="GET"):
+        request = self.layer["request"]
+        request.environ["PATH_INFO"] = path
+        request.environ["PATH_TRANSLATED"] = path
+        request.environ["HTTP_ACCEPT"] = "application/json"
+        request.environ["REQUEST_METHOD"] = method
+        request.other["ACTUAL_URL"] = ""
+        request.other["URL"] = ""
+        request.method = method
+        request.form = {}
+        auth = f"{TEST_USER_ID}:{TEST_USER_PASSWORD}"
+        request._auth = "Basic %s" % b64encode(auth.encode("utf8")).decode("utf8")
+        notify(PubStart(request))
+        return request.traverse(path)
+
     @freeze_time("2021-09-14 8:00:00")
     def test_convert_cached_image_scales(self):
         endpoint = BaseEndpoint(self.portal, self.request)
@@ -112,34 +134,37 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         endpoint.convert_cached_image_scales(item, modified_hash)
         self.assertEqual(len(item.keys()), 6)
 
-    def test_get_extra_params(self):
+    def test_construct_query_string(self):
+        request = TestRequest()
+        endpoint = DirectoryEndpoint(self.portal, request)
+        query = endpoint.construct_query_string([])
+        self.assertEqual(query, "translated_in_en=1")
+
+        query = endpoint.construct_query_string(["param=1", "param2=2"])
+        self.assertEqual(query, "param=1&param2=2&translated_in_en=1")
+
         request = TestRequest(
             form={"taxonomy_contact_category": '("token")', "topics": "education"}
         )
         endpoint = DirectoryEndpoint(self.portal, request)
-        params = endpoint.get_extra_params([])
+        query = endpoint.construct_query_string([])
         self.assertEqual(
-            params,
-            [
-                'taxonomy_contact_category=("token")',
-                "topics=education",
-                "translated_in_en=1",
-            ],
+            query,
+            "taxonomy_contact_category=%28%22token%22%29&topics=education&translated_in_en=1",
         )
 
         request = TestRequest(
-            form={"topics": "education", "metadata_fields": ["topics", "category"]}
+            form={
+                "topics": "education",
+                "metadata_fields": ["topics", "category"],
+                "local_category": "Local & category",
+            }
         )
         endpoint = DirectoryEndpoint(self.portal, request)
-        params = endpoint.get_extra_params([])
+        query = endpoint.construct_query_string([])
         self.assertEqual(
-            params,
-            [
-                "topics=education",
-                "metadata_fields=topics",
-                "metadata_fields=category",
-                "translated_in_en=1",
-            ],
+            query,
+            "topics=education&metadata_fields=topics&metadata_fields=category&local_category=Local+%26+category&translated_in_en=1",
         )
 
     @requests_mock.Mocker()
@@ -215,9 +240,109 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
                 "translated_in_en=1",
             )
 
-    def test_render_rest_directory(self):
-        view = queryMultiAdapter((self.rest_directory, self.request), name="view")
-        self.assertIn("<smartweb-annuaire", view())
+    def test_render_rest_auth_sources(self):
+        """og:tags on rest view"""
+
+        auth_sources = [
+            {"name": "annuaire", "content": self.rest_directory},
+            {"name": "actualites", "content": self.rest_news},
+            {"name": "agenda", "content": self.rest_events},
+        ]
+        for auth_source in auth_sources:
+            view = queryMultiAdapter(
+                (auth_source["content"], self.request), name="view"
+            )
+            self.assertEqual(view().count('<meta property="og:title"'), 1)
+            self.assertIn(
+                f'<meta property="og:title" content="{auth_source["content"].title}">',
+                view(),
+            )
+            self.assertIn('<meta property="og:description" content="">', view())
+            self.assertIn('<meta property="og:site_name" content="Plone site">', view())
+            self.assertNotIn('<meta property="og:image" content="">', view())
+            self.assertNotIn('<meta property="og:image:type" content="">', view())
+            self.assertIn('<meta property="og:image:alt" content="">', view())
+            self.assertNotIn('<meta property="og:image:width" content="">', view())
+            self.assertNotIn('<meta property="og:image:height">', view())
+            self.assertIn('<meta property="og:type" content="website">', view())
+
+            auth_source["content"].description = "Kamoulox"
+            auth_source["content"].image = NamedBlobImage(**make_named_image())
+            view = queryMultiAdapter(
+                (auth_source["content"], self.request), name="view"
+            )
+            self.assertIn('<meta property="og:description" content="Kamoulox">', view())
+            pattern = r'<meta property="og:image" content="http://localhost:\d+/plone/{}/@@images/image/paysage_vignette\?cache_key=[a-zA-Z0-9]+">'.format(
+                auth_source["content"].id
+            )
+            self.assertRegex(view(), pattern)
+            self.assertIn('<meta property="og:image:type" content="image/png">', view())
+            self.assertIn('<meta property="og:image:alt" content="">', view())
+            self.assertIn('<meta property="og:image:width" content="400">', view())
+            self.assertIn('<meta property="og:image:height" content="400">', view())
+
+    @patch("imio.smartweb.core.viewlets.ogptags.get_wca_token")
+    @patch("imio.smartweb.core.viewlets.ogptags.get_json")
+    def test_render_rest_auth_sources_item(self, mock_get_json, mock_get_wca_token):
+        """og:tags on an item in a rest view"""
+
+        auth_sources = [
+            {"name": "annuaire", "content": self.rest_directory},
+            {"name": "actualites", "content": self.rest_news},
+            {"name": "agenda", "content": self.rest_events},
+        ]
+        for auth_source in auth_sources:
+            mock_get_wca_token.return_value = "kamoulox"
+            mock_get_json.return_value = {
+                "items": [
+                    {
+                        "title": "kamoulox",
+                        "description": "kamoulox description",
+                        "url": f'https://{auth_source["name"]}.preprod.imio.be/braine-l-alleud/d63d28c478bb4269b77e1ceae8410cc5',
+                    }
+                ]
+            }
+            UID = "3c436a800154449f84797fdb30561297"
+            self.request.form["u"] = UID
+            view = queryMultiAdapter(
+                (auth_source["content"], self.request), name="view"
+            )
+            self.assertEqual(view().count('<meta property="og:title"'), 1)
+            self.assertIn('<meta property="og:title" content="kamoulox">', view())
+            self.assertIn(
+                '<meta property="og:description" content="kamoulox description">',
+                view(),
+            )
+            self.assertNotIn('<meta property="og:image"', view())
+            self.assertNotIn('<meta property="og:image:type"', view())
+            self.assertIn('<meta property="og:image:alt" content="">', view())
+            self.assertNotIn('<meta property="og:image:width"', view())
+            self.assertNotIn('<meta property="og:image:height"', view())
+            default_scale = "paysage_vignette"
+            mock_get_json.return_value["items"][0]["image"] = {
+                "download": f'https://{auth_source["name"]}.preprod.imio.be/braine-lalleud/citoyens/d448b0c80f0e4c57819bf23e6281aa98/@@images/image-400-b963678cd2367410ceec02428ebe093e.jpg',
+                "filename": "kamoulox.jpg",
+                "content-type": "image/jpeg",
+                "scales": {
+                    default_scale: {
+                        "width": "400",
+                        "height": "400",
+                    }
+                },
+            }
+            view = queryMultiAdapter(
+                (auth_source["content"], self.request), name="view"
+            )
+            self.assertIn(
+                f'<meta property="og:image" content="https://{auth_source["name"]}.preprod.imio.be/braine-lalleud/citoyens/d448b0c80f0e4c57819bf23e6281aa98/@@images/image-400-b963678cd2367410ceec02428ebe093e.jpg">',
+                view(),
+            )
+            self.assertIn(
+                '<meta property="og:image:type" content="image/jpeg">', view()
+            )
+            self.assertIn('<meta property="og:image:alt" content="">', view())
+            self.assertIn('<meta property="og:image:width" content="400">', view())
+            self.assertIn('<meta property="og:image:height" content="400">', view())
 
     def test_rest_directory_results(self):
         params = {}
@@ -247,13 +372,13 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "http://localhost:8080/Plone/@events?"
             "selected_agendas={}&"
             "metadata_fields=category&"
+            "metadata_fields=local_category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=start&"
             "metadata_fields=end&"
             "metadata_fields=has_leadimage&"
             "metadata_fields=UID&"
-            "event_dates.query=2021-11-15&"
-            "event_dates.range=min&"
             "sort_on=event_dates&"
             "fullobjects=1&"
             "b_size=20&"
@@ -305,6 +430,8 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "selected_news_folders={}&"
             "portal_type=imio.news.NewsItem&"
             "metadata_fields=category&"
+            "metadata_fields=local_category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=has_leadimage&"
             "metadata_fields=UID&"
@@ -366,3 +493,137 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
         self.rest_events.display_map = True
         view = queryMultiAdapter((self.rest_events, self.request), name="view")
         self.assertIn('display-map="True"', view())
+
+    def test_show_categories_or_topics(self):
+        rest_events = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.EventsView",
+            title="events view",
+        )
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_events.show_categories_or_topics = "category"
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_events.show_categories_or_topics = "topic"
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics="topic"', view())
+        rest_events.show_categories_or_topics = ""
+        view = queryMultiAdapter((rest_events, self.request), name="view")
+        self.assertIn('show-categories-or-topics=""', view())
+        rest_news = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.NewsView",
+            title="news view",
+        )
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_news.show_categories_or_topics = "category"
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="category"', view())
+        rest_news.show_categories_or_topics = "topic"
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics="topic"', view())
+        rest_news.show_categories_or_topics = ""
+        view = queryMultiAdapter((rest_news, self.request), name="view")
+        self.assertIn('show-categories-or-topics=""', view())
+
+    @patch("imio.smartweb.core.rest.authentic_sources.get_wca_token")
+    @patch("imio.smartweb.core.rest.authentic_sources.requests.request")
+    @patch("imio.smartweb.core.rest.authentic_sources.get_default_view_url")
+    def test_request_forwarder(self, mock_view_url, mock_request, mock_get_wca_token):
+        mock_view_url.return_value = "http://view-url"
+        mock_get_wca_token.return_value = "kamoulox"
+        mock_request.return_value = FakeResponse(
+            status_code=200,
+            headers={"test-header": "True"},
+        )
+
+        # traversal stack
+        service = self.traverse("/plone/@news_request_forwarder/belleville/@search")
+        self.assertListEqual(service.traversal_stack, ["belleville", "@search"])
+
+        # add_smartweb_urls
+        json_data = {}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"foo": "bar"}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"@id": "http://news/my-news"}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"@id": "http://news/my-news", "UID": "12345678"}
+        json_result = service.add_smartweb_urls(json_data)
+        self.assertEqual(
+            json_result["smartweb_url"], "http://view-url/content?u=12345678"
+        )
+        json_data = {"items": []}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"items": [{"@id": "http://news/my-news"}]}
+        self.assertEqual(service.add_smartweb_urls(json_data), json_data)
+        json_data = {"items": [{"@id": "http://news/my-news", "UID": "12345678"}]}
+        json_result = service.add_smartweb_urls(json_data)
+        self.assertIn("smartweb_url", json_result["items"][0])
+        self.assertEqual(
+            json_data["items"][0]["smartweb_url"], "http://view-url/content?u=12345678"
+        )
+
+        # add_missing_metadatas
+        params = {}
+        self.assertEqual(
+            service.add_missing_metadatas(params), {"metadata_fields": ["id", "UID"]}
+        )
+        params = {"fullobjects": 1}
+        self.assertEqual(service.add_missing_metadatas(params), params)
+        params = {"metadata_fields": ["other", "UID"]}
+        self.assertEqual(
+            service.add_missing_metadatas(params),
+            {"metadata_fields": ["other", "UID", "id"]},
+        )
+        params = {"metadata_fields": ["other", "id"]}
+        self.assertEqual(
+            service.add_missing_metadatas(params),
+            {"metadata_fields": ["other", "id", "UID"]},
+        )
+
+        # reply
+        response = service.reply()
+        mock_request.assert_called_with(
+            "GET",
+            "http://localhost:8080/Plone/belleville/@search",
+            params={"metadata_fields": ["id", "UID"]},
+            headers={"Accept": "application/json", "Authorization": "kamoulox"},
+            json={},
+        )
+        self.assertEqual(response, {})
+        self.assertEqual(self.request.response.status, 200)
+        self.assertEqual(self.request.response.headers, {"test-header": "True"})
+
+        service = self.traverse(
+            "/plone/@events_request_forwarder/belleville/", method="POST"
+        )
+        service.reply()
+        mock_request.assert_called_with(
+            "POST",
+            "http://localhost:8080/Plone/belleville",
+            params={},
+            headers={"Accept": "application/json", "Authorization": "kamoulox"},
+            json={},
+        )
+
+        mock_request.side_effect = None
+        mock_request.return_value = FakeResponse(status_code=204)
+        service = self.traverse(
+            "/plone/@events_request_forwarder/belleville/", method="PATCH"
+        )
+        response = service.reply()
+        self.assertEqual(response, "")
+        self.assertEqual(self.request.response.status, 204)
+
+        self.assertEqual(
+            self.api_session.get("/@directory_request_forwarder/foo/bar").text, ""
+        )
+        self.assertEqual(
+            self.api_session.get("/@events_request_forwarder/foo/bar").text, ""
+        )
+        self.assertEqual(
+            self.api_session.get("/@news_request_forwarder/foo/bar").text, ""
+        )

imio/smartweb/core/tests/test_section_contact.py

@@ -4,9 +4,9 @@ from bs4 import BeautifulSoup
 from datetime import datetime
 from datetime import timedelta
 from freezegun import freeze_time
+from imio.smartweb.common.contact_utils import formatted_schedule
+from imio.smartweb.common.contact_utils import get_schedule_for_today
 from imio.smartweb.core.contents.sections.contact.utils import ContactProperties
-from imio.smartweb.core.contents.sections.contact.utils import formatted_schedule
-from imio.smartweb.core.contents.sections.contact.utils import get_schedule_for_today
 from imio.smartweb.core.contents.sections.views import SECTION_ITEMS_HASH_KEY
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase

imio/smartweb/core/tests/test_section_events.py

@@ -59,12 +59,12 @@ class TestSectionEvents(ImioSmartwebTestCase):
             (self.events, self.request), name="carousel_view"
         )
         self.assertEqual(events_view.items, [])
-        url = "http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = "http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
         self.assertEqual(events_view.items[0][0].get("title"), "Journée de l'ATL")
         self.assertEqual(len(events_view.items[0]), 2)
         self.events.specific_related_events = ["1178188bddde4ced95a6cf8bf04c443c"]
-        url = "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1"
+        url = "http://localhost:8080/Plone/@events?UID=1178188bddde4ced95a6cf8bf04c443c&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query=2021-11-15&event_dates.range=min&b_size=6&translated_in_en=1"
         m.get(url, text=json.dumps(self.json_specific_event))
         self.assertEqual(len(events_view.items[0]), 1)
         self.assertEqual(events_view.items[0][0].get("title"), "Bonne cheville")
@@ -84,7 +84,7 @@ class TestSectionEvents(ImioSmartwebTestCase):
         events_view = queryMultiAdapter(
             (self.events, self.request), name="carousel_view"
         )
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
         self.assertEqual(len(events_view.items[0]), 2)
         hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
@@ -92,7 +92,7 @@ class TestSectionEvents(ImioSmartwebTestCase):
         first_modification = self.portalpage.ModificationDate()
 
         sleep(1)
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text="{}")
         self.assertEqual(len(events_view.items), 0)
         next_modification = self.portalpage.ModificationDate()
@@ -119,9 +119,32 @@ class TestSectionEvents(ImioSmartwebTestCase):
         events_view = queryMultiAdapter(
             (self.events, self.request), name="carousel_view"
         )
-        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=category_title&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
         m.get(url, text=json.dumps(self.json_events))
 
         self.assertIn("paysage_vignette", events_view.items[0][0]["image"])
         self.events.orientation = "portrait"
         self.assertIn("portrait_vignette", events_view.items[0][0]["image"])
+
+    @requests_mock.Mocker()
+    def test_show_categories_or_topics(self, m):
+        today = datetime.now()
+        today_str = today.strftime("%Y-%m-%d")
+        intids = getUtility(IIntIds)
+        self.events.related_events = "e73e6a81afea4a579cd0da2773af8d29"
+        self.events.linking_rest_view = RelationValue(
+            intids.getId(self.rest_events_view)
+        )
+        events_view = queryMultiAdapter(
+            (self.events, self.request), name="carousel_view"
+        )
+        url = f"http://localhost:8080/Plone/@events?selected_agendas=e73e6a81afea4a579cd0da2773af8d29&metadata_fields=container_uid&metadata_fields=category_title&metadata_fields=local_category&metadata_fields=topics&metadata_fields=start&metadata_fields=end&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=UID&event_dates.query={today_str}&event_dates.range=min&b_size=6&translated_in_en=1&sort_on=event_dates"
+        m.get(url, text=json.dumps(self.json_events))
+        self.assertEqual(events_view.items[0][0]["category"], "Local Category title")
+        self.assertEqual(events_view.items[0][1]["category"], "Presse")
+        self.events.show_categories_or_topics = "category"
+        self.assertEqual(events_view.items[0][0]["category"], "Local Category title")
+        self.events.show_categories_or_topics = "topic"
+        self.assertEqual(events_view.items[0][0]["category"], "Education")
+        self.events.show_categories_or_topics = ""
+        self.assertEqual(events_view.items[0][0]["category"], "")

imio/smartweb/core/tests/test_section_external_content.py

@@ -28,28 +28,28 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         sec.external_content_url = "https://kamoulox.be"
         section_view = queryMultiAdapter((sec, self.request), name="view")
         self.assertEqual(
-            section_view.get_embed_external_content(),
+            section_view.contents,
             '<p class="unknow_service">Unknow service</p>',
         )
 
-    # def test_eaglebe_plugin(self):
-    #     sec = api.content.create(
-    #         container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
-    #     )
+    def test_eaglebe_plugin(self):
+        sec = api.content.create(
+            container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
+        )
 
-    #     sec.external_content_url = ""
-    #     section_view = queryMultiAdapter((sec, self.request), name="view")
-    #     self.assertEqual(
-    #         section_view.get_embed_external_content(),
-    #         '<p class="unknow_service">Unknow service</p>',
-    #     )
+        sec.external_content_url = ""
+        section_view = queryMultiAdapter((sec, self.request), name="view")
+        self.assertEqual(
+            section_view.contents,
+            '<p class="unknow_service">Unknow service</p>',
+        )
 
-    #     sec.external_content_url = "https://app.eaglebe.com/auth/start"
-    #     section_view = queryMultiAdapter((sec, self.request), name="view")
-    #     self.assertEqual(
-    #         section_view.get_embed_external_content(),
-    #         '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
-    #     )
+        sec.external_content_url = "https://app.eaglebe.com/auth/start"
+        section_view = queryMultiAdapter((sec, self.request), name="view")
+        self.assertEqual(
+            section_view.contents,
+            '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
+        )
 
     def test_elloha_plugin(self):
         sec = api.content.create(
@@ -62,7 +62,7 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         )
         section_view = queryMultiAdapter((sec, self.request), name="view")
         self.assertEqual(
-            section_view.get_embed_external_content(),
+            section_view.contents,
             '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>',
         )
 
@@ -71,9 +71,10 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             "ConstellationWidgetContainer" : "11111111-1111-1111-1111-111111111111",
             "Idoi" : "22222222-2222-2222-2222-222222222222"
         }"""
+        self.maxDiff = None
         section_view = queryMultiAdapter((sec, self.request), name="view")
-        result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        result = '<div class="elloha" style="position:relative;"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
+        self.assertEqual(section_view.contents, result)
 
         # good extra params / dict keys are case insensitive
         sec.external_content_params = """{
@@ -81,21 +82,21 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
             "IDOI" : "22222222-2222-2222-2222-222222222222"
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
-        result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        result = '<div class="elloha" style="position:relative;"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
+        self.assertEqual(section_view.contents, result)
 
         # with bad params
         sec.external_content_params = "kamoulox"
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         sec.external_content_params = """{
             "ConstellationWidgetContainer" : "11111111-1111-1111-1111-111111111111"
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         sec.external_content_params = """{
             "CONSTELLATIONWIDGETCONTAINER" : "11111111-1111-1111-1111-111111111111",
@@ -103,4 +104,4 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         """
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)