diff --git a/hypha/apply/funds/tests/factories/blocks.py b/hypha/apply/funds/tests/factories/blocks.py index ea3d81d9f488e0ed589f670d35dc6cc5d8d920af..5cbdbb3cec14f08af2a20885f8bae5c498fa0920 100644 --- a/hypha/apply/funds/tests/factories/blocks.py +++ b/hypha/apply/funds/tests/factories/blocks.py @@ -60,15 +60,15 @@ class AddressFieldBlockFactory(FormFieldBlockFactory): model = blocks.AddressFieldBlock @classmethod - def make_answer(cls, params): + def make_answer(cls, params=dict()): if not params: params = {} return json.dumps({ 'country': 'GB', - 'thoroughfare': factory.Faker('street_name').generate(params), - 'premise': factory.Faker('building_number').generate(params), - 'localityname': factory.Faker('city').generate(params), - 'administrativearea': factory.Faker('city').generate(params), + 'thoroughfare': factory.Faker('street_name').evaluate(None, None, dict(params, locale=None)), + 'premise': factory.Faker('building_number').evaluate(None, None, dict(params, locale=None)), + 'localityname': factory.Faker('city').evaluate(None, None, dict(params, locale=None)), + 'administrativearea': factory.Faker('city').evaluate(None, None, dict(params, locale=None)), 'postalcode': 'SW1 4AQ', }) @@ -81,11 +81,11 @@ class AddressFieldBlockFactory(FormFieldBlockFactory): params = {} return { 'country': 'GB', - 'thoroughfare': factory.Faker('street_name').generate(params), - 'premise': factory.Faker('building_number').generate(params), + 'thoroughfare': factory.Faker('street_name').evaluate(None, None, dict(params, locale=None)), + 'premise': factory.Faker('building_number').evaluate(None, None, dict(params, locale=None)), 'locality': { - 'localityname': factory.Faker('city').generate(params), - 'administrativearea': factory.Faker('city').generate(params), + 'localityname': factory.Faker('city').evaluate(None, None, dict(params, locale=None)), + 'administrativearea': factory.Faker('city').evaluate(None, None, dict(params, locale=None)), 'postal_code': 'SW1 4AQ', } } diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py index a667e51f40612a6ab1c20bb3425874fb682183b0..3d5b4e6a82db1375ca9363ea57d8bc32d0973e3b 100644 --- a/hypha/apply/projects/tests/factories.py +++ b/hypha/apply/projects/tests/factories.py @@ -26,11 +26,11 @@ from ..models.report import Report, ReportConfig, ReportVersion ADDRESS = { 'country': 'GB', - 'thoroughfare': factory.Faker('street_name').generate({}), - 'premise': factory.Faker('building_number').generate({}), + 'thoroughfare': factory.Faker('street_name').evaluate(None, None, {'locale': None}), + 'premise': factory.Faker('building_number').evaluate(None, None, {'locale': None}), 'locality': { - 'localityname': factory.Faker('city').generate({}), - 'administrativearea': factory.Faker('city').generate({}), + 'localityname': factory.Faker('city').evaluate(None, None, {'locale': None}), + 'administrativearea': factory.Faker('city').evaluate(None, None, {'locale': None}), 'postal_code': 'SW1 4AQ', } } @@ -131,8 +131,8 @@ class PaymentRequestFactory(factory.django.DjangoModelFactory): by = factory.SubFactory(UserFactory) requested_value = factory.Faker('pydecimal', min_value=1, max_value=10000000, right_digits=2) - date_from = factory.Faker('date_time').generate({'tzinfo': pytz.utc}) - date_to = factory.Faker('date_time').generate({'tzinfo': pytz.utc}) + date_from = factory.Faker('date_time').evaluate(None, None, {'tzinfo': pytz.utc, 'locale': None}) + date_to = factory.Faker('date_time').evaluate(None, None, {'tzinfo': pytz.utc, 'locale': None}) invoice = factory.django.FileField() @@ -145,8 +145,8 @@ class InvoiceFactory(factory.django.DjangoModelFactory): by = factory.SubFactory(UserFactory) amount = factory.Faker('pydecimal', min_value=1, max_value=10000000, right_digits=2) - date_from = factory.Faker('date_time').generate({'tzinfo': pytz.utc}) - date_to = factory.Faker('date_time').generate({'tzinfo': pytz.utc}) + date_from = factory.Faker('date_time').evaluate(None, None, {'tzinfo': pytz.utc, 'locale': None}) + date_to = factory.Faker('date_time').evaluate(None, None, {'tzinfo': pytz.utc, 'locale': None}) document = factory.django.FileField() diff --git a/hypha/apply/review/tests/factories/blocks.py b/hypha/apply/review/tests/factories/blocks.py index 677a3b8c23755a1e09dd88e1bab756a383419bf2..393fe839beb5850506b87f0a286e082bff0fb96e 100644 --- a/hypha/apply/review/tests/factories/blocks.py +++ b/hypha/apply/review/tests/factories/blocks.py @@ -53,12 +53,12 @@ class ScoreFieldBlockFactory(FormFieldBlockFactory): @classmethod def make_answer(cls, params=dict()): - return json.dumps([factory.Faker('paragraph').generate(params), random.randint(1, 5)]) + return json.dumps([factory.Faker('paragraph').evaluate(None, None, dict(params, locale=None)), random.randint(1, 5)]) @classmethod def make_form_answer(cls, params=dict()): defaults = { - 'description': factory.Faker('paragraph').generate({}), + 'description': factory.Faker('paragraph').evaluate(None, None, {'locale': None}), 'score': random.randint(1, 5), } defaults.update(params) diff --git a/hypha/apply/stream_forms/testing/factories.py b/hypha/apply/stream_forms/testing/factories.py index 8a705b5eaf61b71effab312e8e07e9986d97789d..48edb54c608ea877ae555a2c635e235d0d463f75 100644 --- a/hypha/apply/stream_forms/testing/factories.py +++ b/hypha/apply/stream_forms/testing/factories.py @@ -100,8 +100,8 @@ class FormFieldBlockFactory(wagtail_factories.StructBlockFactory): model = stream_blocks.FormFieldBlock @classmethod - def make_answer(cls, params=None): - return cls.default_value.generate(params or {}) + def make_answer(cls, params=dict()): + return cls.default_value.evaluate(None, None, dict(params, locale=None)) @classmethod def make_form_answer(cls, params=None):