imio.smartweb.core 1.1.14__py3-none-any.whl → 1.1.19__py3-none-any.whl

imio/smartweb/core/tests/test_cropping.py

@@ -41,9 +41,7 @@ class TestCropping(ImioSmartwebTestCase):
             contentFilter={"portal_type": "imio.smartweb.Footer"}
         )[0]
         adapter = ICropping(footer, alternate=None)
-        self.assertEqual(
-            ["affiche"], adapter.get_scales("background_image", self.request)
-        )
+        self.assertEqual([], adapter.get_scales("background_image", self.request))
 
         # minisite cropping
         view = getMultiAdapter((self.folder, self.request), name="minisite_settings")
@@ -52,7 +50,7 @@ class TestCropping(ImioSmartwebTestCase):
         self.assertEqual(
             ["liste", "vignette", "slide"], adapter.get_scales("image", self.request)
         )
-        self.assertEqual(["banner"], adapter.get_scales("banner", self.request))
+        self.assertEqual([], adapter.get_scales("banner", self.request))
         self.assertEqual(["preview"], adapter.get_scales("logo", self.request))
         view.disable()
 
@@ -63,14 +61,14 @@ class TestCropping(ImioSmartwebTestCase):
         self.assertEqual(
             ["liste", "vignette", "slide"], adapter.get_scales("image", self.request)
         )
-        self.assertEqual(["banner"], adapter.get_scales("banner", self.request))
+        self.assertEqual([], adapter.get_scales("banner", self.request))
         self.assertEqual(["preview"], adapter.get_scales("logo", self.request))
         view.disable()
 
         # folder cropping
         adapter = ICropping(self.folder, alternate=None)
         self.assertIsNotNone(adapter)
-        self.assertEqual(["banner"], adapter.get_scales("banner", self.request))
+        self.assertEqual([], adapter.get_scales("banner", self.request))
         self.assertNotIn("banner", adapter.get_scales("image", self.request))
 
         # page cropping
@@ -89,36 +87,16 @@ class TestCropping(ImioSmartwebTestCase):
             )
             adapter = ICropping(section, alternate=None)
             self.assertIsNotNone(adapter)
-            self.assertIn(
-                "affiche", adapter.get_scales("background_image", self.request)
-            )
+            self.assertEqual([], adapter.get_scales("background_image", self.request))
             self.assertNotIn("banner", adapter.get_scales("image", self.request))
-            if section_type == "imio.smartweb.SectionText":
-                self.assertEqual(
-                    ["affiche"], adapter.get_scales("background_image", self.request)
-                )
-                section.image = NamedBlobImage(**make_named_image())
-                section.image_size = "preview"
-                self.assertEqual(["preview"], adapter.get_scales("image", self.request))
-                section.image_size = "large"
-                self.assertEqual(["large"], adapter.get_scales("image", self.request))
-                section.image_size = "mini"
-                self.assertEqual(["mini"], adapter.get_scales("image", self.request))
 
     def test_cropping_view(self):
         cropping_view = getMultiAdapter(
             (self.folder, self.request), name="croppingeditor"
         )
-        self.assertEqual(len(list(cropping_view._scales("banner"))), 1)
+        self.assertEqual(len(list(cropping_view._scales("banner"))), 0)
         self.assertEqual(len(list(cropping_view._scales("image"))), 3)
         cropping_view = getMultiAdapter(
             (self.page, self.request), name="croppingeditor"
         )
         self.assertEqual(len(list(cropping_view._scales("image"))), 3)
-        section = api.content.create(
-            container=self.page,
-            type="imio.smartweb.SectionText",
-            title="Text section",
-        )
-        cropping_view = getMultiAdapter((section, self.request), name="croppingeditor")
-        self.assertEqual(len(list(cropping_view._scales("image"))), 1)

imio/smartweb/core/tests/test_folder.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from imio.smartweb.core.contents import IFolder
-from imio.smartweb.core.contents import Page
 from imio.smartweb.core.interfaces import IImioSmartwebCoreLayer
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
@@ -17,7 +16,6 @@ from plone.uuid.interfaces import IUUID
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.namedfile.file import NamedBlobImage
 from plone.testing.zope import Browser
-from plone.base.utils import check_id
 from time import sleep
 from zope.annotation.interfaces import IAnnotations
 from zope.component import createObject
@@ -123,17 +121,6 @@ class TestFolder(ImioSmartwebTestCase):
                 title="My {}".format(t),
             )
 
-    def test_checkValidId(self):
-        folder = api.content.create(
-            container=self.portal,
-            type="imio.smartweb.Folder",
-            title="Folder",
-        )
-        page = Page()
-        self.assertEqual(
-            check_id(page, "image", contained_by=folder), "${name} is reserved."
-        )
-
     def test_leadimage_in_folder_block_view(self):
         folder = api.content.create(
             container=self.portal,
@@ -379,3 +366,20 @@ class TestFolder(ImioSmartwebTestCase):
         uuid = IUUID(page2)
         brains = api.content.find(UID=uuid)
         self.assertEqual(len(brains), 0)
+
+    def test_select_view_template(self):
+        folder = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.Folder",
+            title="My folder",
+        )
+        self.request.form = {
+            "templateId": "block_view_with_images",
+            "form.buttons.apply": "Apply",
+        }
+        creation_date = folder.ModificationDate()
+        view = getMultiAdapter((folder, self.request), name="selectViewTemplate")
+        sleep(1)
+        view.selectViewTemplate()
+        new_date = folder.ModificationDate()
+        self.assertNotEqual(creation_date, new_date)

imio/smartweb/core/tests/test_page.py

@@ -2,7 +2,6 @@
 
 from collective.geolocationbehavior.geolocation import IGeolocatable
 from imio.smartweb.core.contents import IPage
-from imio.smartweb.core.contents import SectionText
 from imio.smartweb.core.interfaces import IImioSmartwebCoreLayer
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
@@ -14,7 +13,6 @@ from plone.app.testing import TEST_USER_ID
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.formwidget.geolocation.geolocation import Geolocation
 from plone.uuid.interfaces import IUUID
-from plone.base.utils import check_id
 from time import sleep
 from unittest.mock import patch
 from zope.component import createObject
@@ -130,17 +128,6 @@ class TestPage(ImioSmartwebTestCase):
                 title="My {}".format(t),
             )
 
-    def test_checkValidId(self):
-        page = api.content.create(
-            container=self.folder,
-            type="imio.smartweb.Page",
-            title="Page",
-        )
-        section = SectionText()
-        self.assertEqual(
-            check_id(section, "image", contained_by=page), "${name} is reserved."
-        )
-
     def test_js_bundles(self):
         page = api.content.create(
             container=self.portal,

imio/smartweb/core/tests/test_plausibleview.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from plone import api
+from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+from imio.smartweb.core.testing import ImioSmartwebTestCase
+from imio.smartweb.core.browser.dashboards.plausible import PlausibleView
+from unittest import mock
+from zope.component import queryMultiAdapter
+
+import os
+
+
+class Testplausible(ImioSmartwebTestCase):
+    layer = IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+
+    def set_registry_records(self):
+        api.portal.set_registry_record("smartweb.plausible_site", "site-registry.be")
+        api.portal.set_registry_record("smartweb.plausible_token", "token-registry")
+        api.portal.set_registry_record("smartweb.plausible_url", "url-registry.be")
+
+    @mock.patch.dict(
+        os.environ,
+        {
+            "SMARTWEB_PLAUSIBLE_SITE": "",
+            "SMARTWEB_PLAUSIBLE_TOKEN": "",
+            "SMARTWEB_PLAUSIBLE_URL": "",
+        },
+    )
+    def test_noenv(self):
+        view = PlausibleView(self.portal, self.request)
+        self.assertFalse(view.is_plausible_set)
+        self.set_registry_records()
+        self.assertTrue(view.is_plausible_set)
+        self.assertEqual(
+            view.get_iframe_src,
+            "https://url-registry.be/share/site-registry.be?auth=token-registry&embed=true&theme=light&background=transparent",
+        )
+        self.assertEqual(
+            view.get_embedhostjs_src,
+            "https://url-registry.be/js/embed.host.js",
+        )
+
+    @mock.patch.dict(
+        os.environ,
+        {
+            "SMARTWEB_PLAUSIBLE_SITE": "site-varenv.be",
+            "SMARTWEB_PLAUSIBLE_TOKEN": "token-varenv",
+            "SMARTWEB_PLAUSIBLE_URL": "url-varenv.be",
+        },
+    )
+    def test_env(self):
+        view = PlausibleView(self.portal, self.request)
+        self.assertTrue(view.is_plausible_set)
+        self.assertEqual(
+            view.get_iframe_src,
+            "https://url-varenv.be/share/site-varenv.be?auth=token-varenv&embed=true&theme=light&background=transparent",
+        )
+        self.assertEqual(
+            view.get_embedhostjs_src,
+            "https://url-varenv.be/js/embed.host.js",
+        )
+        self.set_registry_records()
+        self.assertEqual(
+            view.get_iframe_src,
+            "https://url-varenv.be/share/site-varenv.be?auth=token-varenv&embed=true&theme=light&background=transparent",
+        )
+        self.assertEqual(
+            view.get_embedhostjs_src,
+            "https://url-varenv.be/js/embed.host.js",
+        )
+
+    def test_plausible_view(self):
+        view = queryMultiAdapter((self.portal, self.request), name="stats")
+        self.assertNotIn("iframe", view())
+        self.assertIn("Plausible analytics is not set", view())
+        self.set_registry_records()
+        self.assertIn("iframe", view())
+        self.assertNotIn("Plausible analytics is not set", view())

imio/smartweb/core/tests/test_rest.py

@@ -2,6 +2,7 @@
 
 from freezegun import freeze_time
 from imio.smartweb.core import config
+from imio.smartweb.core.contents.rest.base import BaseEndpoint
 from imio.smartweb.core.contents.rest.directory.endpoint import DirectoryEndpoint
 from imio.smartweb.core.contents.rest.events.endpoint import EventsEndpoint
 from imio.smartweb.core.contents.rest.news.endpoint import NewsEndpoint
@@ -72,6 +73,45 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
     def tearDown(self):
         self.api_session.close()
 
+    @freeze_time("2021-09-14 8:00:00")
+    def test_convert_cached_image_scales(self):
+        endpoint = BaseEndpoint(self.portal, self.request)
+        modified_hash = "78fd1bab198354b6877aed44e2ea0b4d"
+
+        item = {"@id": "http://host.com/content", "image": {"scales": {}}}
+        endpoint.convert_cached_image_scales(item, modified_hash)
+        self.assertNotIn("image", item.keys())
+        self.assertEqual(
+            item["image_preview_scale"],
+            "http://host.com/content/@@images/image/preview?cache_key=78fd1bab198354b6877aed44e2ea0b4d",
+        )
+        self.assertEqual(
+            item["image_extralarge_scale"],
+            "http://host.com/content/@@images/image/extralarge?cache_key=78fd1bab198354b6877aed44e2ea0b4d",
+        )
+        self.assertEqual(
+            item["image_affiche_scale"],
+            "http://host.com/content/@@images/image/affiche?cache_key=78fd1bab198354b6877aed44e2ea0b4d",
+        )
+
+        item = {"@id": "http://host.com/content", "logo": {"scales": {}}}
+        endpoint.convert_cached_image_scales(item, modified_hash, "logo", ["thumb"])
+        self.assertNotIn("logo", item.keys())
+        self.assertEqual(
+            item["logo_thumb_scale"],
+            "http://host.com/content/@@images/logo/thumb?cache_key=78fd1bab198354b6877aed44e2ea0b4d",
+        )
+
+        item = {
+            "@id": "http://host.com/content",
+            "image": {"scales": {}},
+            "logo": {"scales": {}},
+        }
+        endpoint.convert_cached_image_scales(item, modified_hash, "logo", ["thumb"])
+        self.assertEqual(len(item.keys()), 3)
+        endpoint.convert_cached_image_scales(item, modified_hash)
+        self.assertEqual(len(item.keys()), 5)
+
     def test_get_extra_params(self):
         request = TestRequest(
             form={"taxonomy_contact_category": '("token")', "topics": "education"}

imio/smartweb/core/tests/test_section_contact.py

@@ -6,6 +6,7 @@ from datetime import timedelta
 from freezegun import freeze_time
 from imio.smartweb.core.contents.sections.contact.view import formatted_schedule
 from imio.smartweb.core.contents.sections.contact.view 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
 from imio.smartweb.core.tests.utils import clear_cache
@@ -16,6 +17,8 @@ from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
 from plone.app.testing import TEST_USER_PASSWORD
 from plone.testing.zope import Browser
+from time import sleep
+from zope.annotation.interfaces import IAnnotations
 from zope.component import queryMultiAdapter
 
 import json
@@ -497,3 +500,45 @@ class TestSectionContact(ImioSmartwebTestCase):
         self.assertNotIn("contact_leadimage portrait", view())
         contact.is_in_portrait_mode = True
         self.assertIn("contact_leadimage portrait", view())
+
+    @requests_mock.Mocker()
+    def test_contact_modified(self, m):
+        contact = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionContact",
+            title="My contact",
+        )
+        authentic_contact_uid = "2dc381f0fb584381b8e4a19c84f53b35"
+        contact.related_contact = authentic_contact_uid
+        contact_search_url = (
+            "http://localhost:8080/Plone/@search?UID={}&fullobjects=1".format(
+                authentic_contact_uid
+            )
+        )
+        m.get(contact_search_url, text=json.dumps(self.json_contact))
+        contact_view = queryMultiAdapter((contact, self.request), name="view")
+
+        annotations = IAnnotations(contact)
+        self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
+
+        self.assertIsNotNone(contact_view.contact)
+        hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertIsNotNone(hash_1)
+        first_modification = self.page.ModificationDate()
+
+        sleep(1)
+        clear_cache(self.request)
+        m.get(contact_search_url, text=json.dumps(self.json_no_contact))
+        self.assertIsNone(contact_view.contact)
+        next_modification = self.page.ModificationDate()
+        hash_2 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertNotEqual(hash_1, hash_2)
+        self.assertNotEqual(first_modification, next_modification)
+
+        sleep(1)
+        clear_cache(self.request)
+        self.assertIsNone(contact_view.contact)
+        last_modification = self.page.ModificationDate()
+        hash_3 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertEqual(hash_2, hash_3)
+        self.assertEqual(next_modification, last_modification)

imio/smartweb/core/tests/test_section_events.py

@@ -1,13 +1,17 @@
 # -*- coding: utf-8 -*-
 
+from datetime import datetime
 from freezegun import freeze_time
+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
 from imio.smartweb.core.tests.utils import get_json
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
+from time import sleep
 from z3c.relationfield import RelationValue
+from zope.annotation.interfaces import IAnnotations
 from zope.component import getUtility
 from zope.component import queryMultiAdapter
 from zope.intid.interfaces import IIntIds
@@ -30,33 +34,75 @@ class TestSectionEvents(ImioSmartwebTestCase):
         )
         self.json_events = get_json("resources/json_rest_events.json")
         self.json_specific_event = get_json("resources/json_rest_specific_events.json")
-
-    @requests_mock.Mocker()
-    @freeze_time("2021-11-15")
-    def test_events(self, m):
-        rest_events_view = api.content.create(
+        self.rest_events_view = api.content.create(
             container=self.portal,
             type="imio.smartweb.EventsView",
             title="Rest events view",
         )
-        events = api.content.create(
+        self.events = api.content.create(
             container=self.portalpage,
             type="imio.smartweb.SectionEvents",
             title="My events",
         )
+
+    @requests_mock.Mocker()
+    @freeze_time("2021-11-15")
+    def test_events(self, m):
         intids = getUtility(IIntIds)
-        events.related_events = "e73e6a81afea4a579cd0da2773af8d29"
-        events.linking_rest_view = RelationValue(intids.getId(rest_events_view))
+        self.events.related_events = "e73e6a81afea4a579cd0da2773af8d29"
+        self.events.linking_rest_view = RelationValue(
+            intids.getId(self.rest_events_view)
+        )
         view = queryMultiAdapter((self.portalpage, self.request), name="full_view")
         self.assertIn("My events", view())
-        events_view = queryMultiAdapter((events, self.request), name="carousel_view")
+        events_view = queryMultiAdapter(
+            (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"
         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)
-        events.specific_related_events = ["1178188bddde4ced95a6cf8bf04c443c"]
+        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"
         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")
+
+    @requests_mock.Mocker()
+    def test_events_modified(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)
+        )
+        annotations = IAnnotations(self.events)
+        self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
+
+        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"
+        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)
+        self.assertIsNotNone(hash_1)
+        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"
+        m.get(url, text="{}")
+        self.assertEqual(len(events_view.items), 0)
+        next_modification = self.portalpage.ModificationDate()
+        hash_2 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertNotEqual(hash_1, hash_2)
+        self.assertNotEqual(first_modification, next_modification)
+
+        sleep(1)
+        self.assertEqual(len(events_view.items), 0)
+        last_modification = self.portalpage.ModificationDate()
+        hash_3 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertEqual(hash_2, hash_3)
+        self.assertEqual(next_modification, last_modification)

imio/smartweb/core/tests/test_section_news.py

@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 
+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
 from imio.smartweb.core.tests.utils import get_json
 from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
+from time import sleep
 from z3c.relationfield import RelationValue
+from zope.annotation.interfaces import IAnnotations
 from zope.component import getUtility
 from zope.component import queryMultiAdapter
 from zope.intid.interfaces import IIntIds
@@ -29,33 +32,33 @@ class TestSectionNews(ImioSmartwebTestCase):
         )
         self.json_news = get_json("resources/json_rest_news.json")
         self.json_specific_news = get_json("resources/json_rest_specific_news.json")
-
-    @requests_mock.Mocker()
-    def test_news(self, m):
-        rest_news_view = api.content.create(
+        self.rest_news_view = api.content.create(
             container=self.portal,
             type="imio.smartweb.NewsView",
             title="Rest news view",
         )
-        news = api.content.create(
+        self.news = api.content.create(
             container=self.portalpage,
             type="imio.smartweb.SectionNews",
             title="My news",
         )
+
+    @requests_mock.Mocker()
+    def test_news(self, m):
         intids = getUtility(IIntIds)
-        news.related_news = "64f4cbee9a394a018a951f6d94452914"
-        news.linking_rest_view = RelationValue(intids.getId(rest_news_view))
-        news.link_text = "Voir toutes les actualités"
+        self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
+        self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
+        self.news.link_text = "Voir toutes les actualités"
         view = queryMultiAdapter((self.portalpage, self.request), name="full_view")
         self.assertIn("My news", view())
-        news_view = queryMultiAdapter((news, self.request), name="carousel_view")
+        news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
         self.assertEqual(news_view.items, [])
         url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
         self.assertEqual(news_view.items[0][0].get("title"), "Première actualité")
         self.assertEqual(len(news_view.items[0]), 3)
 
-        news.specific_related_newsitems = [
+        self.news.specific_related_newsitems = [
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
             "bfe2b4391a0f4a8db6d8b7fed63d1c4a",
         ]
@@ -66,7 +69,7 @@ class TestSectionNews(ImioSmartwebTestCase):
             news_view.items[0][0].get("title"), "Restauration de la piscine"
         )
 
-        news.specific_related_newsitems = [
+        self.news.specific_related_newsitems = [
             "bfe2b4391a0f4a8db6d8b7fed63d1c4a",
             "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         ]
@@ -74,3 +77,35 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.assertEqual(
             news_view.items[0][0].get("title"), "Restauration de la Bibliothèque"
         )
+
+    @requests_mock.Mocker()
+    def test_news_modified(self, m):
+        intids = getUtility(IIntIds)
+        self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
+        self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
+        annotations = IAnnotations(self.news)
+        self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
+
+        news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        m.get(url, text=json.dumps(self.json_news))
+        self.assertEqual(len(news_view.items[0]), 3)
+        hash_1 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertIsNotNone(hash_1)
+        first_modification = self.portalpage.ModificationDate()
+
+        sleep(1)
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        m.get(url, text="{}")
+        self.assertEqual(len(news_view.items), 0)
+        next_modification = self.portalpage.ModificationDate()
+        hash_2 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertNotEqual(hash_1, hash_2)
+        self.assertNotEqual(first_modification, next_modification)
+
+        sleep(1)
+        self.assertEqual(len(news_view.items), 0)
+        last_modification = self.portalpage.ModificationDate()
+        hash_3 = annotations.get(SECTION_ITEMS_HASH_KEY)
+        self.assertEqual(hash_2, hash_3)
+        self.assertEqual(next_modification, last_modification)

imio/smartweb/core/tests/test_sections.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from AccessControl.unauthorized import Unauthorized
 from bs4 import BeautifulSoup
 from collective.geolocationbehavior.geolocation import IGeolocatable
 from functools import reduce
@@ -110,6 +111,39 @@ class TestSections(ImioSmartwebTestCase):
             "https://www.youtube.com/embed/_dOAthafoGQ?feature=oembed", embedded_video
         )
 
+    def test_external_content_section(self):
+        setRoles(self.portal, TEST_USER_ID, ["Contributor"])
+        with self.assertRaises(Unauthorized):
+            api.content.create(
+                container=self.page,
+                type="imio.smartweb.SectionExternalContent",
+                title="Section External Content",
+            )
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        section = api.content.create(
+            container=self.page,
+            type="imio.smartweb.SectionExternalContent",
+            title="Section External Content",
+        )
+        section.external_content_url = (
+            "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re"
+        )
+        view = queryMultiAdapter((section, self.request), name="view")
+        embedded_content = view.get_embed_external_content()
+        self.assertIn("iframe", embedded_content)
+        self.assertIn('class="eaglebe"', embedded_content)
+        self.assertIn('scrolling="no"', embedded_content)
+        self.assertIn(
+            "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re", embedded_content
+        )
+
+        section.external_content_url = "http://www.perdu.com"
+        view = queryMultiAdapter((section, self.request), name="view")
+        embedded_content = view.get_embed_external_content()
+        self.assertNotIn("iframe", embedded_content)
+        self.assertNotIn("class='eaglebe'", embedded_content)
+        self.assertIn("<p class='unknow_service'>Unknow service</p>", embedded_content)
+
     def test_map_section(self):
         section = api.content.create(
             container=self.page,