Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openwisp_users/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from unittest.mock import patch

import django
from django.contrib import admin
from django.contrib import admin as django_admin
from django.contrib.auth import REDIRECT_FIELD_NAME, get_user_model
from django.contrib.auth.models import Permission
from django.core import mail
Expand Down Expand Up @@ -1967,7 +1967,7 @@ def test_class_attr_regression(self):
class TestAdmin(MultitenantAdminMixin):
multitenant_parent = "test"

owner_admin = OrganizationOwnerAdmin(Organization, admin.site)
owner_admin = OrganizationOwnerAdmin(Organization, django_admin.site)

test_admin = TestAdmin()
with self.subTest("multitenant_parent added to multitenant_shared_relations"):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
django-organizations~=2.5.0
django-extensions>=3.2,<4.2
django-allauth[socialaccount]~=65.8.1
django-allauth[socialaccount]>=65.12.0,<65.13.0
django-phonenumber-field~=8.1.0
phonenumbers~=9.0.10
openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
Expand Down
3 changes: 3 additions & 0 deletions tests/openwisp2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@
LOGIN_REDIRECT_URL = "admin:index"
ACCOUNT_EMAIL_CONFIRMATION_ANONYMOUS_REDIRECT_URL = "email_confirmation_success"
ACCOUNT_EMAIL_CONFIRMATION_AUTHENTICATED_REDIRECT_URL = "email_confirmation_success"
# disable allauth ratelimiting during automated tests
if TESTING:
ACCOUNT_RATE_LIMITS = False

if not PARALLEL:
CACHES = {
Expand Down
Loading