diff --git a/app/access/models.py b/app/access/models.py index 21f4b7eb..53e47dec 100644 --- a/app/access/models.py +++ b/app/access/models.py @@ -1,6 +1,6 @@ from django.conf import settings from django.db import models -from django.contrib.auth.models import User, Group, Permission +from django.contrib.auth.models import User, Group from rest_framework.reverse import reverse diff --git a/app/access/tests/functional/organization/test_organization_viewset.py b/app/access/tests/functional/organization/test_organization_viewset.py index d30c41eb..c1f165a2 100644 --- a/app/access/tests/functional/organization/test_organization_viewset.py +++ b/app/access/tests/functional/organization/test_organization_viewset.py @@ -4,12 +4,12 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/access/tests/functional/team/test_team_permission_viewset.py b/app/access/tests/functional/team/test_team_permission_viewset.py index 70afb2f5..1add39f0 100644 --- a/app/access/tests/functional/team/test_team_permission_viewset.py +++ b/app/access/tests/functional/team/test_team_permission_viewset.py @@ -4,13 +4,13 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import Client, TestCase from rest_framework.reverse import reverse -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional from api.tests.abstract.api_permissions_viewset import APIPermissions diff --git a/app/access/tests/functional/team/test_team_serializer.py b/app/access/tests/functional/team/test_team_serializer.py index 2797472f..6273cda3 100644 --- a/app/access/tests/functional/team/test_team_serializer.py +++ b/app/access/tests/functional/team/test_team_serializer.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase from rest_framework.exceptions import ValidationError from access.middleware.request import Tenancy -from access.models import Organization, Permission +from access.models import Organization from access.serializers.teams import ( Team, diff --git a/app/access/tests/functional/team_user/test_team_user_permission_viewset.py b/app/access/tests/functional/team_user/test_team_user_permission_viewset.py index 2d93321d..51a6aae9 100644 --- a/app/access/tests/functional/team_user/test_team_user_permission_viewset.py +++ b/app/access/tests/functional/team_user/test_team_user_permission_viewset.py @@ -4,13 +4,13 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import Client, TestCase from rest_framework.reverse import reverse -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional from api.tests.abstract.api_permissions_viewset import APIPermissions diff --git a/app/access/tests/functional/team_user/test_team_user_serializer.py b/app/access/tests/functional/team_user/test_team_user_serializer.py index 6a355bd6..9d05e1d0 100644 --- a/app/access/tests/functional/team_user/test_team_user_serializer.py +++ b/app/access/tests/functional/team_user/test_team_user_serializer.py @@ -1,12 +1,12 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase from rest_framework.exceptions import ValidationError -from access.models import Organization, Permission, Team +from access.models import Organization, Team from access.serializers.team_user import ( TeamUsers, diff --git a/app/access/tests/unit/mixin/test_permission.py b/app/access/tests/unit/mixin/test_permission.py index 9c632d15..0bf50304 100644 --- a/app/access/tests/unit/mixin/test_permission.py +++ b/app/access/tests/unit/mixin/test_permission.py @@ -1,7 +1,7 @@ import pytest from unittest.mock import Mock, patch -from django.contrib.auth.models import User, AnonymousUser +from django.contrib.auth.models import User, Permission, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.test import TestCase @@ -13,7 +13,7 @@ from api.viewsets.common import ModelViewSet from access.mixins.organization import OrganizationMixin from access.mixins.permissions import OrganizationPermissionMixin -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from core import exceptions as centurion_exceptions from core.models.manufacturer import Manufacturer diff --git a/app/access/tests/unit/organization/test_organizaiton_api.py b/app/access/tests/unit/organization/test_organizaiton_api.py index 2f103199..398c1c27 100644 --- a/app/access/tests/unit/organization/test_organizaiton_api.py +++ b/app/access/tests/unit/organization/test_organizaiton_api.py @@ -2,14 +2,14 @@ import pytest import unittest from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers diff --git a/app/access/tests/unit/organization/test_organizaiton_api_v2.py b/app/access/tests/unit/organization/test_organizaiton_api_v2.py index be29c4bc..f738aa73 100644 --- a/app/access/tests/unit/organization/test_organizaiton_api_v2.py +++ b/app/access/tests/unit/organization/test_organizaiton_api_v2.py @@ -2,14 +2,14 @@ import pytest import unittest from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APICommonFields diff --git a/app/access/tests/unit/organization/test_organizaiton_permission.py b/app/access/tests/unit/organization/test_organizaiton_permission.py index b2e041dc..9f263cfe 100644 --- a/app/access/tests/unit/organization/test_organizaiton_permission.py +++ b/app/access/tests/unit/organization/test_organizaiton_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionChange, OrganizationManagerModelPermissionView from app.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange diff --git a/app/access/tests/unit/organization/test_organizaiton_permission_api.py b/app/access/tests/unit/organization/test_organizaiton_permission_api.py index eccb3c55..eba5ffd0 100644 --- a/app/access/tests/unit/organization/test_organizaiton_permission_api.py +++ b/app/access/tests/unit/organization/test_organizaiton_permission_api.py @@ -2,12 +2,12 @@ import pytest import unittest from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissionChange, APIPermissionView diff --git a/app/access/tests/unit/team/test_team.py b/app/access/tests/unit/team/test_team.py index 11312714..713f7657 100644 --- a/app/access/tests/unit/team/test_team.py +++ b/app/access/tests/unit/team/test_team.py @@ -1,9 +1,10 @@ import pytest import unittest +from django.contrib.auth.models import Permission from django.test import TestCase, Client -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.models import TenancyModel diff --git a/app/access/tests/unit/team/test_team_api.py b/app/access/tests/unit/team/test_team_api.py index c8fffe45..e0b7214c 100644 --- a/app/access/tests/unit/team/test_team_api.py +++ b/app/access/tests/unit/team/test_team_api.py @@ -4,14 +4,14 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers # from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/access/tests/unit/team/test_team_api_v2.py b/app/access/tests/unit/team/test_team_api_v2.py index cd6fe825..44246d36 100644 --- a/app/access/tests/unit/team/test_team_api_v2.py +++ b/app/access/tests/unit/team/test_team_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/access/tests/unit/team/test_team_permission.py b/app/access/tests/unit/team/test_team_permission.py index 3ee1809d..30676c64 100644 --- a/app/access/tests/unit/team/test_team_permission.py +++ b/app/access/tests/unit/team/test_team_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissions from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/access/tests/unit/team/test_team_permission_api.py b/app/access/tests/unit/team/test_team_permission_api.py index 7345cae2..98e5da09 100644 --- a/app/access/tests/unit/team/test_team_permission_api.py +++ b/app/access/tests/unit/team/test_team_permission_api.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/access/tests/unit/team_user/test_team_user.py b/app/access/tests/unit/team_user/test_team_user.py index 15efe942..d39fdae7 100644 --- a/app/access/tests/unit/team_user/test_team_user.py +++ b/app/access/tests/unit/team_user/test_team_user.py @@ -2,9 +2,9 @@ import pytest import unittest from django.test import TestCase, Client -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.models import BaseModel diff --git a/app/access/tests/unit/team_user/test_team_user_api_v2.py b/app/access/tests/unit/team_user/test_team_user_api_v2.py index 634e565a..0643eafa 100644 --- a/app/access/tests/unit/team_user/test_team_user_api_v2.py +++ b/app/access/tests/unit/team_user/test_team_user_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APICommonFields diff --git a/app/access/tests/unit/team_user/test_team_user_permission.py b/app/access/tests/unit/team_user/test_team_user_permission.py index 7128fb27..c227b27d 100644 --- a/app/access/tests/unit/team_user/test_team_user_permission.py +++ b/app/access/tests/unit/team_user/test_team_user_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionAdd, OrganizationManagerModelPermissionDelete from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete diff --git a/app/api/tests/abstract/viewsets.py b/app/api/tests/abstract/viewsets.py index 7b397669..5e75355a 100644 --- a/app/api/tests/abstract/viewsets.py +++ b/app/api/tests/abstract/viewsets.py @@ -1,4 +1,4 @@ -from django.contrib.auth.models import ContentType, User +from django.contrib.auth.models import ContentType, Permission, User from unittest.mock import patch, PropertyMock @@ -7,7 +7,7 @@ from access.mixins.permissions import OrganizationPermissionMixin from api.react_ui_metadata import ReactUIMetadata from access.middleware.request import Tenancy -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from settings.models.app_settings import AppSettings diff --git a/app/api/tests/unit/test_navigation_menu.py b/app/api/tests/unit/test_navigation_menu.py index 7ac7a91d..f1ce88f5 100644 --- a/app/api/tests/unit/test_navigation_menu.py +++ b/app/api/tests/unit/test_navigation_menu.py @@ -1,8 +1,8 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.react_ui_metadata import ReactUIMetadata diff --git a/app/api/tests/unit/token/test_token.py b/app/api/tests/unit/token/test_token.py index b3ec4b74..7b946ab3 100644 --- a/app/api/tests/unit/token/test_token.py +++ b/app/api/tests/unit/token/test_token.py @@ -6,11 +6,11 @@ import unittest from datetime import datetime, timedelta -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.shortcuts import reverse from django.test import TestCase, Client -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.models.tokens import AuthToken diff --git a/app/assistance/tests/functional/knowledge_base/test_knowledge_base_viewset.py b/app/assistance/tests/functional/knowledge_base/test_knowledge_base_viewset.py index 13207abc..f09e2db1 100644 --- a/app/assistance/tests/functional/knowledge_base/test_knowledge_base_viewset.py +++ b/app/assistance/tests/functional/knowledge_base/test_knowledge_base_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_viewset.py b/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_viewset.py index c9bb63e5..380a5b47 100644 --- a/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_viewset.py +++ b/app/assistance/tests/functional/knowledge_base_category/test_knowledge_base_category_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/assistance/tests/functional/model_knowledge_base_article/test_model_knowledge_base_article_viewset.py b/app/assistance/tests/functional/model_knowledge_base_article/test_model_knowledge_base_article_viewset.py index 45168037..e6b0de4d 100644 --- a/app/assistance/tests/functional/model_knowledge_base_article/test_model_knowledge_base_article_viewset.py +++ b/app/assistance/tests/functional/model_knowledge_base_article/test_model_knowledge_base_article_viewset.py @@ -4,13 +4,13 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import Client, TestCase from rest_framework.reverse import reverse -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionAdd, diff --git a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_api_v2.py b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_api_v2.py index 1f9f7b47..9f7e8658 100644 --- a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_api_v2.py +++ b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py index 76368584..1293a227 100644 --- a/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py +++ b/app/assistance/tests/unit/knowledge_base/test_knowledge_base_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_api_v2.py b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_api_v2.py index 5302225c..93cc1094 100644 --- a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_api_v2.py +++ b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py index d14d4e1e..2c991c54 100644 --- a/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py +++ b/app/assistance/tests/unit/knowledge_base_category/test_knowledge_base_category_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/assistance/tests/unit/model_knowledge_base_article/test_model_knowledge_base_article_api_v2.py b/app/assistance/tests/unit/model_knowledge_base_article/test_model_knowledge_base_article_api_v2.py index 3f976540..c5ff5361 100644 --- a/app/assistance/tests/unit/model_knowledge_base_article/test_model_knowledge_base_article_api_v2.py +++ b/app/assistance/tests/unit/model_knowledge_base_article/test_model_knowledge_base_article_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/config_management/tests/functional/config_groups/test_config_groups_viewset.py b/app/config_management/tests/functional/config_groups/test_config_groups_viewset.py index e1894b52..2a92ea79 100644 --- a/app/config_management/tests/functional/config_groups/test_config_groups_viewset.py +++ b/app/config_management/tests/functional/config_groups/test_config_groups_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/config_management/tests/functional/config_groups_software/test_config_groups_software_viewset.py b/app/config_management/tests/functional/config_groups_software/test_config_groups_software_viewset.py index 07176d71..cf754283 100644 --- a/app/config_management/tests/functional/config_groups_software/test_config_groups_software_viewset.py +++ b/app/config_management/tests/functional/config_groups_software/test_config_groups_software_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/config_management/tests/unit/config_groups/test_config_groups_api.py b/app/config_management/tests/unit/config_groups/test_config_groups_api.py index 65d35c9e..cdc5182c 100644 --- a/app/config_management/tests/unit/config_groups/test_config_groups_api.py +++ b/app/config_management/tests/unit/config_groups/test_config_groups_api.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.models import TenancyModel diff --git a/app/config_management/tests/unit/config_groups/test_config_groups_api_v2.py b/app/config_management/tests/unit/config_groups/test_config_groups_api_v2.py index 99383cfb..0a0218e3 100644 --- a/app/config_management/tests/unit/config_groups/test_config_groups_api_v2.py +++ b/app/config_management/tests/unit/config_groups/test_config_groups_api_v2.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/config_management/tests/unit/config_groups/test_config_groups_permission.py b/app/config_management/tests/unit/config_groups/test_config_groups_permission.py index b6ab681c..e28b6bae 100644 --- a/app/config_management/tests/unit/config_groups/test_config_groups_permission.py +++ b/app/config_management/tests/unit/config_groups/test_config_groups_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_api_v2.py b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_api_v2.py index add4e592..de9f4e88 100644 --- a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_api_v2.py +++ b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_api_v2.py @@ -1,14 +1,14 @@ import pytest # import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py index 55b7630a..4a6bb5c0 100644 --- a/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py +++ b/app/config_management/tests/unit/config_groups_software/test_config_groups_software_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete diff --git a/app/core/tests/abstract/model_notes_api_fields.py b/app/core/tests/abstract/model_notes_api_fields.py index 047b0942..5816383b 100644 --- a/app/core/tests/abstract/model_notes_api_fields.py +++ b/app/core/tests/abstract/model_notes_api_fields.py @@ -1,11 +1,11 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/abstract/test_functional_notes_viewset.py b/app/core/tests/abstract/test_functional_notes_viewset.py index cf47e2ef..b14337f3 100644 --- a/app/core/tests/abstract/test_functional_notes_viewset.py +++ b/app/core/tests/abstract/test_functional_notes_viewset.py @@ -1,7 +1,7 @@ -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers # Test Cases from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional diff --git a/app/core/tests/abstract/test_item_ticket_api_v2.py b/app/core/tests/abstract/test_item_ticket_api_v2.py index d6e656bf..1bd07ae7 100644 --- a/app/core/tests/abstract/test_item_ticket_api_v2.py +++ b/app/core/tests/abstract/test_item_ticket_api_v2.py @@ -1,11 +1,11 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Permission from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/abstract/test_ticket_api_v2.py b/app/core/tests/abstract/test_ticket_api_v2.py index 6330bd6f..32e6f9ed 100644 --- a/app/core/tests/abstract/test_ticket_api_v2.py +++ b/app/core/tests/abstract/test_ticket_api_v2.py @@ -1,11 +1,11 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/abstract/test_ticket_serializer.py b/app/core/tests/abstract/test_ticket_serializer.py index e238ac15..34511de6 100644 --- a/app/core/tests/abstract/test_ticket_serializer.py +++ b/app/core/tests/abstract/test_ticket_serializer.py @@ -1,11 +1,11 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase from access.middleware.request import Tenancy -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from rest_framework.exceptions import ValidationError diff --git a/app/core/tests/abstract/test_ticket_viewset.py b/app/core/tests/abstract/test_ticket_viewset.py index f267a276..63dae780 100644 --- a/app/core/tests/abstract/test_ticket_viewset.py +++ b/app/core/tests/abstract/test_ticket_viewset.py @@ -1,9 +1,9 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/core/tests/functional/manufacturer/test_manufacturer_viewset.py b/app/core/tests/functional/manufacturer/test_manufacturer_viewset.py index 5f69c433..bca2aea1 100644 --- a/app/core/tests/functional/manufacturer/test_manufacturer_viewset.py +++ b/app/core/tests/functional/manufacturer/test_manufacturer_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/core/tests/functional/related_ticket/test_related_ticket_viewset.py b/app/core/tests/functional/related_ticket/test_related_ticket_viewset.py index d40f66f4..b110d4b1 100644 --- a/app/core/tests/functional/related_ticket/test_related_ticket_viewset.py +++ b/app/core/tests/functional/related_ticket/test_related_ticket_viewset.py @@ -4,12 +4,12 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionDelete, diff --git a/app/core/tests/functional/test_task_result/test_task_result_viewset.py b/app/core/tests/functional/test_task_result/test_task_result_viewset.py index 4015fabd..322c3547 100644 --- a/app/core/tests/functional/test_task_result/test_task_result_viewset.py +++ b/app/core/tests/functional/test_task_result/test_task_result_viewset.py @@ -1,6 +1,6 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase @@ -8,7 +8,7 @@ from django import urls from django_celery_results.models import TaskResult -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionAdd, diff --git a/app/core/tests/functional/ticket_category/test_ticket_category_viewset.py b/app/core/tests/functional/ticket_category/test_ticket_category_viewset.py index ff7725e6..ed215d30 100644 --- a/app/core/tests/functional/ticket_category/test_ticket_category_viewset.py +++ b/app/core/tests/functional/ticket_category/test_ticket_category_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/core/tests/functional/ticket_comment/test_ticket_comment_viewset.py b/app/core/tests/functional/ticket_comment/test_ticket_comment_viewset.py index 06b58eae..bdf292c1 100644 --- a/app/core/tests/functional/ticket_comment/test_ticket_comment_viewset.py +++ b/app/core/tests/functional/ticket_comment/test_ticket_comment_viewset.py @@ -1,9 +1,9 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional diff --git a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py b/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py index 510c2ac4..7521b098 100644 --- a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py +++ b/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_viewset.py b/app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_viewset.py index d7a1aaf9..4c3c30ce 100644 --- a/app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_viewset.py +++ b/app/core/tests/functional/ticket_linked_item/test_ticket_linked_item_viewset.py @@ -1,9 +1,9 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionAdd, diff --git a/app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py b/app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py index ff192d2e..1834b233 100644 --- a/app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py +++ b/app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/manufacturer/test_manufacturer_permission.py b/app/core/tests/unit/manufacturer/test_manufacturer_permission.py index 6f3a7db9..88da77f7 100644 --- a/app/core/tests/unit/manufacturer/test_manufacturer_permission.py +++ b/app/core/tests/unit/manufacturer/test_manufacturer_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py b/app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py index a3c49e97..3c204436 100644 --- a/app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py +++ b/app/core/tests/unit/related_ticket/test_related_ticket_api_v2.py @@ -1,13 +1,13 @@ # import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/test_task_result/test_task_result.py b/app/core/tests/unit/test_task_result/test_task_result.py index dc4461e8..5a8d2316 100644 --- a/app/core/tests/unit/test_task_result/test_task_result.py +++ b/app/core/tests/unit/test_task_result/test_task_result.py @@ -2,14 +2,14 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase from celery import states -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissionsView diff --git a/app/core/tests/unit/test_task_result/test_task_result_api_v2.py b/app/core/tests/unit/test_task_result/test_task_result_api_v2.py index 16a54985..35cb51ab 100644 --- a/app/core/tests/unit/test_task_result/test_task_result_api_v2.py +++ b/app/core/tests/unit/test_task_result/test_task_result_api_v2.py @@ -1,7 +1,7 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase @@ -10,7 +10,7 @@ from django_celery_results.models import TaskResult from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APICommonFields diff --git a/app/core/tests/unit/ticket/test_ticket_permission.py b/app/core/tests/unit/ticket/test_ticket_permission.py index fb79ab06..25cdd604 100644 --- a/app/core/tests/unit/ticket/test_ticket_permission.py +++ b/app/core/tests/unit/ticket/test_ticket_permission.py @@ -3,7 +3,7 @@ import re from datetime import datetime from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -12,7 +12,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/core/tests/unit/ticket/test_ticket_permission_api.py b/app/core/tests/unit/ticket/test_ticket_permission_api.py index 740a05bf..50cac668 100644 --- a/app/core/tests/unit/ticket/test_ticket_permission_api.py +++ b/app/core/tests/unit/ticket/test_ticket_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py b/app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py index 5ea2850b..6e7e2269 100644 --- a/app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py +++ b/app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_permission.py b/app/core/tests/unit/ticket_category/test_ticket_category_permission.py index b19374bb..3e28f9d3 100644 --- a/app/core/tests/unit/ticket_category/test_ticket_category_permission.py +++ b/app/core/tests/unit/ticket_category/test_ticket_category_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_permission_api.py b/app/core/tests/unit/ticket_category/test_ticket_category_permission_api.py index 7ad322f4..f3ead52e 100644 --- a/app/core/tests/unit/ticket_category/test_ticket_category_permission_api.py +++ b/app/core/tests/unit/ticket_category/test_ticket_category_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_api_v2.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_api_v2.py index 035eb019..6465d245 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_api_v2.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_api_v2.py @@ -1,13 +1,13 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py index c7d4d193..eff4648f 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission.py @@ -1,7 +1,7 @@ import re from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -10,7 +10,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd, ModelPermissionsChange diff --git a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.py b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.py index c802635b..7163cec7 100644 --- a/app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.py +++ b/app/core/tests/unit/ticket_comment/test_ticket_comment_permission_api.py @@ -2,12 +2,12 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions, APIPermissionAdd, APIPermissionChange diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py index 35c07dcf..e9915e82 100644 --- a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py +++ b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py index a7b00f27..076d7703 100644 --- a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py +++ b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.py b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.py index 34d39953..fb52ad60 100644 --- a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.py +++ b/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py index 6c3e5650..6365a219 100644 --- a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py +++ b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_api_v2.py @@ -1,13 +1,13 @@ # import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py index bb3f8648..dc2691af 100644 --- a/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py +++ b/app/core/tests/unit/ticket_linked_item/test_ticket_linked_item_permission.py @@ -1,7 +1,7 @@ import re from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -10,7 +10,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions, ModelPermissionsAdd diff --git a/app/itam/tests/functional/device/test_device_viewset.py b/app/itam/tests/functional/device/test_device_viewset.py index 73ab47a2..9b8a973b 100644 --- a/app/itam/tests/functional/device/test_device_viewset.py +++ b/app/itam/tests/functional/device/test_device_viewset.py @@ -1,11 +1,11 @@ import pytest -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_serializer_viewset import SerializersTestCases from api.tests.abstract.api_permissions_viewset import APIPermissions diff --git a/app/itam/tests/functional/device_model/test_device_model_viewset.py b/app/itam/tests/functional/device_model/test_device_model_viewset.py index cf9bd45e..99afb94c 100644 --- a/app/itam/tests/functional/device_model/test_device_model_viewset.py +++ b/app/itam/tests/functional/device_model/test_device_model_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/device_operating_system/test_device_operating_system_viewset.py b/app/itam/tests/functional/device_operating_system/test_device_operating_system_viewset.py index 824d42d0..6c3ffc96 100644 --- a/app/itam/tests/functional/device_operating_system/test_device_operating_system_viewset.py +++ b/app/itam/tests/functional/device_operating_system/test_device_operating_system_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/device_software/test_device_software_viewset.py b/app/itam/tests/functional/device_software/test_device_software_viewset.py index 71f35c36..2bfb1fe6 100644 --- a/app/itam/tests/functional/device_software/test_device_software_viewset.py +++ b/app/itam/tests/functional/device_software/test_device_software_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/device_type/test_device_type_viewset.py b/app/itam/tests/functional/device_type/test_device_type_viewset.py index 62d10b65..e4eb6cb9 100644 --- a/app/itam/tests/functional/device_type/test_device_type_viewset.py +++ b/app/itam/tests/functional/device_type/test_device_type_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/endpoint_operating_system_installs/test_operating_system_installs_viewset.py b/app/itam/tests/functional/endpoint_operating_system_installs/test_operating_system_installs_viewset.py index 19581e9b..e9af89f3 100644 --- a/app/itam/tests/functional/endpoint_operating_system_installs/test_operating_system_installs_viewset.py +++ b/app/itam/tests/functional/endpoint_operating_system_installs/test_operating_system_installs_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissionView from api.tests.abstract.api_serializer_viewset import SerializerView diff --git a/app/itam/tests/functional/endpoint_software_installs/test_software_installs_viewset.py b/app/itam/tests/functional/endpoint_software_installs/test_software_installs_viewset.py index 6771e00b..2a75d6a7 100644 --- a/app/itam/tests/functional/endpoint_software_installs/test_software_installs_viewset.py +++ b/app/itam/tests/functional/endpoint_software_installs/test_software_installs_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/inventory/test_inventory_viewset.py b/app/itam/tests/functional/inventory/test_inventory_viewset.py index e74161c7..228902d3 100644 --- a/app/itam/tests/functional/inventory/test_inventory_viewset.py +++ b/app/itam/tests/functional/inventory/test_inventory_viewset.py @@ -3,12 +3,12 @@ import pytest from unittest.mock import patch -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_serializer_viewset import SerializersTestCases from api.tests.abstract.api_permissions_viewset import ( diff --git a/app/itam/tests/functional/operating_system/test_operating_system_viewset.py b/app/itam/tests/functional/operating_system/test_operating_system_viewset.py index 114438ff..7ca951a8 100644 --- a/app/itam/tests/functional/operating_system/test_operating_system_viewset.py +++ b/app/itam/tests/functional/operating_system/test_operating_system_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/operating_system_version/test_operating_system_version_viewset.py b/app/itam/tests/functional/operating_system_version/test_operating_system_version_viewset.py index a82a301c..41ae1632 100644 --- a/app/itam/tests/functional/operating_system_version/test_operating_system_version_viewset.py +++ b/app/itam/tests/functional/operating_system_version/test_operating_system_version_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/software/test_software_viewset.py b/app/itam/tests/functional/software/test_software_viewset.py index eb5616cc..6c9564fb 100644 --- a/app/itam/tests/functional/software/test_software_viewset.py +++ b/app/itam/tests/functional/software/test_software_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/software_category/test_software_category_viewset.py b/app/itam/tests/functional/software_category/test_software_category_viewset.py index 94ad01d7..004b2c98 100644 --- a/app/itam/tests/functional/software_category/test_software_category_viewset.py +++ b/app/itam/tests/functional/software_category/test_software_category_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/functional/software_version/test_software_version_viewset.py b/app/itam/tests/functional/software_version/test_software_version_viewset.py index fc20422f..a09ba8a6 100644 --- a/app/itam/tests/functional/software_version/test_software_version_viewset.py +++ b/app/itam/tests/functional/software_version/test_software_version_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itam/tests/unit/device/test_device_api.py b/app/itam/tests/unit/device/test_device_api.py index dd7f6f49..3679c692 100644 --- a/app/itam/tests/unit/device/test_device_api.py +++ b/app/itam/tests/unit/device/test_device_api.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/itam/tests/unit/device/test_device_api_v2.py b/app/itam/tests/unit/device/test_device_api_v2.py index 562e649c..f3095089 100644 --- a/app/itam/tests/unit/device/test_device_api_v2.py +++ b/app/itam/tests/unit/device/test_device_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/device/test_device_permission.py b/app/itam/tests/unit/device/test_device_permission.py index 207813d7..703447fa 100644 --- a/app/itam/tests/unit/device/test_device_permission.py +++ b/app/itam/tests/unit/device/test_device_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings # from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/device/test_device_permission_api.py b/app/itam/tests/unit/device/test_device_permission_api.py index 1b26667a..ff300ae5 100644 --- a/app/itam/tests/unit/device/test_device_permission_api.py +++ b/app/itam/tests/unit/device/test_device_permission_api.py @@ -1,11 +1,11 @@ import pytest import unittest -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/itam/tests/unit/device_model/test_device_model_api_v2.py b/app/itam/tests/unit/device_model/test_device_model_api_v2.py index 5a2b2e07..87dabe70 100644 --- a/app/itam/tests/unit/device_model/test_device_model_api_v2.py +++ b/app/itam/tests/unit/device_model/test_device_model_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/device_model/test_device_model_permission.py b/app/itam/tests/unit/device_model/test_device_model_permission.py index 27048a5a..02d59473 100644 --- a/app/itam/tests/unit/device_model/test_device_model_permission.py +++ b/app/itam/tests/unit/device_model/test_device_model_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings # from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/device_operating_system/test_device_operating_system_api_v2.py b/app/itam/tests/unit/device_operating_system/test_device_operating_system_api_v2.py index 39bda926..96cdebf2 100644 --- a/app/itam/tests/unit/device_operating_system/test_device_operating_system_api_v2.py +++ b/app/itam/tests/unit/device_operating_system/test_device_operating_system_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/device_software/test_device_software_api_v2.py b/app/itam/tests/unit/device_software/test_device_software_api_v2.py index f7e9ed96..85184007 100644 --- a/app/itam/tests/unit/device_software/test_device_software_api_v2.py +++ b/app/itam/tests/unit/device_software/test_device_software_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/device_type/test_device_type_api_v2.py b/app/itam/tests/unit/device_type/test_device_type_api_v2.py index c03c01be..1bf91bd0 100644 --- a/app/itam/tests/unit/device_type/test_device_type_api_v2.py +++ b/app/itam/tests/unit/device_type/test_device_type_api_v2.py @@ -1,12 +1,12 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/device_type/test_device_type_permission.py b/app/itam/tests/unit/device_type/test_device_type_permission.py index 0a2b95f7..36f2f900 100644 --- a/app/itam/tests/unit/device_type/test_device_type_permission.py +++ b/app/itam/tests/unit/device_type/test_device_type_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/endpoint_operating_system_installs/test_operating_system_installs_api_v2.py b/app/itam/tests/unit/endpoint_operating_system_installs/test_operating_system_installs_api_v2.py index 9a23f0d7..5af232d8 100644 --- a/app/itam/tests/unit/endpoint_operating_system_installs/test_operating_system_installs_api_v2.py +++ b/app/itam/tests/unit/endpoint_operating_system_installs/test_operating_system_installs_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/endpoint_software_installs/test_software_installs_api_v2.py b/app/itam/tests/unit/endpoint_software_installs/test_software_installs_api_v2.py index feed321a..12812fac 100644 --- a/app/itam/tests/unit/endpoint_software_installs/test_software_installs_api_v2.py +++ b/app/itam/tests/unit/endpoint_software_installs/test_software_installs_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/inventory/test_api_inventory.py b/app/itam/tests/unit/inventory/test_api_inventory.py index 29a346c3..b79f93d2 100644 --- a/app/itam/tests/unit/inventory/test_api_inventory.py +++ b/app/itam/tests/unit/inventory/test_api_inventory.py @@ -3,7 +3,7 @@ import json import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -11,7 +11,7 @@ from django.test.utils import override_settings from unittest.mock import patch -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.views.mixin import OrganizationPermissionAPI from api.serializers.inventory import Inventory diff --git a/app/itam/tests/unit/inventory/test_inventory_permission_api.py b/app/itam/tests/unit/inventory/test_inventory_permission_api.py index ec2a910b..2210885a 100644 --- a/app/itam/tests/unit/inventory/test_inventory_permission_api.py +++ b/app/itam/tests/unit/inventory/test_inventory_permission_api.py @@ -4,7 +4,7 @@ import unittest import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -12,7 +12,7 @@ from django.test.utils import override_settings from unittest.mock import patch -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from itam.models.device import Device diff --git a/app/itam/tests/unit/operating_system/test_operating_system_api_v2.py b/app/itam/tests/unit/operating_system/test_operating_system_api_v2.py index 628a9d9a..e465d877 100644 --- a/app/itam/tests/unit/operating_system/test_operating_system_api_v2.py +++ b/app/itam/tests/unit/operating_system/test_operating_system_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/operating_system/test_operating_system_permission.py b/app/itam/tests/unit/operating_system/test_operating_system_permission.py index 40684ad6..a6810c2d 100644 --- a/app/itam/tests/unit/operating_system/test_operating_system_permission.py +++ b/app/itam/tests/unit/operating_system/test_operating_system_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/operating_system_version/test_operating_system_version_api_v2.py b/app/itam/tests/unit/operating_system_version/test_operating_system_version_api_v2.py index 3c3905d9..0024b429 100644 --- a/app/itam/tests/unit/operating_system_version/test_operating_system_version_api_v2.py +++ b/app/itam/tests/unit/operating_system_version/test_operating_system_version_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/software/test_software_api.py b/app/itam/tests/unit/software/test_software_api.py index 70c0cf09..8f22fced 100644 --- a/app/itam/tests/unit/software/test_software_api.py +++ b/app/itam/tests/unit/software/test_software_api.py @@ -2,14 +2,14 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from core.models.manufacturer import Manufacturer diff --git a/app/itam/tests/unit/software/test_software_api_v2.py b/app/itam/tests/unit/software/test_software_api_v2.py index 2213421f..47485dce 100644 --- a/app/itam/tests/unit/software/test_software_api_v2.py +++ b/app/itam/tests/unit/software/test_software_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/software/test_software_permission.py b/app/itam/tests/unit/software/test_software_permission.py index 56780472..ba120a48 100644 --- a/app/itam/tests/unit/software/test_software_permission.py +++ b/app/itam/tests/unit/software/test_software_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/software/test_software_permission_api.py b/app/itam/tests/unit/software/test_software_permission_api.py index 30cca90d..5fd35a0b 100644 --- a/app/itam/tests/unit/software/test_software_permission_api.py +++ b/app/itam/tests/unit/software/test_software_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/itam/tests/unit/software_category/test_software_category_api_v2.py b/app/itam/tests/unit/software_category/test_software_category_api_v2.py index 07a2a58f..e54e4b2e 100644 --- a/app/itam/tests/unit/software_category/test_software_category_api_v2.py +++ b/app/itam/tests/unit/software_category/test_software_category_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itam/tests/unit/software_category/test_software_category_permission.py b/app/itam/tests/unit/software_category/test_software_category_permission.py index 48d83d1f..75ff1d64 100644 --- a/app/itam/tests/unit/software_category/test_software_category_permission.py +++ b/app/itam/tests/unit/software_category/test_software_category_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itam/tests/unit/software_version/test_software_version_api_v2.py b/app/itam/tests/unit/software_version/test_software_version_api_v2.py index 2bc2d1d2..0cd50de3 100644 --- a/app/itam/tests/unit/software_version/test_software_version_api_v2.py +++ b/app/itam/tests/unit/software_version/test_software_version_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itim/tests/functional/cluster/test_cluster_viewset.py b/app/itim/tests/functional/cluster/test_cluster_viewset.py index 6fa23ee3..592a2f6e 100644 --- a/app/itim/tests/functional/cluster/test_cluster_viewset.py +++ b/app/itim/tests/functional/cluster/test_cluster_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itim/tests/functional/cluster_types/test_cluster_type_viewset.py b/app/itim/tests/functional/cluster_types/test_cluster_type_viewset.py index 5b0d79eb..e919d09e 100644 --- a/app/itim/tests/functional/cluster_types/test_cluster_type_viewset.py +++ b/app/itim/tests/functional/cluster_types/test_cluster_type_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itim/tests/functional/port/test_port_viewset.py b/app/itim/tests/functional/port/test_port_viewset.py index 00f52513..85cf04e0 100644 --- a/app/itim/tests/functional/port/test_port_viewset.py +++ b/app/itim/tests/functional/port/test_port_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itim/tests/functional/service/test_service_viewset.py b/app/itim/tests/functional/service/test_service_viewset.py index e073cfd6..517f8774 100644 --- a/app/itim/tests/functional/service/test_service_viewset.py +++ b/app/itim/tests/functional/service/test_service_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission,User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/itim/tests/functional/service_cluster/test_service_cluster_viewset.py b/app/itim/tests/functional/service_cluster/test_service_cluster_viewset.py index b3fd6ef6..42bf9787 100644 --- a/app/itim/tests/functional/service_cluster/test_service_cluster_viewset.py +++ b/app/itim/tests/functional/service_cluster/test_service_cluster_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissionView from api.tests.abstract.api_serializer_viewset import SerializerView diff --git a/app/itim/tests/functional/service_device/test_service_device_viewset.py b/app/itim/tests/functional/service_device/test_service_device_viewset.py index 08c79735..35619b7c 100644 --- a/app/itim/tests/functional/service_device/test_service_device_viewset.py +++ b/app/itim/tests/functional/service_device/test_service_device_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissionView from api.tests.abstract.api_serializer_viewset import SerializerView diff --git a/app/itim/tests/unit/cluster/test_cluster_api_v2.py b/app/itim/tests/unit/cluster/test_cluster_api_v2.py index 4de0e927..32379b5c 100644 --- a/app/itim/tests/unit/cluster/test_cluster_api_v2.py +++ b/app/itim/tests/unit/cluster/test_cluster_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itim/tests/unit/cluster/test_cluster_permission.py b/app/itim/tests/unit/cluster/test_cluster_permission.py index a44b7d91..ea787ed5 100644 --- a/app/itim/tests/unit/cluster/test_cluster_permission.py +++ b/app/itim/tests/unit/cluster/test_cluster_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itim/tests/unit/cluster_types/test_cluster_type_api_v2.py b/app/itim/tests/unit/cluster_types/test_cluster_type_api_v2.py index 93bfbaaa..66ebda88 100644 --- a/app/itim/tests/unit/cluster_types/test_cluster_type_api_v2.py +++ b/app/itim/tests/unit/cluster_types/test_cluster_type_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py b/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py index 1a215089..275fc1a8 100644 --- a/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py +++ b/app/itim/tests/unit/cluster_types/test_cluster_type_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itim/tests/unit/port/test_port_api_v2.py b/app/itim/tests/unit/port/test_port_api_v2.py index 9a8b38f5..5feaed2d 100644 --- a/app/itim/tests/unit/port/test_port_api_v2.py +++ b/app/itim/tests/unit/port/test_port_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itim/tests/unit/port/test_port_permission.py b/app/itim/tests/unit/port/test_port_permission.py index 64b0bcd6..1d72d447 100644 --- a/app/itim/tests/unit/port/test_port_permission.py +++ b/app/itim/tests/unit/port/test_port_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/itim/tests/unit/service/test_service_api_v2.py b/app/itim/tests/unit/service/test_service_api_v2.py index 35997ffa..5ff90d5f 100644 --- a/app/itim/tests/unit/service/test_service_api_v2.py +++ b/app/itim/tests/unit/service/test_service_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/itim/tests/unit/service/test_service_permission.py b/app/itim/tests/unit/service/test_service_permission.py index c3680b9d..a04b8c98 100644 --- a/app/itim/tests/unit/service/test_service_permission.py +++ b/app/itim/tests/unit/service/test_service_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/project_management/tests/functional/project/test_project_viewset.py b/app/project_management/tests/functional/project/test_project_viewset.py index dc1de20b..79b6b92d 100644 --- a/app/project_management/tests/functional/project/test_project_viewset.py +++ b/app/project_management/tests/functional/project/test_project_viewset.py @@ -1,11 +1,11 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py b/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py index 6d645c3d..225b6540 100644 --- a/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py +++ b/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/project_management/tests/functional/project_state/test_project_state_viewset.py b/app/project_management/tests/functional/project_state/test_project_state_viewset.py index fe13dced..3edccf6f 100644 --- a/app/project_management/tests/functional/project_state/test_project_state_viewset.py +++ b/app/project_management/tests/functional/project_state/test_project_state_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/project_management/tests/functional/project_type/test_project_type_viewset.py b/app/project_management/tests/functional/project_type/test_project_type_viewset.py index bd1c1230..a7814fd1 100644 --- a/app/project_management/tests/functional/project_type/test_project_type_viewset.py +++ b/app/project_management/tests/functional/project_type/test_project_type_viewset.py @@ -1,10 +1,10 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/project_management/tests/unit/project/test_project_api_v2.py b/app/project_management/tests/unit/project/test_project_api_v2.py index 060ed54e..6b41e116 100644 --- a/app/project_management/tests/unit/project/test_project_api_v2.py +++ b/app/project_management/tests/unit/project/test_project_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/project_management/tests/unit/project/test_project_permission.py b/app/project_management/tests/unit/project/test_project_permission.py index 77b1548a..c9cd6bda 100644 --- a/app/project_management/tests/unit/project/test_project_permission.py +++ b/app/project_management/tests/unit/project/test_project_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/project_management/tests/unit/project/test_project_permission_api.py b/app/project_management/tests/unit/project/test_project_permission_api.py index 34d39953..fb52ad60 100644 --- a/app/project_management/tests/unit/project/test_project_permission_api.py +++ b/app/project_management/tests/unit/project/test_project_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py index 87629a4b..337609e8 100644 --- a/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py +++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py index 8be0a019..eb192fea 100644 --- a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py +++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py index f8f3ce27..7bdc0f5c 100644 --- a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py +++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py @@ -2,12 +2,12 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/project_management/tests/unit/project_state/test_project_state_api_v2.py b/app/project_management/tests/unit/project_state/test_project_state_api_v2.py index 9dd72d0d..cc17de6c 100644 --- a/app/project_management/tests/unit/project_state/test_project_state_api_v2.py +++ b/app/project_management/tests/unit/project_state/test_project_state_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/project_management/tests/unit/project_state/test_project_state_permission.py b/app/project_management/tests/unit/project_state/test_project_state_permission.py index 8cb23ed5..2a8bb047 100644 --- a/app/project_management/tests/unit/project_state/test_project_state_permission.py +++ b/app/project_management/tests/unit/project_state/test_project_state_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/project_management/tests/unit/project_state/test_project_state_permission_api.py b/app/project_management/tests/unit/project_state/test_project_state_permission_api.py index adbeb073..43c68899 100644 --- a/app/project_management/tests/unit/project_state/test_project_state_permission_api.py +++ b/app/project_management/tests/unit/project_state/test_project_state_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/project_management/tests/unit/project_type/test_project_type_api_v2.py b/app/project_management/tests/unit/project_type/test_project_type_api_v2.py index 969c530b..0c200d96 100644 --- a/app/project_management/tests/unit/project_type/test_project_type_api_v2.py +++ b/app/project_management/tests/unit/project_type/test_project_type_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/project_management/tests/unit/project_type/test_project_type_permission.py b/app/project_management/tests/unit/project_type/test_project_type_permission.py index 3fd35d81..ce89b01e 100644 --- a/app/project_management/tests/unit/project_type/test_project_type_permission.py +++ b/app/project_management/tests/unit/project_type/test_project_type_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/project_management/tests/unit/project_type/test_project_type_permission_api.py b/app/project_management/tests/unit/project_type/test_project_type_permission_api.py index 7254151d..b459b21d 100644 --- a/app/project_management/tests/unit/project_type/test_project_type_permission_api.py +++ b/app/project_management/tests/unit/project_type/test_project_type_permission_api.py @@ -2,11 +2,11 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions import APIPermissions diff --git a/app/settings/tests/functional/app_settings/test_app_settings_viewset.py b/app/settings/tests/functional/app_settings/test_app_settings_viewset.py index bfc06927..494a3ec6 100644 --- a/app/settings/tests/functional/app_settings/test_app_settings_viewset.py +++ b/app/settings/tests/functional/app_settings/test_app_settings_viewset.py @@ -1,12 +1,12 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from django import urls -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionChange, diff --git a/app/settings/tests/functional/external_links/test_external_link_viewset.py b/app/settings/tests/functional/external_links/test_external_link_viewset.py index 08c5caa6..d404e575 100644 --- a/app/settings/tests/functional/external_links/test_external_link_viewset.py +++ b/app/settings/tests/functional/external_links/test_external_link_viewset.py @@ -4,11 +4,11 @@ import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import APIPermissions from api.tests.abstract.api_serializer_viewset import SerializersTestCases diff --git a/app/settings/tests/functional/user_settings/test_user_settings_viewset.py b/app/settings/tests/functional/user_settings/test_user_settings_viewset.py index 72cbfad3..7fe509a7 100644 --- a/app/settings/tests/functional/user_settings/test_user_settings_viewset.py +++ b/app/settings/tests/functional/user_settings/test_user_settings_viewset.py @@ -1,12 +1,12 @@ import pytest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from django import urls -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_permissions_viewset import ( APIPermissionChange, diff --git a/app/settings/tests/unit/app_settings/test_app_settings_api_v2.py b/app/settings/tests/unit/app_settings/test_app_settings_api_v2.py index 94e89ff1..9af0fa0c 100644 --- a/app/settings/tests/unit/app_settings/test_app_settings_api_v2.py +++ b/app/settings/tests/unit/app_settings/test_app_settings_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APICommonFields diff --git a/app/settings/tests/unit/app_settings/test_app_settings_permission.py b/app/settings/tests/unit/app_settings/test_app_settings_permission.py index c05315cb..36554b4a 100644 --- a/app/settings/tests/unit/app_settings/test_app_settings_permission.py +++ b/app/settings/tests/unit/app_settings/test_app_settings_permission.py @@ -1,6 +1,6 @@ # from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client @@ -9,7 +9,7 @@ import pytest import unittest import requests -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissionsView diff --git a/app/settings/tests/unit/external_links/test_external_links_api_v2.py b/app/settings/tests/unit/external_links/test_external_links_api_v2.py index 3a260f2d..92d32a11 100644 --- a/app/settings/tests/unit/external_links/test_external_links_api_v2.py +++ b/app/settings/tests/unit/external_links/test_external_links_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APITenancyObject diff --git a/app/settings/tests/unit/external_links/test_external_links_permission.py b/app/settings/tests/unit/external_links/test_external_links_permission.py index 7d2c636a..f6c7b171 100644 --- a/app/settings/tests/unit/external_links/test_external_links_permission.py +++ b/app/settings/tests/unit/external_links/test_external_links_permission.py @@ -2,12 +2,12 @@ import pytest import unittest import requests -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissions diff --git a/app/settings/tests/unit/user_settings/test_user_settings.py b/app/settings/tests/unit/user_settings/test_user_settings.py index b79e3913..9de7a54c 100644 --- a/app/settings/tests/unit/user_settings/test_user_settings.py +++ b/app/settings/tests/unit/user_settings/test_user_settings.py @@ -4,12 +4,12 @@ import unittest import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from settings.models.user_settings import UserSettings diff --git a/app/settings/tests/unit/user_settings/test_user_settings_api_v2.py b/app/settings/tests/unit/user_settings/test_user_settings_api_v2.py index d111ff3d..cbe54682 100644 --- a/app/settings/tests/unit/user_settings/test_user_settings_api_v2.py +++ b/app/settings/tests/unit/user_settings/test_user_settings_api_v2.py @@ -1,14 +1,14 @@ import pytest import unittest -from django.contrib.auth.models import User +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase from rest_framework.relations import Hyperlink -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from api.tests.abstract.api_fields import APICommonFields diff --git a/app/settings/tests/unit/user_settings/test_user_settings_permissions.py b/app/settings/tests/unit/user_settings/test_user_settings_permissions.py index 8d80e235..74785dd8 100644 --- a/app/settings/tests/unit/user_settings/test_user_settings_permissions.py +++ b/app/settings/tests/unit/user_settings/test_user_settings_permissions.py @@ -4,12 +4,12 @@ import unittest import requests from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, User +from django.contrib.auth.models import AnonymousUser, Permission, User from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import TestCase, Client -from access.models import Organization, Team, TeamUsers, Permission +from access.models import Organization, Team, TeamUsers from app.tests.abstract.model_permissions import ModelPermissionsView