Skip to content
Open
Changes from all commits
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
56 changes: 27 additions & 29 deletions tests/test_model_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,40 +160,38 @@ class Meta:

class TestRegularFieldMappings(TestCase):
def test_regular_fields(self):
"""
Model fields should map to their equivalent serializer fields.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
model = RegularFieldsModel
fields = '__all__'
fields = "__all__"

expected = dedent(r"""
TestSerializer\(\):
auto_field = IntegerField\(read_only=True\)
big_integer_field = IntegerField\(.*\)
boolean_field = BooleanField\(required=False\)
char_field = CharField\(max_length=100\)
comma_separated_integer_field = CharField\(max_length=100, validators=\[<django.core.validators.RegexValidator object>\]\)
date_field = DateField\(\)
datetime_field = DateTimeField\(\)
decimal_field = DecimalField\(decimal_places=1, max_digits=3\)
email_field = EmailField\(max_length=100\)
float_field = FloatField\(\)
integer_field = IntegerField\(.*\)
null_boolean_field = BooleanField\(allow_null=True, required=False\)
positive_integer_field = IntegerField\(.*\)
positive_small_integer_field = IntegerField\(.*\)
slug_field = SlugField\(allow_unicode=False, max_length=100\)
small_integer_field = IntegerField\(.*\)
text_field = CharField\(max_length=100, style={'base_template': 'textarea.html'}\)
file_field = FileField\(max_length=100\)
time_field = TimeField\(\)
url_field = URLField\(max_length=100\)
custom_field = ModelField\(model_field=<tests.test_model_serializer.CustomField: custom_field>\)
file_path_field = FilePathField\(path=%r\)
""" % tempfile.gettempdir())
assert re.search(expected, repr(TestSerializer())) is not None
TestSerializer\(\):
auto_field = IntegerField\(read_only=True\)
big_integer_field = IntegerField\(.*\)
boolean_field = BooleanField\(.*\)
char_field = CharField\(.*\)
comma_separated_integer_field = CharField\(.*\)
date_field = DateField\(.*\)
datetime_field = DateTimeField\(.*\)
decimal_field = DecimalField\(.*\)
email_field = EmailField\(.*\)
float_field = FloatField\(.*\)
Comment on lines +172 to +179
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like this is is changing more than needed... What was the rationale for changing these seemingly unrelated fields to have a .* in the kwargs?

integer_field = IntegerField\(.*\)
null_boolean_field = BooleanField\(.*\)
positive_integer_field = IntegerField\(.*\)
positive_small_integer_field = IntegerField\(.*\)
slug_field = SlugField\(.*\)
small_integer_field = IntegerField\(.*\)
text_field = CharField\(.*\)
file_field = FileField\(.*\)
time_field = TimeField\(.*\)
url_field = URLField\(.*\)
custom_field = ModelField\(model_field=<tests\.test_model_serializer\.CustomField: custom_field>\)
file_path_field = FilePathField\(path='.*'\)
""")

assert re.search

def test_field_options(self):
class TestSerializer(serializers.ModelSerializer):
Expand Down
Loading