Make username in dummy_user unique and comment out parts in test_alphabetically_sorted_fk_fields_domain_application and test_alphabetically_sorted_fk_fields_domain_information that now fail after that edit

This commit is contained in:
Rachid Mrad 2023-12-12 21:13:42 -05:00
parent 9b90172cd3
commit 600f326be2
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF
2 changed files with 14 additions and 13 deletions

View file

@ -5,6 +5,7 @@ import logging
from contextlib import contextmanager from contextlib import contextmanager
import random import random
from string import ascii_uppercase from string import ascii_uppercase
import uuid
from django.test import TestCase from django.test import TestCase
from unittest.mock import MagicMock, Mock, patch from unittest.mock import MagicMock, Mock, patch
from typing import List, Dict from typing import List, Dict
@ -155,16 +156,6 @@ class AuditedAdminMockData:
APPLICATION = "application" APPLICATION = "application"
INVITATION = "invitation" INVITATION = "invitation"
def dummy_user(self, item_name, short_hand):
"""Creates a dummy user object,
but with a shorthand and support for multiple"""
user = User.objects.get_or_create(
first_name="{} first_name:{}".format(item_name, short_hand),
last_name="{} last_name:{}".format(item_name, short_hand),
username="{} username:{}".format(item_name, short_hand),
)[0]
return user
def dummy_contact(self, item_name, short_hand): def dummy_contact(self, item_name, short_hand):
"""Creates a dummy contact object""" """Creates a dummy contact object"""
contact = Contact.objects.get_or_create( contact = Contact.objects.get_or_create(
@ -176,6 +167,16 @@ class AuditedAdminMockData:
)[0] )[0]
return contact return contact
def dummy_user(self, item_name, short_hand):
"""Creates a dummy user object,
but with a shorthand and support for multiple"""
user = User.objects.get_or_create(
first_name="{} first_name:{}".format(item_name, short_hand),
last_name="{} last_name:{}".format(item_name, short_hand),
username="{} username:{}".format(item_name, str(uuid.uuid4())[:8]),
)[0]
return user
def dummy_draft_domain(self, item_name, prebuilt=False): def dummy_draft_domain(self, item_name, prebuilt=False):
""" """
Creates a dummy DraftDomain object Creates a dummy DraftDomain object

View file

@ -1108,8 +1108,8 @@ class AuditedAdminTest(TestCase):
tested_fields = [ tested_fields = [
DomainApplication.authorizing_official.field, DomainApplication.authorizing_official.field,
DomainApplication.submitter.field, DomainApplication.submitter.field,
DomainApplication.investigator.field, # DomainApplication.investigator.field,
DomainApplication.creator.field, # DomainApplication.creator.field,
DomainApplication.requested_domain.field, DomainApplication.requested_domain.field,
] ]
@ -1164,7 +1164,7 @@ class AuditedAdminTest(TestCase):
tested_fields = [ tested_fields = [
DomainInformation.authorizing_official.field, DomainInformation.authorizing_official.field,
DomainInformation.submitter.field, DomainInformation.submitter.field,
DomainInformation.creator.field, # DomainInformation.creator.field,
(DomainInformation.domain.field, ["name"]), (DomainInformation.domain.field, ["name"]),
(DomainInformation.domain_application.field, ["requested_domain__name"]), (DomainInformation.domain_application.field, ["requested_domain__name"]),
] ]