diff --git a/IPython/nbconvert/exporters/tests/base.py b/IPython/nbconvert/exporters/tests/base.py index ad61321..d2927f8 100644 --- a/IPython/nbconvert/exporters/tests/base.py +++ b/IPython/nbconvert/exporters/tests/base.py @@ -14,7 +14,7 @@ import os -from IPython.testing.decorators import onlyif_cmds_exist +from IPython.testing.decorators import onlyif_any_cmd_exists from ...tests.base import TestsBase @@ -39,7 +39,7 @@ class ExportersTestsBase(TestsBase): def _get_notebook(self, nb_name='notebook2.ipynb'): return os.path.join(self._get_files_path(), nb_name) - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_raw_cell_inclusion(self): """test raw cell inclusion based on raw_mimetype metadata""" if self.should_include_raw is None: diff --git a/IPython/nbconvert/exporters/tests/test_html.py b/IPython/nbconvert/exporters/tests/test_html.py index f2c9f6c..ca4941a 100644 --- a/IPython/nbconvert/exporters/tests/test_html.py +++ b/IPython/nbconvert/exporters/tests/test_html.py @@ -14,7 +14,7 @@ from .base import ExportersTestsBase from ..html import HTMLExporter -from IPython.testing.decorators import onlyif_cmds_exist +from IPython.testing.decorators import onlyif_any_cmd_exists #----------------------------------------------------------------------------- # Class @@ -33,7 +33,7 @@ class TestHTMLExporter(ExportersTestsBase): HTMLExporter() - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_export(self): """ Can a HTMLExporter export something? @@ -42,7 +42,7 @@ class TestHTMLExporter(ExportersTestsBase): assert len(output) > 0 - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_export_basic(self): """ Can a HTMLExporter export using the 'basic' template? @@ -51,7 +51,7 @@ class TestHTMLExporter(ExportersTestsBase): assert len(output) > 0 - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_export_full(self): """ Can a HTMLExporter export using the 'full' template? diff --git a/IPython/nbconvert/exporters/tests/test_slides.py b/IPython/nbconvert/exporters/tests/test_slides.py index 86197b6..076b424 100644 --- a/IPython/nbconvert/exporters/tests/test_slides.py +++ b/IPython/nbconvert/exporters/tests/test_slides.py @@ -14,7 +14,7 @@ from .base import ExportersTestsBase from ..slides import SlidesExporter -from IPython.testing.decorators import onlyif_cmds_exist +from IPython.testing.decorators import onlyif_any_cmd_exists #----------------------------------------------------------------------------- # Class @@ -33,7 +33,7 @@ class TestSlidesExporter(ExportersTestsBase): SlidesExporter() - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_export(self): """ Can a SlidesExporter export something? @@ -42,7 +42,7 @@ class TestSlidesExporter(ExportersTestsBase): assert len(output) > 0 - @onlyif_cmds_exist('pandoc') + @onlyif_any_cmd_exists('nodejs', 'node', 'pandoc') def test_export_reveal(self): """ Can a SlidesExporter export using the 'reveal' template?