Merge branch 'feature/syntax-highlighting' of https://github.com/unb-…

…mds/2023-2-Squad06 into feature/syntax-highlighting

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,13 +15,13 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: 3.9.0
+    rev: v3.13.0
     hooks:
       - id: commitizen
       - id: commitizen-branch
         stages: [push]
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.11.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
@@ -33,7 +33,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.6.1
+    rev: v1.7.1
     hooks:
       - id: mypy
         additional_dependencies:

apps/submissions/forms.py

@@ -4,6 +4,7 @@
 
 class SubmissionForm(Form):
     code = CodeMirrorField(
+        min_length=15,
         label="Code",
         required=True,
         config_name="python",

apps/tasks/tests.py

@@ -358,13 +358,8 @@ def test_send_submission_successfully(self) -> None:
     def test_send_submission_with_short_code(self) -> None:
         self.client.force_login(self.user)
 
-        initial_submission_count = Submission._default_manager.count()
-
         self.client.post(self.url, data={"code": "c"})
-
-        final_submission_count = Submission._default_manager.count()
-
-        self.assertEqual(final_submission_count, initial_submission_count + 1)
+        self.assertEqual(Submission._default_manager.count(), 1)
 
     def test_detail_view_model_is_task(self) -> None:
         self.assertEqual(DetailView.model, Task)
@@ -507,21 +502,13 @@ def test_form_success_url(self) -> None:
         self.assertEqual(self.view.get_success_url(), url)
 
     def test_invalid_form_submission(self) -> None:
-        invalid_code = "invalid code"
-
-        response = self.client.post(self.url, data={"code": invalid_code})
-
-        self.assertEqual(response.status_code, 302)
-
-        redirected_url = response.headers["Location"]
-
-        redirected_response = self.client.get(redirected_url)
+        self.client.force_login(self.user)
 
-        self.assertEqual(redirected_response.status_code, 200)
+        response = self.client.post(self.url, data={"code": ""})
 
-        if redirected_response.context is not None:
-            self.assertIn("form", redirected_response.context)
-            self.assertFalse(redirected_response.context["form"].is_valid())
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "tasks/detail.html")
+        self.assertFalse(response.context["form"].is_valid())
 
 
 class BackgroundJobTaskTest(TestCase):

docker-compose.yml

@@ -24,6 +24,8 @@ services:
       - config/.env
     depends_on:
       - postgres
+      - rabbitmq
+      - celery
     command: python -Wd manage.py runserver 0.0.0.0:8000
 
   celery: