Skip to content

Commit

Permalink
Add secure options for request
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Sep 26, 2015
1 parent f7506df commit 82f25ea
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions djangocms_helper/base_test.py
Expand Up @@ -236,7 +236,7 @@ def _prepare_request(self, request, page, user, lang, use_middlewares, use_toolb
mid.process_request(request)
return request

def get_request(self, page, lang, user=None, path=None, use_middlewares=False):
def get_request(self, page, lang, user=None, path=None, use_middlewares=False, secure=False):
"""
Create a GET request for the given page and language
Expand All @@ -245,13 +245,15 @@ def get_request(self, page, lang, user=None, path=None, use_middlewares=False):
:param user: current user
:param path: path (if different from the current page path)
:param use_middlewares: pass the request through configured middlewares.
:param secure: create HTTPS request
:return: request
"""
path = path or page and page.get_absolute_url(lang)
request = self.request_factory.get(path)
request = self.request_factory.get(path, secure=secure)
return self._prepare_request(request, page, user, lang, use_middlewares)

def post_request(self, page, lang, data, user=None, path=None, use_middlewares=False):
def post_request(self, page, lang, data, user=None, path=None, use_middlewares=False,
secure=False):
"""
Create a POST request for the given page and language with CSRF disabled
Expand All @@ -261,14 +263,15 @@ def post_request(self, page, lang, data, user=None, path=None, use_middlewares=F
:param user: current user
:param path: path (if different from the current page path)
:param use_middlewares: pass the request through configured middlewares.
:param secure: create HTTPS request
:return: request
"""
path = path or page and page.get_absolute_url(lang)
request = self.request_factory.post(path, data)
request = self.request_factory.post(path, data, secure=secure)
return self._prepare_request(request, page, user, lang, use_middlewares)

def get_page_request(self, page, user, path=None, edit=False, lang='en',
use_middlewares=False):
use_middlewares=False, secure=False):
"""
Create a GET request for the given page suitable for use the
django CMS toolbar
Expand All @@ -282,14 +285,15 @@ def get_page_request(self, page, user, path=None, edit=False, lang='en',
:param edit: whether enabling editing mode
:param lang: request language
:param use_middlewares: pass the request through configured middlewares.
:param secure: create HTTPS request
:return: request
"""
from cms.utils.conf import get_cms_setting
edit_on = get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON')
path = path or page and page.get_absolute_url(lang)
if edit:
path = '{0}?{1}'.format(path, edit_on)
request = self.request_factory.get(path)
request = self.request_factory.get(path, secure=secure)
return self._prepare_request(request, page, user, lang, use_middlewares, use_toolbar=True)

def create_image(self, mode='RGB', size=(800, 600)):
Expand Down

0 comments on commit 82f25ea

Please sign in to comment.