diff --git a/account/tests.py b/account/tests.py index aa21bc7..c8279aa 100644 --- a/account/tests.py +++ b/account/tests.py @@ -179,37 +179,28 @@ class UserAdminAPITest(APITestCase): response = self.client.get(self.url + "?keyword=test1") self.assertEqual(response.data["code"], 0) - -class UserAdminAPITest(APITestCase): - def setUp(self): - self.client = APIClient() - self.url = reverse("user_admin_api") - user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - user.set_password("testaa") - user.save() - def test_put_invalid_data(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"username": "test", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 1) def test_user_does_not_exist(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"id": 2, "username": "test0", "real_name": "test00", "password": "testaa","email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在!"}) def test_success_user_edit_not_password(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"id": 1, "username": "test0", "real_name": "test00", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) def test_success_user_edit_change_password(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") 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) diff --git a/oj/local_settings.py b/oj/local_settings.py index 7a7249c..2112566 100644 --- a/oj/local_settings.py +++ b/oj/local_settings.py @@ -16,7 +16,7 @@ DATABASES = { } } -mongodb_setting = { +MONGODB = { 'HOST': '127.0.0.1', 'USERNAME': 'root', 'PASSWORD': 'root', diff --git a/oj/urls.py b/oj/urls.py index e2fd51c..b0ca69f 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -14,7 +14,7 @@ from group.views import (GroupAdminAPIView, GroupMemberAdminAPIView, from admin.views import AdminTemplateView from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, ProblemAdminAPIView -from submission.views import SubmissionnAPIView +from submission.views import SubmissionAPIView urlpatterns = [ url(r'^install/$', "install.views.install"), @@ -56,6 +56,6 @@ urlpatterns = [ url(r'^api/admin/join_group_request/$', JoinGroupRequestAdminAPIView.as_view(), name="join_group_request_admin_api"), - url(r'^api/submission/$', SubmissionnAPIView.as_view(), name="submission_api"), + url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"), ] diff --git a/submission/views.py b/submission/views.py index 0a923e0..07fe70f 100644 --- a/submission/views.py +++ b/submission/views.py @@ -18,12 +18,12 @@ from .serializers import CreateSubmissionSerializer def _create_mondodb_connection(): - mongodb_setting = settings["mongodb_setting"] - connection = pymongo.MongoClient(host=mongodb_setting["HOST"], port=mongodb_setting["PORT"]) - return connection["oj"]["oj_submission"] + mongodb_setting = settings.MONGODB + connection = pymongo.MongoClient(host=mongodb_setting["HOST"], port=mongodb_setting["PORT"]) + return connection["oj"]["oj_submission"] -class SubmissionnAPIView(APIView): +class SubmissionAPIView(APIView): @login_required def post(self, request): """