Added django silk for query monitoring

functional_tests/test_solution_comments.py

@@ -5,7 +5,7 @@ from selenium.webdriver.support.ui import WebDriverWait
 
 from core import models
 from functional_tests.util import (GradyTestCase, login, query_returns_object,
-                                   reset_browser_after_test)
+                                   reset_browser_after_test, assertion_is_true)
 from util import factory_boys as fact
 
 
@@ -83,8 +83,12 @@ class TestSolutionComments(GradyTestCase):
         comment_obj = models.SolutionComment.objects.first()
         self.assertEqual(old_text, comment_obj.text)
         comment_el = self._edit_comment(old_text, new_text)
-        displayed_text = comment_el.find_element_by_class_name('message').text
-        self.assertEqual(new_text, displayed_text)
+
+        def text_is_updated():
+            displayed_text = comment_el.find_element_by_class_name('message').text
+            return self.assertEqual(new_text, displayed_text)
+
+        WebDriverWait(self.browser, 3).until(assertion_is_true(text_is_updated))
         comment_obj.refresh_from_db()
         self.assertEqual(new_text, comment_obj.text)
 

functional_tests/util.py

@@ -179,7 +179,9 @@ def reconstruct_code_from_table(table_el):
         (line.get_attribute('id'),
             # call get_attribute here to get non normalized text
             # https://github.com/SeleniumHQ/selenium/issues/2608
-            line.find_element_by_class_name('code-cell-content').get_attribute('textContent'))
+            line.find_element_by_class_name('code-cell-content')
+                .find_element_by_class_name('code-line')
+                .get_attribute('textContent'))
         for line in lines
     ]
     line_no_code_pairs.sort(key=lambda x: x[0])  # sort by ids

grady/settings/default.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
     'rest_framework',
     'corsheaders',
     'drf_yasg',
+    'silk',
     'core',
     'constance',
     'constance.backends.database',
@@ -59,6 +60,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
+    'silk.middleware.SilkyMiddleware',
 ]
 
 ROOT_URLCONF = 'grady.urls'

grady/urls.py

+from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
 from django.views.generic.base import TemplateView
@@ -11,4 +12,5 @@ urlpatterns = [
     path('api-auth/', include('rest_framework.urls',
                               namespace='rest_framework')),
     path('', TemplateView.as_view(template_name='index.html')),
+    path('silk/', include('silk.urls', namespace='silk')),
 ]

requirements.txt

@@ -2,8 +2,9 @@ django-cors-headers~=2.4.0
 django-extensions~=2.1
 djangorestframework-jwt~=1.11.0
 djangorestframework>=3.9, <3.10
+django-silk~=4.0.1
 git+https://gitlab.gwdg.de/grady-corp/djangorestframework-camel-case.git
-Django>=2.1, <2.2
+Django>=2.2, <3.0
 drf-yasg~=1.12.0
 gunicorn~=19.9.0
 psycopg2-binary~=2.7.0
@@ -15,4 +16,4 @@ django-constance[database]~=2.3.1
 semver~=2.8.1
 sentry-sdk==0.11.2
 nbformat~=4.4.0
-nbconvert~=5.6.0
+nbconvert~=5.6.0
\ No newline at end of file