From fccb6372a6495f3fbd7493437b21b76a4f70e07d Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Thu, 26 Aug 2021 18:19:12 +0530
Subject: [PATCH] Replace Faker's generate by evaluate
---
hypha/apply/funds/tests/factories/blocks.py | 18 +++++++++---------
hypha/apply/projects/tests/factories.py | 16 ++++++++--------
hypha/apply/review/tests/factories/blocks.py | 4 ++--
hypha/apply/stream_forms/testing/factories.py | 4 ++--
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/hypha/apply/funds/tests/factories/blocks.py b/hypha/apply/funds/tests/factories/blocks.py
index ea3d81d9f..5cbdbb3ce 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 a667e51f4..3d5b4e6a8 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 677a3b8c2..393fe839b 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 8a705b5ea..48edb54c6 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):
--
GitLab