github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit tests

Browse Source
This commit is contained in:
Antoine Nguyen
2025-02-14 13:41:10 +01:00
parent fc108a4115
commit e4386e4b4c
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/radicale_config/config
+1 -1
View File
@@ -71,7 +71,7 @@ hosts = 0.0.0.0:5232
# Authentication method
# Value: none | htpasswd | remote_user | http_x_remote_user
type = radicale_modoboa_oauth2
type = radicale_modoboa_auth_oauth2
# Htpasswd filename
# htpasswd_filename = users
modoboa/calendars/management/commands/generate_rights.py
-2
View File
@@ -11,7 +11,6 @@ from modoboa.core.models import User
from modoboa.parameters import tools as param_tools
from ... import models
from ...modo_extension import Radicale
class Command(BaseCommand):
@@ -130,7 +129,6 @@ permissions = %s
def handle(self, *args, **options):
"""Command entry point."""
Radicale().load()
path = param_tools.get_global_parameter("rights_file_path", app="calendars")
if not options["force"]:
try:
modoboa/calendars/tests.py
+10 -10
View File
@@ -394,12 +394,12 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
self.client.post(reverse("core:login"), data)
# FIXME: drf nested routers does not handle reverse() properly
url = "/api/v1/user-calendars/{}/events/{}/".format(self.calendar.pk, 1234)
url = "/api/v2/user-calendars/{}/events/{}/".format(self.calendar.pk, 1234)
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertTrue(response.json()["title"].startswith("Bastille"))
url = "/api/v1/user-calendars/{}/events/".format(self.calendar.pk)
url = "/api/v2/user-calendars/{}/events/".format(self.calendar.pk)
url = "{}?start={}&end={}".format(url, "20060712T182145Z", "20070712T182145Z")
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
@@ -411,12 +411,12 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
self.client.post(reverse("core:login"), data)
# FIXME: drf nested routers does not handle reverse() properly
url = "/api/v1/shared-calendars/{}/events/{}/".format(self.scalendar.pk, 1234)
url = "/api/v2/shared-calendars/{}/events/{}/".format(self.scalendar.pk, 1234)
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertTrue(response.json()["title"].startswith("Bastille"))
url = "/api/v1/shared-calendars/{}/events/".format(self.scalendar.pk)
url = "/api/v2/shared-calendars/{}/events/".format(self.scalendar.pk)
url = "{}?start={}&end={}".format(url, "20060712T182145Z", "20070712T182145Z")
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
@@ -427,7 +427,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
data = {"username": "user@test.com", "password": "toto"}
self.client.post(reverse("core:login"), data)
url = "/api/v1/user-calendars/{}/events/".format(self.calendar.pk)
url = "/api/v2/user-calendars/{}/events/".format(self.calendar.pk)
data = {
"title": "Test event",
"start": "2018-03-27T00:00:00Z",
@@ -441,7 +441,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
self.assertEqual(response.status_code, 201)
self.assertIn("id", response.json())
url = "/api/v1/shared-calendars/{}/events/".format(self.scalendar.pk)
url = "/api/v2/shared-calendars/{}/events/".format(self.scalendar.pk)
data = {
"title": "Test event 2",
"start": "2018-03-27T00:00:00Z",
@@ -460,7 +460,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
data = {"username": "user@test.com", "password": "toto"}
self.client.post(reverse("core:login"), data)
url = "/api/v1/user-calendars/{}/events/1234/".format(self.calendar.pk)
url = "/api/v2/user-calendars/{}/events/1234/".format(self.calendar.pk)
data = {
"title": "Test event",
"start": "2018-03-27T00:00:00Z",
@@ -483,7 +483,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
data = {"username": "user@test.com", "password": "toto"}
self.client.post(reverse("core:login"), data)
url = "/api/v1/user-calendars/{}/events/1234/".format(self.calendar.pk)
url = "/api/v2/user-calendars/{}/events/1234/".format(self.calendar.pk)
data = {
"start": "2018-03-27T00:00:00Z",
"end": "2018-03-28T00:00:00Z",
@@ -506,7 +506,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
"calendar": self.scalendar.pk,
"new_calendar_type": "shared",
}
url = "/api/v1/user-calendars/{}/events/1234/".format(self.calendar.pk)
url = "/api/v2/user-calendars/{}/events/1234/".format(self.calendar.pk)
response = self.client.put(url, data=data, format="json")
self.assertEqual(response.status_code, 200)
@@ -515,7 +515,7 @@ class EventViewSetTestCase(TestDataMixin, ModoAPITestCase):
data = {"username": "user@test.com", "password": "toto"}
self.client.post(reverse("core:login"), data)
url = "/api/v1/shared-calendars/{}/events/1234/".format(self.scalendar.pk)
url = "/api/v2/shared-calendars/{}/events/1234/".format(self.scalendar.pk)
response = self.client.delete(url)
self.assertEqual(response.status_code, 200)
modoboa/contacts/tests.py
+7 -6
View File
@@ -45,7 +45,7 @@ class TestDataMixin:
addressbook=cls.addressbook, first_name="Bart", emails=["bart@simpson.com"]
)
def setUp(self):
def setUp(self, *args, **kwargs):
"""Initiate test context."""
self.client.force_login(self.user)
self.set_global_parameter(
@@ -54,19 +54,20 @@ class TestDataMixin:
def enable_cdav_sync(self):
"""Enable sync. for user."""
url = reverse("core:user_preferences")
url = reverse("v2:parameter-user-detail", args=["contacts"])
with httmock.HTTMock(mocks.options_mock, mocks.mkcol_mock):
response = self.client.post(
response = self.client.put(
url,
{
"contacts-enable_carddav_sync": True,
"contacts-sync_frequency": 300,
"enable_carddav_sync": True,
"sync_frequency": 300,
},
format="json",
)
self.assertEqual(response.status_code, 200)
class ViewsTestCase(TestDataMixin, ModoTestCase):
class ViewsTestCase(TestDataMixin, ModoAPITestCase):
"""Check views."""
def test_user_settings(self):