Accept Merge Request #49 : (hohoTT-dev -> dev)

Merge Request: 修改了用户编辑密码时,密码是否编辑的两个测试用例
Created By: @hohoTT
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/49
This commit is contained in:
esp 2015-08-08 16:45:12 +08:00
commit c3fcb119c4
2 changed files with 10 additions and 2 deletions

View File

@ -41,6 +41,6 @@ class EditUserSerializer(serializers.Serializer):
id = serializers.IntegerField() id = serializers.IntegerField()
username = serializers.CharField(max_length=30) username = serializers.CharField(max_length=30)
real_name = serializers.CharField(max_length=30) real_name = serializers.CharField(max_length=30)
password = serializers.CharField(max_length=30, min_length=6, required=True) password = serializers.CharField(max_length=30, min_length=6, required=False, default=None)
email = serializers.EmailField(max_length=254) email = serializers.EmailField(max_length=254)
admin_type = serializers.IntegerField(default=0) admin_type = serializers.IntegerField(default=0)

View File

@ -4,6 +4,7 @@ import json
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.test import TestCase, Client from django.test import TestCase, Client
from django.http import HttpResponse from django.http import HttpResponse
from django.contrib import auth
from rest_framework.test import APITestCase, APIClient from rest_framework.test import APITestCase, APIClient
from rest_framework.views import APIView from rest_framework.views import APIView
@ -194,11 +195,18 @@ class UserAdminAPITest(APITestCase):
self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在!"}) self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在!"})
def test_success_user_edit_not_password(self): def test_success_user_edit_not_password(self):
data = {"id": 1, "username": "test0", "real_name": "test00", "password": "aaaaaa", data = {"id": 1, "username": "test0", "real_name": "test00",
"email": "60@qq.com", "admin_type": "2"} "email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data) response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 0) self.assertEqual(response.data["code"], 0)
def test_success_user_edit_change_password(self):
data = {"id": 1, "username": "test0", "real_name": "test00", "password": "111111",
"email": "60@qq.com", "admin_type": "2"}
response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 0)
self.assertIsNotNone(auth.authenticate(username="test0", password="111111"))
@login_required @login_required
def login_required_FBV_test_without_args(request): def login_required_FBV_test_without_args(request):