Skip to content

Commit

Permalink
remove serializers fields, custom messages and tests for API
Browse files Browse the repository at this point in the history
  • Loading branch information
laura-barluzzi committed Jul 24, 2017
1 parent d36378d commit 6fd0b36
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 50 deletions.
14 changes: 0 additions & 14 deletions cadasta/accounts/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,6 @@ class UserSerializer(SanitizeFieldSerializer,
"email address")
)]
)
language = ChoiceField(
choices=settings.LANGUAGES,
default=settings.LANGUAGE_CODE,
error_messages={
'invalid_choice': _('Language invalid or not available')
}
)
measurement = ChoiceField(
choices=settings.MEASUREMENTS,
default=settings.MEASUREMENT_DEFAULT,
error_messages={
'invalid_choice': _('Measurement system invalid or not available')
}
)

class Meta:
model = User
Expand Down
36 changes: 0 additions & 36 deletions cadasta/accounts/tests/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,42 +310,6 @@ def test_update_with_restricted_username(self):
assert serializer2.errors['username'] == [
_("Username cannot be “add” or “new”.")]

def test_update_with_invalid_language(self):
serializer = serializers.UserSerializer(data=BASIC_TEST_DATA)
assert serializer.is_valid() is True
user = serializer.save()
data = {
'username': 'imagine71',
'email': '[email protected]',
'language': 'invalid',
}
request = APIRequestFactory().patch('/user/imagine71', data)
force_authenticate(request, user=user)
serializer2 = serializers.UserSerializer(
user, data=data, context={'request': Request(request)}
)
assert serializer2.is_valid() is False
assert ('Language invalid or not available'
in serializer2.errors['language'])

def test_update_with_invalid_measurement_system(self):
serializer = serializers.UserSerializer(data=BASIC_TEST_DATA)
assert serializer.is_valid() is True
user = serializer.save()
data = {
'username': 'imagine71',
'email': '[email protected]',
'measurement': 'invalid',
}
request = APIRequestFactory().patch('/user/imagine71', data)
force_authenticate(request, user=user)
serializer2 = serializers.UserSerializer(
user, data=data, context={'request': Request(request)}
)
assert serializer2.is_valid() is False
assert ('Measurement system invalid or not available'
in serializer2.errors['measurement'])

def test_sanitize(self):
user = UserFactory.create(username='imagine71')
data = {
Expand Down

0 comments on commit 6fd0b36

Please sign in to comment.