-
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/batch-email
- Loading branch information
Showing
1 changed file
with
2 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ | |
from openwisp_notifications.swapper import load_model, swapper_load_model | ||
from openwisp_notifications.widgets import _add_object_notification_widget | ||
from openwisp_users.admin import UserAdmin | ||
from openwisp_users.tests.utils import TestMultitenantAdminMixin, TestOrganizationMixin | ||
from openwisp_users.tests.utils import TestMultitenantAdminMixin | ||
|
||
from .test_helpers import MessagingRequest | ||
|
||
|
@@ -46,7 +46,7 @@ def pk(self): | |
op_request.user = MockUser(is_superuser=False) | ||
|
||
|
||
class BaseTestAdmin(TestOrganizationMixin, TestMultitenantAdminMixin, TestCase): | ||
class BaseTestAdmin(TestMultitenantAdminMixin, TestCase): | ||
def _login_admin(self): | ||
u = User.objects.create_superuser('admin', 'admin', '[email protected]') | ||
self.client.force_login(u) | ||
|