Skip to content

Commit 294a183

Browse files
committed
Merged two DecimalValidator tests together
These two tests were previously added in 7d79cf3 but we have now discovered that there are not actually two separate cases, there was just a bug in the code that made it look that way.
1 parent d797389 commit 294a183

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

tests/test_model_serializer.py

+2-18
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
from rest_framework import serializers
2424
from rest_framework.compat import DurationField as ModelDurationField
25-
from rest_framework.compat import DecimalValidator, unicode_repr
25+
from rest_framework.compat import unicode_repr
2626

2727

2828
def dedent(blocktext):
@@ -872,25 +872,9 @@ class DecimalFieldModel(models.Model):
872872

873873

874874
class TestDecimalFieldMappings(TestCase):
875-
@pytest.mark.skipif(DecimalValidator is not None,
876-
reason='DecimalValidator is available in Django 1.9+')
877-
def test_decimal_field_has_no_decimal_validator(self):
878-
"""
879-
Test that a DecimalField has no validators before Django 1.9.
880-
"""
881-
class TestSerializer(serializers.ModelSerializer):
882-
class Meta:
883-
model = DecimalFieldModel
884-
885-
serializer = TestSerializer()
886-
887-
assert len(serializer.fields['decimal_field'].validators) == 2
888-
889-
@pytest.mark.skipif(DecimalValidator is None,
890-
reason='DecimalValidator is available in Django 1.9+')
891875
def test_decimal_field_has_decimal_validator(self):
892876
"""
893-
Test that a DecimalField has DecimalValidator in Django 1.9+.
877+
Test that a `DecimalField` has no `DecimalValidator`.
894878
"""
895879
class TestSerializer(serializers.ModelSerializer):
896880
class Meta:

0 commit comments

Comments
 (0)