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

Merge branch 'dev' into hohoTT-dev

Browse Source 
Conflicts:
	template/src/oj/submission/my_submissions_list.html
This commit is contained in:
hohoTT
2015-09-02 15:46:53 +08:00
parent 93974f03b7 a4433a1cf3
commit 1045a8a007
27 changed files with 359 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contest/tests.py
View File

@@ -141,7 +141,7 @@ class ContestAdminAPITest(APITestCase):
response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 0)
self.assertEqual(response.data["data"]["title"], "titlez")
self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z")
#self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z")
def test_edit_group_contest_successfully(self):
self.client.login(username="test1", password="testaa")
@@ -152,7 +152,7 @@ class ContestAdminAPITest(APITestCase):
response = self.client.put(self.url, data=data)
self.assertEqual(response.data["code"], 0)
self.assertEqual(response.data["data"]["title"], "titleyyy")
self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z")
#self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z")
self.assertEqual(response.data["data"]["visible"], False)
def test_edit_group_contest_unsuccessfully(self):