Skip to content

Min/MaxValueValidator is no longer transferred from a model's DecimalField #3774

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

Merged
merged 4 commits into from
Jan 4, 2016
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions rest_framework/utils/field_mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ def get_field_kwargs(field_name, model_field):

# Our decimal validation is handled in the field code, not validator code.
# (In Django 1.9+ this differs from previous style)
if isinstance(model_field, models.DecimalField):
if isinstance(model_field, models.DecimalField) and DecimalValidator:
validator_kwarg = [
validator for validator in validator_kwarg
if DecimalValidator and not isinstance(validator, DecimalValidator)
if not isinstance(validator, DecimalValidator)
]

# Ensure that max_length is passed explicitly as a keyword arg,
Expand Down
32 changes: 21 additions & 11 deletions tests/test_model_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from rest_framework import serializers
from rest_framework.compat import DurationField as ModelDurationField
from rest_framework.compat import DecimalValidator, unicode_repr
from rest_framework.compat import unicode_repr


def dedent(blocktext):
Expand Down Expand Up @@ -872,30 +872,40 @@ class DecimalFieldModel(models.Model):


class TestDecimalFieldMappings(TestCase):
@pytest.mark.skipif(DecimalValidator is not None,
reason='DecimalValidator is available in Django 1.9+')
def test_decimal_field_has_no_decimal_validator(self):
def test_decimal_field_has_decimal_validator(self):
"""
Test that a DecimalField has no validators before Django 1.9.
Test that a `DecimalField` has no `DecimalValidator`.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
model = DecimalFieldModel

serializer = TestSerializer()

assert len(serializer.fields['decimal_field'].validators) == 0
assert len(serializer.fields['decimal_field'].validators) == 2

@pytest.mark.skipif(DecimalValidator is None,
reason='DecimalValidator is available in Django 1.9+')
def test_decimal_field_has_decimal_validator(self):
def test_min_value_is_passed(self):
"""
Test that a DecimalField has DecimalValidator in Django 1.9+.
Test that the `MinValueValidator` is converted to the `min_value`
argument for the field.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
model = DecimalFieldModel

serializer = TestSerializer()

assert len(serializer.fields['decimal_field'].validators) == 2
assert serializer.fields['decimal_field'].min_value == 1

def test_max_value_is_passed(self):
"""
Test that the `MaxValueValidator` is converted to the `max_value`
argument for the field.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
model = DecimalFieldModel

serializer = TestSerializer()

assert serializer.fields['decimal_field'].max_value == 3