1
0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00

[1.10.x] Fixed #26716 -- Made CurrentSiteMiddleware compatible with new-style middleware.

Backport of 5e3f4c2e53 from master
This commit is contained in:
Brett Haydon
2016-06-07 10:26:24 +10:00
committed by Tim Graham
parent 34f13e030b
commit bd7de3cb87
2 changed files with 11 additions and 3 deletions

View File

@@ -11,7 +11,7 @@ from django.contrib.sites.requests import RequestSite
from django.contrib.sites.shortcuts import get_current_site
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db.models.signals import post_migrate
from django.http import HttpRequest
from django.http import HttpRequest, HttpResponse
from django.test import TestCase, modify_settings, override_settings
from django.test.utils import captured_stdout
@@ -305,9 +305,15 @@ class CreateDefaultSiteTests(TestCase):
class MiddlewareTest(TestCase):
def test_request(self):
def test_old_style_request(self):
""" Makes sure that the request has correct `site` attribute. """
middleware = CurrentSiteMiddleware()
request = HttpRequest()
middleware.process_request(request)
self.assertEqual(request.site.id, settings.SITE_ID)
def test_request(self):
def get_response(request):
return HttpResponse(str(request.site.id))
response = CurrentSiteMiddleware(get_response)(HttpRequest())
self.assertContains(response, settings.SITE_ID)