From f63325aa9a459b2c510bd16297a381544a1571ea Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 3 Jun 2013 15:26:23 -0400 Subject: [PATCH] test_generators: Replace CUR_DIR with CONTENT_DIR for subdir cat. detection In situations where I've cleared ARTICLE_DIR, I've done so to ensure that there are no directories that will override the DEFAULT_CATEGORY due to USE_FOLDER_AS_CATEGORY. --- pelican/tests/test_generators.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py index 48aff498..f5ed6b85 100644 --- a/pelican/tests/test_generators.py +++ b/pelican/tests/test_generators.py @@ -15,6 +15,7 @@ from pelican.settings import DEFAULT_CONFIG from pelican.tests.support import unittest, get_settings CUR_DIR = os.path.dirname(__file__) +CONTENT_DIR = os.path.join(CUR_DIR, 'content') class TestArticlesGenerator(unittest.TestCase): @@ -30,12 +31,10 @@ class TestArticlesGenerator(unittest.TestCase): """ if self.generator is None: settings = get_settings(filenames={}) - settings['ARTICLE_DIR'] = 'content' settings['DEFAULT_CATEGORY'] = 'Default' settings['DEFAULT_DATE'] = (1970, 1, 1) self.generator = ArticlesGenerator(settings.copy(), settings, - CUR_DIR, settings['THEME'], None, - settings['MARKUP']) + CONTENT_DIR, settings['THEME'], None, settings['MARKUP']) self.generator.generate_context() return self.generator @@ -118,14 +117,13 @@ class TestArticlesGenerator(unittest.TestCase): def test_do_not_use_folder_as_category(self): settings = DEFAULT_CONFIG.copy() - settings['ARTICLE_DIR'] = 'content' settings['DEFAULT_CATEGORY'] = 'Default' settings['DEFAULT_DATE'] = (1970, 1, 1) settings['USE_FOLDER_AS_CATEGORY'] = False settings['filenames'] = {} generator = ArticlesGenerator( - settings.copy(), settings, CUR_DIR, DEFAULT_CONFIG['THEME'], None, - DEFAULT_CONFIG['MARKUP']) + settings.copy(), settings, CONTENT_DIR, DEFAULT_CONFIG['THEME'], + None, DEFAULT_CONFIG['MARKUP']) generator.generate_context() # test for name # categories are grouped by slug; if two categories have the same slug @@ -213,12 +211,12 @@ class TestPageGenerator(unittest.TestCase): def test_generate_context(self): settings = get_settings(filenames={}) - settings['PAGE_DIR'] = 'TestPages' + settings['PAGE_DIR'] = 'TestPages' # relative to CUR_DIR settings['DEFAULT_DATE'] = (1970, 1, 1) - generator = PagesGenerator(settings.copy(), settings, CUR_DIR, - settings['THEME'], None, - settings['MARKUP']) + generator = PagesGenerator( + settings.copy(), settings, CUR_DIR, settings['THEME'], None, + settings['MARKUP']) generator.generate_context() pages = self.distill_pages(generator.pages) hidden_pages = self.distill_pages(generator.hidden_pages)