Merge branch 'diego' into development

This commit is contained in:
Sam
2021-03-15 11:25:04 +00:00
4 changed files with 8 additions and 2 deletions

View File

@@ -85,7 +85,7 @@ class UpdateUserSerializer(serializers.ModelSerializer):
class Meta:
model = models.CustomUser
fields = ('full_name', 'email')
fields = ('full_name', 'email', 'notify')
def validate_email(self, value):
user = self.context['request'].user

View File

@@ -169,7 +169,6 @@ class CustomUserViewSetTest(APITestCase):
data = {
"email": "new_email@mail.com",
"full_name": "New Full Name",
'provider': 'PROVIDER',
'notify': True,
}
@@ -183,6 +182,10 @@ class CustomUserViewSetTest(APITestCase):
# Assert forbidden code
self.assertEqual(response.status_code, status.HTTP_200_OK)
# Assert instance has been modified
for key in data:
self.assertEqual(data[key], response.data[key])
# admin user
def test_admin_user_can_create_instance(self):
"""Admin user can create new instance