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

lint and fix test

Browse source
This commit is contained in:
zandercymatics 2025-01-28 09:58:41 -07:00
parent 8504eb1f39
commit ad79557a55
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
5 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/forms/domain_request_wizard.py
View file

@ -367,7 +367,7 @@ class OrganizationContactForm(RegistrarForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# Set the queryset for federal agency.
# If the organization_requests flag is active, we hide data that exists in portfolios.
federal_agency_queryset = FederalAgency.objects.exclude(agency__in=self.excluded_agencies)
@ -376,7 +376,7 @@ class OrganizationContactForm(RegistrarForm):
federal_agency_queryset = federal_agency_queryset.exclude(
agency__in=Portfolio.objects.values_list("organization_name", flat=True)
)
self.fields["federal_agency"].queryset = federal_agency_queryset
def clean_federal_agency(self):

1
src/registrar/models/domain.py
View file

@ -244,7 +244,6 @@ class Domain(TimeStampedModel, DomainHelper):
is called in the validate function on the request/domain page
throws- RegistryError or InvalidDomainError"""
return True
if not cls.string_could_be_domain(domain):
logger.warning("Not a valid domain: %s" % str(domain))
# throw invalid domain error so that it can be caught in

10
src/registrar/models/domain_request.py
View file

@ -1293,9 +1293,13 @@ class DomainRequest(TimeStampedModel):
if flag_is_active_anywhere("organization_feature") and flag_is_active_anywhere("organization_requests"):
# Check if the current federal agency is an outlawed one
Portfolio = apps.get_model("registrar.Portfolio")
return FederalAgency.objects.exclude(
agency__in=Portfolio.objects.values_list("organization_name", flat=True),
).filter(agency=self.federal_agency).exists()
return (
FederalAgency.objects.exclude(
agency__in=Portfolio.objects.values_list("organization_name", flat=True),
)
.filter(agency=self.federal_agency)
.exists()
)
# NOTE: Shouldn't this be an AND on all required fields?
return (

10
src/registrar/tests/test_utilities.py
View file

@ -28,29 +28,29 @@ class TestFlagIsActiveAnywhere(TestCase):
def setUp(self):
self.user = User.objects.create_user(username="testuser")
self.flag_name = "test_flag"
@override_flag("test_flag", active=True)
def test_flag_active_for_everyone(self):
"""Test when flag is active for everyone"""
is_active = flag_is_active_anywhere("test_flag")
self.assertTrue(is_active)
@override_flag("test_flag", active=False)
def test_flag_inactive_for_everyone(self):
"""Test when flag is inactive for everyone"""
is_active = flag_is_active_anywhere("test_flag")
self.assertFalse(is_active)
def test_flag_active_for_some_users(self):
"""Test when flag is active for specific users"""
flag, _ = get_waffle_flag_model().objects.get_or_create(name="test_flag")
flag.everyone = None
flag.save()
flag.users.add(self.user)
is_active = flag_is_active_anywhere("test_flag")
self.assertTrue(is_active)
def test_flag_inactive_with_no_users(self):
"""Test when flag has no users and everyone is None"""
flag, _ = get_waffle_flag_model().objects.get_or_create(name="test_flag")

30
src/registrar/tests/test_views_request.py
View file

@ -3228,18 +3228,12 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
"""Tests unlock_organization_contact when agency exists in a portfolio"""
# Create a federal agency
federal_agency = FederalAgency.objects.create(agency="Portfolio Agency")
# Create a portfolio with matching organization name
Portfolio.objects.create(
creator=self.user,
organization_name=federal_agency.agency
)
Portfolio.objects.create(creator=self.user, organization_name=federal_agency.agency)
# Create domain request with the portfolio agency
domain_request = completed_domain_request(
federal_agency=federal_agency,
user=self.user
)
domain_request = completed_domain_request(federal_agency=federal_agency, user=self.user)
self.assertFalse(domain_request.unlock_organization_contact())
@override_flag("organization_feature", active=False)
@ -3247,19 +3241,13 @@ class TestDomainRequestWizard(TestWithUser, WebTest):
@less_console_noise_decorator
def test_unlock_organization_contact_flags_disabled(self):
"""Tests unlock_organization_contact when organization flags are disabled"""
# Create a federal agency
# Create a federal agency
federal_agency = FederalAgency.objects.create(agency="Portfolio Agency")
# Create a portfolio with matching organization name
Portfolio.objects.create(
creator=self.user,
organization_name=federal_agency.agency
)
domain_request = completed_domain_request(
federal_agency=federal_agency,
user=self.user
)
# Create a portfolio with matching organization name
Portfolio.objects.create(creator=self.user, organization_name=federal_agency.agency)
domain_request = completed_domain_request(federal_agency=federal_agency, user=self.user)
self.assertTrue(domain_request.unlock_organization_contact())