From 0d5cd46246f096a3847660103dc431392fe68d13 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Mon, 29 Jul 2024 12:52:22 +0200 Subject: [PATCH] Update test requirements --- .../test_utils/test_helpers.py | 18 +++++++++--------- tests/requirements/dj32_cms41.txt | 2 +- tests/requirements/dj40_cms41.txt | 2 +- tests/requirements/dj41_cms41.txt | 2 +- tests/requirements/dj42_cms41.txt | 2 +- tests/test_menus.py | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/djangocms_versioning/test_utils/test_helpers.py b/djangocms_versioning/test_utils/test_helpers.py index 51db206f..3c6e40d1 100644 --- a/djangocms_versioning/test_utils/test_helpers.py +++ b/djangocms_versioning/test_utils/test_helpers.py @@ -33,17 +33,17 @@ def get_toolbar(content_obj, user=None, **kwargs): toolbar.toolbar.set_object(content_obj) # Set the toolbar mode if kwargs.get("edit_mode", False): - toolbar.toolbar.edit_mode_active = True - toolbar.toolbar.preview_mode_active = False - toolbar.toolbar.structure_mode_active = False + toolbar.toolbar.__dict__["edit_mode_active"] = True + toolbar.toolbar.__dict__["preview_mode_active"] = False + toolbar.toolbar.__dict__["structure_mode_active"] = False elif kwargs.get("preview_mode", False): - toolbar.toolbar.edit_mode_active = False - toolbar.toolbar.preview_mode_active = True - toolbar.toolbar.structure_mode_active = False + toolbar.toolbar.__dict__["edit_mode_active"] = False + toolbar.toolbar.__dict__["preview_mode_active"] = True + toolbar.toolbar.__dict__["structure_mode_active"] = False elif kwargs.get("structure_mode", False): - toolbar.toolbar.edit_mode_active = False - toolbar.toolbar.preview_mode_active = False - toolbar.toolbar.structure_mode_active = True + toolbar.toolbar.__dict__["edit_mode_active"] = False + toolbar.toolbar.__dict__["preview_mode_active"] = False + toolbar.toolbar.__dict__["structure_mode_active"] = True toolbar.populate() return toolbar diff --git a/tests/requirements/dj32_cms41.txt b/tests/requirements/dj32_cms41.txt index 24060eaf..b81e33fd 100644 --- a/tests/requirements/dj32_cms41.txt +++ b/tests/requirements/dj32_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=3.2,<4.0 django-classy-tags diff --git a/tests/requirements/dj40_cms41.txt b/tests/requirements/dj40_cms41.txt index 7b1ccb33..08f469ca 100644 --- a/tests/requirements/dj40_cms41.txt +++ b/tests/requirements/dj40_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.0,<4.1 django-classy-tags diff --git a/tests/requirements/dj41_cms41.txt b/tests/requirements/dj41_cms41.txt index 5c1aa2b8..08e4d41b 100644 --- a/tests/requirements/dj41_cms41.txt +++ b/tests/requirements/dj41_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.1,<4.2 django-classy-tags diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt index 1e78584a..3546934e 100644 --- a/tests/requirements/dj42_cms41.txt +++ b/tests/requirements/dj42_cms41.txt @@ -1,6 +1,6 @@ -r requirements_base.txt -django-cms>=4.1.0rc2 +django-cms>=4.1,<4.2 Django>=4.2,<5 django-classy-tags diff --git a/tests/test_menus.py b/tests/test_menus.py index 5340d82d..384a7853 100644 --- a/tests/test_menus.py +++ b/tests/test_menus.py @@ -57,14 +57,14 @@ def _render_menu(self, user=None, **kwargs): toolbar = CMSToolbar(request) if kwargs.get("edit_mode", False): - toolbar.edit_mode_active = True - toolbar.preview_mode_active = False + toolbar.__dict__["edit_mode_active"] = True + toolbar.__dict__["preview_mode_active"] = False elif kwargs.get("preview_mode", False): - toolbar.edit_mode_active = False - toolbar.preview_mode_active = True + toolbar.__dict__["edit_mode_active"] = False + toolbar.__dict__["preview_mode_active"] = True else: - toolbar.edit_mode_active = False - toolbar.preview_mode_active = False + toolbar.__dict__["edit_mode_active"] = False + toolbar.__dict__["preview_mode_active"] = False request.toolbar = toolbar context = {"request": request}