Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make TextField generator respect max_length #493

Merged
merged 4 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions model_bakery/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def gen_integer():
DecimalField: random_gen.gen_decimal,
BinaryField: random_gen.gen_byte_string,
CharField: random_gen.gen_string,
TextField: random_gen.gen_text,
TextField: random_gen.gen_string,
SlugField: random_gen.gen_slug,
UUIDField: random_gen.gen_uuid,
DateField: random_gen.gen_date,
Expand All @@ -133,7 +133,7 @@ def gen_integer():
if CIEmailField:
default_mapping[CIEmailField] = random_gen.gen_email
if CITextField:
default_mapping[CITextField] = random_gen.gen_text
default_mapping[CITextField] = random_gen.gen_string
if DecimalRangeField:
default_mapping[DecimalRangeField] = random_gen.gen_pg_numbers_range(Decimal)
if IntegerRangeField:
Expand Down
4 changes: 0 additions & 4 deletions model_bakery/random_gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ def gen_slug(max_length: int) -> str:
gen_slug.required = ["max_length"] # type: ignore[attr-defined]


def gen_text() -> str:
return gen_string(MAX_LENGTH)

amureki marked this conversation as resolved.
Show resolved Hide resolved

def gen_boolean() -> bool:
return baker_random.choice((True, False))

Expand Down
2 changes: 2 additions & 0 deletions tests/generic/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class Person(models.Model):
name = models.CharField(max_length=30)
nickname = models.SlugField(max_length=36)
age = models.IntegerField()
bio_summary = models.TextField(max_length=120)
bio = models.TextField()
birthday = models.DateField()
birth_time = models.TimeField()
Expand Down Expand Up @@ -129,6 +130,7 @@ class Person(models.Model):
ci_char = CICharField(max_length=30)
ci_email = CIEmailField()
ci_text = CITextField()
ci_text_max_length = CITextField(max_length=120)
int_range = IntegerRangeField()
bigint_range = BigIntegerRangeField()
date_range = DateRangeField()
Expand Down
17 changes: 16 additions & 1 deletion tests/test_filling_fields.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import uuid
from datetime import date, datetime, time, timedelta
from decimal import Decimal
from os.path import abspath
from tempfile import gettempdir

from django.conf import settings
from django.core.validators import (
validate_ipv4_address,
validate_ipv6_address,
validate_ipv46_address,
)
from django.db import connection
from django.db.models import FileField, ImageField, fields

import pytest

from model_bakery import baker
from model_bakery.content_types import BAKER_CONTENTTYPES
from model_bakery.gis import BAKER_GIS
from model_bakery.random_gen import gen_related
from model_bakery.random_gen import gen_related, MAX_LENGTH
from tests.generic import generators, models

try:

Check failure on line 24 in tests/test_filling_fields.py

View workflow job for this annotation

GitHub Actions / linters (ruff check --output-format=github .)

Ruff (I001)

tests/test_filling_fields.py:1:1: I001 Import block is un-sorted or un-formatted
from django.db.models import JSONField
except ImportError:
JSONField = None
Expand Down Expand Up @@ -103,6 +103,14 @@
assert isinstance(person_bio_field, fields.TextField)

assert isinstance(person.bio, str)
assert len(person.bio) == MAX_LENGTH

def test_fill_TextField_with_max_length_str(self, person):
person_bio_summary_field = models.Person._meta.get_field("bio_summary")
assert isinstance(person_bio_summary_field, fields.TextField)

assert isinstance(person.bio_summary, str)
assert len(person.bio_summary) == person_bio_summary_field.max_length


class TestBinaryFieldsFilling:
Expand Down Expand Up @@ -510,6 +518,13 @@
ci_text_field = models.Person._meta.get_field("ci_text")
assert isinstance(ci_text_field, CITextField)
assert isinstance(person.ci_text, str)
assert len(person.ci_text) == MAX_LENGTH

def test_filling_citextfield_with_max_length(self, person):
ci_text_max_length_field = models.Person._meta.get_field("ci_text_max_length")
assert isinstance(ci_text_max_length_field, CITextField)
assert isinstance(person.ci_text, str)
assert len(person.ci_text) == ci_text_max_length_field.max_length

def test_filling_decimal_range_field(self, person):
try:
Expand Down
Loading