Merge branch 'dev' into hohoTT-dev

Conflicts:
	contest_submission/tests.py
This commit is contained in:
hohoTT
2015-08-28 15:26:10 +08:00
25 changed files with 649 additions and 422 deletions

View File

@@ -41,7 +41,7 @@ class SubmissionsListPageTest(TestCase):
def test_submissionsListPage_page_not_exist(self):
self.client.login(username="gogoing", password="666666")
response = self.client.get('/submissions/5/')
response = self.client.get('/submissions/999/')
self.assertTemplateUsed(response, "utils/error.html")
def test_submissionsListPage_have_no_submission(self):