Move the speed.pypy.org only views into speed_pypy/

Author: StanFromIreland

codespeed/urls.py

@@ -14,7 +14,6 @@
 ]
 
 urlpatterns += [
-    re_path(r'^embed/comparison/$', views.embed_comparison, name='embed-comparison'),
     re_path(r'^historical/json/$', views.gethistoricaldata, name='gethistoricaldata'),
     re_path(r'^reports/$', views.reports, name='reports'),
     re_path(r'^changes/$', views.changes, name='changes'),

codespeed/views.py

@@ -17,7 +17,6 @@
 from django.views.decorators.cache import cache_page
 from django.views.decorators.http import require_GET, require_POST
 from django.views.decorators.csrf import csrf_exempt
-from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic.base import TemplateView
 
 from .auth import basic_auth_required
@@ -100,24 +99,6 @@ def get_context_data(self, **kwargs):
             return context
 
 
-@require_GET
-@xframe_options_exempt
-def embed_comparison(request):
-    """Frame-exempt page rendering only the baseline-comparison
-    for embedding on pypy.org"""
-    context = {}
-    try:
-        context['baseline'] = Executable.objects.get(
-            name=settings.DEF_BASELINES[0]['executable'])
-        def_name = settings.DEF_EXECUTABLES[0]['name']
-        def_project = Project.objects.get(name=settings.DEF_EXECUTABLES[0]['project'])
-        context['default_exe'] = Executable.objects.get(
-            name=def_name, project=def_project)
-    except Exception as e:
-        logger.error('embed_comparison: %s', e)
-    return render(request, 'embed_comparison.html', context)
-
-
 # The historical comparison only changes when new results are saved, which
 # happens at most a few times a day, yet computing it costs ~2s of database
 # time per request.  Cache the rendered JSON server-side and let browsers

codespeed/admin_views.py speed_pypy/admin_views.pycodespeed/admin_views.py renamed to speed_pypy/admin_views.py

@@ -0,0 +1,61 @@
+"""Tests for the speed.pypy.org specific views.
+
+Run with: python manage.py test codespeed speed_pypy --settings=codespeed.tests.settings
+"""
+import os
+
+from django.contrib.auth.models import User
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from codespeed.models import Executable, Project
+
+SITE_DIR = os.path.dirname(os.path.abspath(__file__))
+# The test settings are site independent; render this site's templates instead.
+SITE_TEMPLATES = [{
+    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'DIRS': [os.path.join(SITE_DIR, 'templates')],
+    'APP_DIRS': True,
+    'OPTIONS': {'context_processors': [
+        'django.template.context_processors.request',
+        'django.contrib.auth.context_processors.auth',
+        'django.contrib.messages.context_processors.messages',
+    ]},
+}]
+
+
+@override_settings(
+    ROOT_URLCONF='speed_pypy.urls',
+    TEMPLATES=SITE_TEMPLATES,
+    DEF_BASELINES=[{'executable': 'cpython', 'revision': '3.12.4'}],
+    DEF_EXECUTABLES=[{'name': 'pypy3.11-jit-64', 'project': 'PyPy3.11'}])
+class TestEmbedComparison(TestCase):
+
+    def setUp(self):
+        cpython = Project.objects.create(name='CPython', default_branch='main')
+        pypy = Project.objects.create(name='PyPy3.11', default_branch='main')
+        Executable.objects.create(name='cpython', project=cpython)
+        Executable.objects.create(name='pypy3.11-jit-64', project=pypy)
+
+    def test_renders_frame_exempt(self):
+        response = self.client.get(reverse('embed-comparison'))
+        self.assertEqual(response.status_code, 200)
+        # Served inside an iframe on pypy.org, so clickjacking protection is off
+        self.assertNotIn('X-Frame-Options', response)
+        self.assertEqual(response.context['default_exe'].name, 'pypy3.11-jit-64')
+
+
+@override_settings(ROOT_URLCONF='speed_pypy.urls', TEMPLATES=SITE_TEMPLATES)
+class TestDownloadDb(TestCase):
+
+    def test_requires_staff(self):
+        response = self.client.get(reverse('admin-download-db'))
+        self.assertEqual(response.status_code, 302)
+        self.assertIn('/admin/login/', response['Location'])
+
+    def test_staff_gets_sqlite_file(self):
+        User.objects.create_user('admin', 'a@example.com', 'pw', is_staff=True)
+        self.client.login(username='admin', password='pw')
+        response = self.client.get(reverse('admin-download-db'))
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('attachment', response['Content-Disposition'])

speed_pypy/tests.py

@@ -4,11 +4,12 @@
 from django.urls import include, re_path
 from django.contrib import admin
 
-from codespeed import admin_views
+from . import admin_views, views
 
 urlpatterns = [
     re_path(r'^admin/download-db/$', admin_views.download_db, name='admin-download-db'),
     re_path(r'^admin/', admin.site.urls),
+    re_path(r'^embed/comparison/$', views.embed_comparison, name='embed-comparison'),
     re_path(r'^', include('codespeed.urls'))
 ]
 

speed_pypy/urls.py

@@ -0,0 +1,29 @@
+"""Views specific to speed.pypy.org."""
+import logging
+
+from django.conf import settings
+from django.shortcuts import render
+from django.views.decorators.clickjacking import xframe_options_exempt
+from django.views.decorators.http import require_GET
+
+from codespeed.models import Executable, Project
+
+logger = logging.getLogger(__name__)
+
+
+@require_GET
+@xframe_options_exempt
+def embed_comparison(request):
+    """Frame-exempt page rendering only the baseline-comparison
+    for embedding on pypy.org"""
+    context = {}
+    try:
+        context['baseline'] = Executable.objects.get(
+            name=settings.DEF_BASELINES[0]['executable'])
+        def_name = settings.DEF_EXECUTABLES[0]['name']
+        def_project = Project.objects.get(name=settings.DEF_EXECUTABLES[0]['project'])
+        context['default_exe'] = Executable.objects.get(
+            name=def_name, project=def_project)
+    except Exception as e:
+        logger.error('embed_comparison: %s', e)
+    return render(request, 'embed_comparison.html', context)