From cef804919b2479d6555d57c61c6161260857b03a 2013-12-21 03:13:50 From: Thomas Kluyver Date: 2013-12-21 03:13:50 Subject: [PATCH] Fix tests to use full template names --- diff --git a/IPython/nbconvert/exporters/tests/test_html.py b/IPython/nbconvert/exporters/tests/test_html.py index f2c9f6c..f6d6e33 100644 --- a/IPython/nbconvert/exporters/tests/test_html.py +++ b/IPython/nbconvert/exporters/tests/test_html.py @@ -47,7 +47,7 @@ class TestHTMLExporter(ExportersTestsBase): """ Can a HTMLExporter export using the 'basic' template? """ - (output, resources) = HTMLExporter(template_file='basic').from_filename(self._get_notebook()) + (output, resources) = HTMLExporter(template_file='html_basic').from_filename(self._get_notebook()) assert len(output) > 0 @@ -56,6 +56,6 @@ class TestHTMLExporter(ExportersTestsBase): """ Can a HTMLExporter export using the 'full' template? """ - (output, resources) = HTMLExporter(template_file='full').from_filename(self._get_notebook()) + (output, resources) = HTMLExporter(template_file='html_full').from_filename(self._get_notebook()) assert len(output) > 0 diff --git a/IPython/nbconvert/exporters/tests/test_slides.py b/IPython/nbconvert/exporters/tests/test_slides.py index 7c7d008..86197b6 100644 --- a/IPython/nbconvert/exporters/tests/test_slides.py +++ b/IPython/nbconvert/exporters/tests/test_slides.py @@ -47,5 +47,5 @@ class TestSlidesExporter(ExportersTestsBase): """ Can a SlidesExporter export using the 'reveal' template? """ - (output, resources) = SlidesExporter(template_file='reveal').from_filename(self._get_notebook()) + (output, resources) = SlidesExporter(template_file='slides_reveal').from_filename(self._get_notebook()) assert len(output) > 0 diff --git a/IPython/nbconvert/tests/test_nbconvertapp.py b/IPython/nbconvert/tests/test_nbconvertapp.py index 4df503e..a6a0475 100644 --- a/IPython/nbconvert/tests/test_nbconvertapp.py +++ b/IPython/nbconvert/tests/test_nbconvertapp.py @@ -123,7 +123,7 @@ class TestNbConvertApp(TestsBase): """Is embedded png data well formed in HTML?""" with self.create_temp_cwd(['notebook2.ipynb']): self.call('nbconvert --log-level 0 --to HTML ' - 'notebook2.ipynb --template full') + 'notebook2.ipynb --template html_full') assert os.path.isfile('notebook2.html') with open('notebook2.html') as f: assert "data:image/png;base64,b'" not in f.read() @@ -135,7 +135,7 @@ class TestNbConvertApp(TestsBase): """ with self.create_temp_cwd(['notebook2.ipynb']): self.call('nbconvert --log-level 0 --to slides ' - 'notebook2.ipynb --template reveal') + 'notebook2.ipynb --template slides_reveal') assert os.path.isfile('notebook2.slides.html') with open('notebook2.slides.html') as f: assert '/reveal.css' in f.read()