Skip to content

Commit

Permalink
Fixes (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
Stranger6667 committed Oct 28, 2016
1 parent 2151d7b commit 1d51ca1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions tests/contrib/test_django_rest_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ class TestMoneyField:
empty = None

def get_serializer(self, model_class, instance=None, data=empty):
class Serializer(serializers.ModelSerializer):
class Meta:
model = model_class
fields = '__all__'

if IS_DRF_3:
class Serializer(serializers.ModelSerializer):
class Meta:
model = model_class
fields = '__all__'
else:
class Serializer(serializers.ModelSerializer):
class Meta:
model = model_class

return Serializer(instance=instance, data=data)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def test_default_currency():
"""
instance = NullMoneyFieldModel.objects.create()
form = NullableModelForm(instance=instance)
if VERSION[:3] > (1, 10, 1):
if VERSION[:2] > (1, 10):
expected = '<option value="USD" selected>US Dollar</option>'
else:
expected = '<option value="USD" selected="selected">US Dollar</option>'
Expand Down

0 comments on commit 1d51ca1

Please sign in to comment.