more fixes to 995 (more tests fail now)

Author: Jonas Obrist

cms/test_utils/testcases.py

@@ -2,25 +2,23 @@
 from cms.models import Page
 from cms.test_utils.util.context_managers import (UserLoginContext, 
     SettingsOverride, _AssertNumQueriesContext)
+from cms.test_utils.util.request_factory import RequestFactory
 from django.conf import settings
-from django.db.utils import DEFAULT_DB_ALIAS
-from django.db import connections
-
 from django.contrib.auth.models import User, AnonymousUser
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.handlers.wsgi import WSGIRequest
 from django.core.urlresolvers import reverse
+from django.db import connections
+from django.db.utils import DEFAULT_DB_ALIAS
 from django.template.context import Context
-from django.test.client import (encode_multipart, BOUNDARY, MULTIPART_CONTENT, 
-    FakePayload)
 from django.test import testcases
+from django.test.client import Client
 from menus.menu_pool import menu_pool
-from urlparse import urlparse
 import sys
 import urllib
 import warnings
 
 
+
 URL_CMS_PAGE = "/admin/cms/page/"
 URL_CMS_PAGE_ADD = URL_CMS_PAGE + "add/"
 URL_CMS_PAGE_CHANGE = URL_CMS_PAGE + "%d/" 
@@ -107,6 +105,7 @@ class CMSTestCase(TestCase):
     def _fixture_setup(self):
         super(CMSTestCase, self)._fixture_setup()
         self.create_fixtures()
+        self.client = Client()
 
     def create_fixtures(self):
         pass
@@ -237,51 +236,22 @@ def get_context(self, path=None):
 
         return Context(context)   
 
-    def get_request(self, path=None, language=None, post_data=None, enforce_csrf_checks=False):
+    def get_request(self, path=None, language=None, post_data=None):
+        factory = RequestFactory()
+        
         if not path:
             path = self.get_pages_root()
 
         if not language:
             language = settings.LANGUAGES[0][0]
 
-        parsed_path = urlparse(path)
-        host = parsed_path.netloc or 'testserver'
-        port = 80
-        if ':' in host:
-            host, port = host.split(':', 1)
-        
-        environ = {
-            'HTTP_COOKIE':       self.client.cookies,
-            'PATH_INFO':         parsed_path.path,
-            'QUERY_STRING':      parsed_path.query,
-            'REMOTE_ADDR':       '127.0.0.1',
-            'REQUEST_METHOD':    'GET',
-            'SCRIPT_NAME':       '',
-            'SERVER_NAME':       host,
-            'SERVER_PORT':       port,
-            'SERVER_PROTOCOL':   'HTTP/1.1',
-            'wsgi.version':      (1,0),
-            'wsgi.url_scheme':   'http',
-            'wsgi.errors':       self.client.errors,
-            'wsgi.multiprocess': True,
-            'wsgi.multithread':  False,
-            'wsgi.run_once':     False,
-            'wsgi.input':        ''
-        }
         if post_data:
-            post_data = encode_multipart(BOUNDARY, post_data)
-            environ.update({
-                    'CONTENT_LENGTH': len(post_data),
-                    'CONTENT_TYPE':   MULTIPART_CONTENT,
-                    'REQUEST_METHOD': 'POST',
-                    'wsgi.input':     FakePayload(post_data),
-            })
-        request = WSGIRequest(environ)
+            request = factory.post(path, post_data)
+        else:
+            request = factory.get(path)
         request.session = self.client.session
         request.user = getattr(self, 'user', AnonymousUser())
         request.LANGUAGE_CODE = language
-        if not enforce_csrf_checks:
-            request.csrf_processing_done = True 
         return request
 
     def check_published_page_attributes(self, page):

cms/tests/templatetags.py

@@ -47,6 +47,7 @@ def _getsecond(self):
     def test_get_page_by_untyped_arg_none(self):
         control = self._getfirst()
         request = self.get_request('/')
+        request.current_page = control
         page = _get_page_by_untyped_arg(None, request, 1)
         self.assertEqual(page, control)