From 9b191bb932a3a7d6ebeb61be31ba666e8f8a9d9e Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 15:48:39 +0000 Subject: Fix tests and add new ones for show_content_in_browser feature --- wkhtmltopdf/test_settings.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'wkhtmltopdf/test_settings.py') diff --git a/wkhtmltopdf/test_settings.py b/wkhtmltopdf/test_settings.py index 37d086f..8b2ec62 100644 --- a/wkhtmltopdf/test_settings.py +++ b/wkhtmltopdf/test_settings.py @@ -1,5 +1,9 @@ +import os + DEBUG = True +DIRNAME = os.path.abspath(os.path.dirname(__file__)) + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -7,10 +11,22 @@ DATABASES = { } } -MEDIA_URL = '' -STATIC_URL = '' +# MEDIA_URL = '/media/' +# MEDIA_ROOT = '/tmp/media' +# STATIC_URL = '/static/' +# STATIC_ROOT = '/tmp/static' +MEDIA_ROOT = os.path.join(DIRNAME, 'media') +MEDIA_URL = '/media/' +STATIC_ROOT = os.path.join(DIRNAME, 'static') +STATIC_URL = '/static/' INSTALLED_APPS = ( 'wkhtmltopdf.tests', 'wkhtmltopdf', ) + +TEMPLATE_DIRS = [ + os.path.join(DIRNAME, 'testproject', 'tests', 'templates'), +] + +WKHTMLTOPDF_DEBUG = DEBUG -- cgit v1.2.3 From cda678a3ea9b01a684c6e2d3ed636834f41c96f8 Mon Sep 17 00:00:00 2001 From: mattack108 Date: Tue, 15 Jan 2013 16:39:54 +0000 Subject: Remove unwanted settings vars from test project --- wkhtmltopdf/test_settings.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'wkhtmltopdf/test_settings.py') diff --git a/wkhtmltopdf/test_settings.py b/wkhtmltopdf/test_settings.py index 8b2ec62..9f6e461 100644 --- a/wkhtmltopdf/test_settings.py +++ b/wkhtmltopdf/test_settings.py @@ -11,10 +11,6 @@ DATABASES = { } } -# MEDIA_URL = '/media/' -# MEDIA_ROOT = '/tmp/media' -# STATIC_URL = '/static/' -# STATIC_ROOT = '/tmp/static' MEDIA_ROOT = os.path.join(DIRNAME, 'media') MEDIA_URL = '/media/' STATIC_ROOT = os.path.join(DIRNAME, 'static') -- cgit v1.2.3