Pass write function to reduce duplication. Simplify logic.

This commit is contained in:
Stuart Colville 2012-05-02 09:26:33 +01:00
commit 06ba9acdb8
2 changed files with 31 additions and 51 deletions

View file

@ -54,11 +54,10 @@ class TestArticlesGenerator(unittest.TestCase):
generator = ArticlesGenerator(settings.copy(), settings, None,
_DEFAULT_CONFIG['THEME'], None,
_DEFAULT_CONFIG['MARKUP'])
writer = MagicMock()
generator.generate_direct_templates(writer)
writer.write_file.assert_called_with("archives.html",
generator.get_template("archives"), settings, relative_urls=True,
write = MagicMock()
generator.generate_direct_templates(write)
write.assert_called_with("archives.html",
generator.get_template("archives"), settings,
blog=True, paginated={}, page_name='archives')
def test_direct_templates_save_as_modified(self):
@ -69,10 +68,10 @@ class TestArticlesGenerator(unittest.TestCase):
generator = ArticlesGenerator(settings, settings, None,
_DEFAULT_CONFIG['THEME'], None,
_DEFAULT_CONFIG['MARKUP'])
writer = MagicMock()
generator.generate_direct_templates(writer)
writer.write_file.assert_called_with("archives/index.html",
generator.get_template("archives"), settings, relative_urls=True,
write = MagicMock()
generator.generate_direct_templates(write)
write.assert_called_with("archives/index.html",
generator.get_template("archives"), settings,
blog=True, paginated={}, page_name='archives')
def test_direct_templates_save_as_false(self):
@ -83,6 +82,6 @@ class TestArticlesGenerator(unittest.TestCase):
generator = ArticlesGenerator(settings, settings, None,
_DEFAULT_CONFIG['THEME'], None,
_DEFAULT_CONFIG['MARKUP'])
writer = MagicMock()
generator.generate_direct_templates(writer)
writer.write_file.assert_called_count == 0
write = MagicMock()
generator.generate_direct_templates(write)
write.assert_called_count == 0