zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-04 08:52:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Reapply "resolved merge conflict"

Browse source 
This reverts commit d1f3f0efb1.
This commit is contained in:
CocoByte 2024-10-09 14:09:39 -06:00
parent bd018e14ab
commit 75c610476c
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
13 changed files with 1192 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/registrar/tests/test_models.py
View file

@ -1,7 +1,5 @@
from django.forms import ValidationError
from django.test import TestCase
from django.db.utils import IntegrityError
from django.db import transaction
from unittest.mock import patch
from django.test import RequestFactory
@ -20,23 +18,18 @@ from registrar.models import (
UserPortfolioPermission,
AllowedEmail,
)
import boto3_mocking
from registrar.models.portfolio import Portfolio
from registrar.models.portfolio_invitation import PortfolioInvitation
from registrar.models.transition_domain import TransitionDomain
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
from registrar.models.verified_by_staff import VerifiedByStaff # type: ignore
from registrar.utility.constants import BranchChoices
from .common import (
MockSESClient,
less_console_noise,
completed_domain_request,
set_domain_request_investigators,
create_test_user,
)
from django_fsm import TransitionNotAllowed
from waffle.testutils import override_flag
from api.tests.common import less_console_noise_decorator