mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-27 04:58:42 +02:00
linter and merge fixes
This commit is contained in:
parent
14944a970b
commit
95cd22d549
5 changed files with 7 additions and 5 deletions
|
@ -1,5 +1,4 @@
|
||||||
import { hookupYesNoListener, hookupCallbacksToRadioToggler } from './radios.js';
|
import { hookupYesNoListener, hookupCallbacksToRadioToggler } from './radios.js';
|
||||||
import { hookupYesNoListener } from './radios.js';
|
|
||||||
import { initDomainValidators } from './domain-validators.js';
|
import { initDomainValidators } from './domain-validators.js';
|
||||||
import { initFormsetsForms, triggerModalOnDsDataForm } from './formset-forms.js';
|
import { initFormsetsForms, triggerModalOnDsDataForm } from './formset-forms.js';
|
||||||
import { initFormNameservers } from './form-nameservers'
|
import { initFormNameservers } from './form-nameservers'
|
||||||
|
|
|
@ -607,6 +607,7 @@ class DotGovDomainForm(RegistrarForm):
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PurposeDetailsForm(BaseDeletableRegistrarForm):
|
class PurposeDetailsForm(BaseDeletableRegistrarForm):
|
||||||
|
|
||||||
field_name = "purpose"
|
field_name = "purpose"
|
||||||
|
|
|
@ -1439,6 +1439,7 @@ class DomainRequest(TimeStampedModel):
|
||||||
if self.portfolio:
|
if self.portfolio:
|
||||||
return self.portfolio.federal_type == BranchChoices.EXECUTIVE
|
return self.portfolio.federal_type == BranchChoices.EXECUTIVE
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def is_federal(self) -> Union[bool, None]:
|
def is_federal(self) -> Union[bool, None]:
|
||||||
"""Is this domain request for a federal agency?
|
"""Is this domain request for a federal agency?
|
||||||
|
|
||||||
|
|
|
@ -2618,7 +2618,9 @@ class DomainRequestTests(TestWithUser, WebTest):
|
||||||
domain_form["dotgov_domain-requested_domain"] = domain
|
domain_form["dotgov_domain-requested_domain"] = domain
|
||||||
domain_form["dotgov_domain-feb_naming_requirements"] = "True"
|
domain_form["dotgov_domain-feb_naming_requirements"] = "True"
|
||||||
domain_form["dotgov_domain-feb_naming_requirements_details"] = "test"
|
domain_form["dotgov_domain-feb_naming_requirements_details"] = "test"
|
||||||
with patch('registrar.forms.domain_request_wizard.DotGovDomainForm.clean_requested_domain', return_value=domain): # noqa
|
with patch(
|
||||||
|
"registrar.forms.domain_request_wizard.DotGovDomainForm.clean_requested_domain", return_value=domain
|
||||||
|
): # noqa
|
||||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||||
domain_result = domain_form.submit()
|
domain_result = domain_form.submit()
|
||||||
|
|
||||||
|
@ -2628,7 +2630,6 @@ class DomainRequestTests(TestWithUser, WebTest):
|
||||||
|
|
||||||
self.feb_purpose_page_tests(purpose_page)
|
self.feb_purpose_page_tests(purpose_page)
|
||||||
|
|
||||||
|
|
||||||
def feb_purpose_page_tests(self, purpose_page):
|
def feb_purpose_page_tests(self, purpose_page):
|
||||||
self.assertContains(purpose_page, "What is the purpose of your requested domain?")
|
self.assertContains(purpose_page, "What is the purpose of your requested domain?")
|
||||||
|
|
||||||
|
|
|
@ -660,8 +660,8 @@ class DotgovDomain(DomainRequestWizard):
|
||||||
forms = [
|
forms = [
|
||||||
forms.DotGovDomainForm,
|
forms.DotGovDomainForm,
|
||||||
forms.AlternativeDomainFormSet,
|
forms.AlternativeDomainFormSet,
|
||||||
forms.ExecutiveNamingRequirementsYesNoForm,
|
feb.ExecutiveNamingRequirementsYesNoForm,
|
||||||
forms.ExecutiveNamingRequirementsDetailsForm,
|
feb.ExecutiveNamingRequirementsDetailsForm,
|
||||||
]
|
]
|
||||||
|
|
||||||
def get_context_data(self):
|
def get_context_data(self):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue