Move TestingMiddleware to tests/tools.py
This middleware isn't needed outside of the tests, so let's just put it there.
This commit is contained in:
@@ -23,7 +23,6 @@ from webtest import TestApp
|
||||
|
||||
from mediagoblin import mg_globals
|
||||
from mediagoblin.tools import testing
|
||||
from mediagoblin.middleware.testing import TestingMiddleware
|
||||
from mediagoblin.init.config import read_mediagoblin_config
|
||||
from mediagoblin.decorators import _make_safe
|
||||
from mediagoblin.db.open import setup_connection_and_db_from_config
|
||||
@@ -51,6 +50,51 @@ $ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests ./bin/nosetests"""
|
||||
class BadCeleryEnviron(Exception): pass
|
||||
|
||||
|
||||
class TestingMiddleware(object):
|
||||
"""
|
||||
Middleware for the Unit tests
|
||||
|
||||
It might make sense to perform some tests on all
|
||||
requests/responses. Or prepare them in a special
|
||||
manner. For example all html responses could be tested
|
||||
for being valid html *after* being rendered.
|
||||
|
||||
This module is getting inserted at the front of the
|
||||
middleware list, which means: requests are handed here
|
||||
first, responses last. So this wraps up the "normal"
|
||||
app.
|
||||
|
||||
If you need to add a test, either add it directly to
|
||||
the appropiate process_request or process_response, or
|
||||
create a new method and call it from process_*.
|
||||
"""
|
||||
|
||||
def __init__(self, mg_app):
|
||||
self.app = mg_app
|
||||
|
||||
def process_request(self, request):
|
||||
pass
|
||||
|
||||
def process_response(self, request, response):
|
||||
# All following tests should be for html only!
|
||||
if response.content_type != "text/html":
|
||||
# Get out early
|
||||
return
|
||||
|
||||
# If the template contains a reference to
|
||||
# /mgoblin_static/ instead of using
|
||||
# /request.staticdirect(), error out here.
|
||||
# This could probably be implemented as a grep on
|
||||
# the shipped templates easier...
|
||||
if response.text.find("/mgoblin_static/") >= 0:
|
||||
raise AssertionError(
|
||||
"Response HTML contains reference to /mgoblin_static/ "
|
||||
"instead of staticdirect. Request was for: "
|
||||
+ request.full_path)
|
||||
|
||||
return
|
||||
|
||||
|
||||
def suicide_if_bad_celery_environ():
|
||||
if not os.environ.get('CELERY_CONFIG_MODULE') == \
|
||||
'mediagoblin.init.celery.from_tests':
|
||||
|
||||
Reference in New Issue
Block a user