xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add conf app and related test and settings

Browse Source
This commit is contained in:
virusdefender
2016-11-19 13:47:59 +08:00
parent 7fcc4d972b
commit 637baba71b
17 changed files with 263 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
account/tests.py
View File

@@ -32,7 +32,7 @@ class PermissionDecoratorTest(APITestCase):
class UserLoginAPITest(APITestCase):
def setUp(self):
self.username = self.password = "test"
self.user = self.create_user(username=self.username, password=self.password)
self.user = self.create_user(username=self.username, password=self.password, login=False)
self.login_url = self.reverse("user_login_api")
def _set_tfa(self):
@@ -152,7 +152,7 @@ class UserChangePasswordAPITest(CaptchaTest):
self.username = "test_user"
self.old_password = "testuserpassword"
self.new_password = "new_password"
self.create_user(username=self.username, password=self.old_password)
self.create_user(username=self.username, password=self.old_password, login=False)
self.data = {"old_password": self.old_password, "new_password": self.new_password,
"captcha": self._set_captcha(self.client.session)}
@@ -178,7 +178,7 @@ class AdminUserTest(APITestCase):
def setUp(self):
self.user = self.create_super_admin(login=True)
self.username = self.password = "test"
self.regular_user = self.create_user(username=self.username, password=self.password)
self.regular_user = self.create_user(username=self.username, password=self.password, login=False)
self.url = self.reverse("user_admin_api")
self.data = {"id": self.regular_user.id, "username": self.username, "real_name": "test_name",
"email": "test@qq.com", "admin_type": AdminType.REGULAR_USER,

2
account/urls/admin.py
View File

@@ -3,5 +3,5 @@ from django.conf.urls import url
from ..views.admin import UserAdminAPI
urlpatterns = [
url(r'^user/$', UserAdminAPI.as_view(), name="user_admin_api"),
url(r'^user$', UserAdminAPI.as_view(), name="user_admin_api"),
]

6
account/urls/oj.py
View File

@@ -3,7 +3,7 @@ from django.conf.urls import url
from ..views.oj import UserLoginAPI, UserRegisterAPI, UserChangePasswordAPI
urlpatterns = [
url(r'^login/$', UserLoginAPI.as_view(), name="user_login_api"),
url(r'^register/$', UserRegisterAPI.as_view(), name="user_register_api"),
url(r'^change_password/$', UserChangePasswordAPI.as_view(), name="user_change_password_api")
url(r'^login$', UserLoginAPI.as_view(), name="user_login_api"),
url(r'^register$', UserRegisterAPI.as_view(), name="user_register_api"),
url(r'^change_password$', UserChangePasswordAPI.as_view(), name="user_change_password_api")
]