diff --git a/hypha/apply/projects/migrations/0036_add_vendor.py b/hypha/apply/projects/migrations/0036_add_vendor.py index 32701a1aa5e68be06354db9095e6873c22089050..5924a565ed784f050942183362e513a691106f35 100644 --- a/hypha/apply/projects/migrations/0036_add_vendor.py +++ b/hypha/apply/projects/migrations/0036_add_vendor.py @@ -11,7 +11,6 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('wagtailcore', '0062_comment_models_and_pagesubscription'), ('application_projects', '0035_add_heading_block_to_form_fields_block'), ] diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py index 949cbdca401cf7c7f8e79093c2662475016fee1d..62ccf3fc653119ce1551ada118822b525867dac4 100644 --- a/hypha/apply/projects/tests/factories.py +++ b/hypha/apply/projects/tests/factories.py @@ -1,5 +1,4 @@ import decimal -import json import factory import pytz @@ -77,10 +76,6 @@ class ProjectFactory(factory.DjangoModelFactory): title = factory.Sequence('name {}'.format) lead = factory.SubFactory(StaffFactory) - contact_legal_name = 'test' - contact_email = 'test@example.com' - contact_address = json.dumps(ADDRESS) - contact_phone = '555 1234' value = decimal.Decimal('100') proposed_start = factory.LazyFunction(timezone.now) proposed_end = factory.LazyFunction(timezone.now) diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py index 8aa146e3d126025a35c28522b503a7e9f16e4138..c871bb74d0a90b74f4603354596bd745bc175a95 100644 --- a/hypha/apply/projects/tests/test_forms.py +++ b/hypha/apply/projects/tests/test_forms.py @@ -7,16 +7,18 @@ from django.test import TestCase, override_settings from hypha.apply.users.tests.factories import UserFactory from ..files import get_files -from ..forms import ( +from ..forms.payment import ( ChangePaymentRequestStatusForm, CreatePaymentRequestForm, - ProjectApprovalForm, SelectDocumentForm, - StaffUploadContractForm, - UploadContractForm, filter_choices, filter_request_choices, ) +from ..forms.project import ( + ProjectApprovalForm, + StaffUploadContractForm, + UploadContractForm, +) from ..models.payment import CHANGES_REQUESTED, DECLINED, PAID, SUBMITTED, UNDER_REVIEW from .factories import ( DocumentCategoryFactory, @@ -85,9 +87,6 @@ class TestProjectApprovalForm(TestCase): data = { 'title': f'{project.title} test', - 'contact_legal_name': project.contact_legal_name, - 'contact_email': project.contact_email, - 'contact_phone': project.contact_phone, 'value': project.value, 'proposed_start': project.proposed_start, 'proposed_end': project.proposed_end, diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py index 02cb0ddd98a9f3e1c270eeb458e23bdfebe815e8..5c29058b0858ccad111d32b99aeec3a98a3fde3f 100644 --- a/hypha/apply/projects/tests/test_views.py +++ b/hypha/apply/projects/tests/test_views.py @@ -24,7 +24,7 @@ from ..files import get_files from ..forms import SetPendingForm from ..models.payment import CHANGES_REQUESTED, SUBMITTED from ..models.project import COMMITTED, CONTRACTING, IN_PROGRESS -from ..views import ContractsMixin, ProjectDetailSimplifiedView +from ..views.project import ContractsMixin, ProjectDetailSimplifiedView from .factories import ( ContractFactory, DocumentCategoryFactory,