diff options
| author | Waylan Limberg <waylan.limberg@icloud.com> | 2016-01-28 22:09:56 -0500 |
|---|---|---|
| committer | Waylan Limberg <waylan.limberg@icloud.com> | 2016-01-28 22:09:56 -0500 |
| commit | 81b724cfec03634c0bcd88b1bccb5936872d04e2 (patch) | |
| tree | 076443e2a5e490d3e61aa02866f33ec1e90b74ad | |
| parent | 5562b054b45d84cebe470c65377828eb657acee3 (diff) | |
| download | markdown-81b724cfec03634c0bcd88b1bccb5936872d04e2.tar.gz markdown-81b724cfec03634c0bcd88b1bccb5936872d04e2.tar.bz2 markdown-81b724cfec03634c0bcd88b1bccb5936872d04e2.zip | |
Enabled pygments based tests.
Added pygments to test-requirements and updated codehiliting tests to
only test partial output as output differs depending on Pygments version.
Fixes #453
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tests/test_extensions.py | 47 |
2 files changed, 14 insertions, 36 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 7c93558..b7bcf16 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,5 @@ nose coverage<4.0 pyyaml -pytidylib
\ No newline at end of file +pytidylib +pygments diff --git a/tests/test_extensions.py b/tests/test_extensions.py index 38f0be3..72ce212 100644 --- a/tests/test_extensions.py +++ b/tests/test_extensions.py @@ -134,12 +134,7 @@ class TestCodeHilite(unittest.TestCase): md = markdown.Markdown( extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=False)]) if self.has_pygments: - self.assertEqual( - md.convert(text), - '<div class="codehilite">' - '<pre><span class="c"># A Code Comment</span>\n' - '</pre></div>' - ) + self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span')) else: self.assertEqual( md.convert(text), @@ -187,12 +182,7 @@ class TestCodeHilite(unittest.TestCase): extensions=[markdown.extensions.codehilite.CodeHiliteExtension(linenums=None)] ) if self.has_pygments: - self.assertEqual( - md.convert(text), - '<div class="codehilite">' - '<pre><span class="c"># A Code Comment</span>\n' - '</pre></div>' - ) + self.assertTrue(md.convert(text).startswith('<div class="codehilite"><pre><span')) else: self.assertEqual( md.convert(text), @@ -202,19 +192,16 @@ class TestCodeHilite(unittest.TestCase): def testHighlightLinesWithColon(self): # Test with hl_lines delimited by single or double quotes. - text0 = '\t:::Python hl_lines="2"\n\t#line 1\n\t#line 2\n\t#line 3' - text1 = "\t:::Python hl_lines='2'\n\t#line 1\n\t#line 2\n\t#line 3" + text0 = '\t:::Python hl_lines="1"\n\t#line 1\n\t#line 2\n\t#line 3' + text1 = "\t:::Python hl_lines='1'\n\t#line 1\n\t#line 2\n\t#line 3" for text in (text0, text1): md = markdown.Markdown(extensions=['markdown.extensions.codehilite']) if self.has_pygments: - self.assertEqual( - md.convert(text), - '<div class="codehilite"><pre>' - '<span class="c">#line 1</span>\n' - '<span class="hll"><span class="c">#line 2</span>\n</span>' - '<span class="c">#line 3</span>\n' - '</pre></div>' + self.assertTrue( + md.convert(text).startswith( + '<div class="codehilite"><pre><span class="hll"' + ) ) else: self.assertEqual( @@ -333,13 +320,8 @@ line 3 ) if self.has_pygments: - self.assertEqual( - md.convert(text), - '<div class="codehilite"><pre>' - '<span class="hll">line 1\n</span>' - 'line 2\n' - '<span class="hll">line 3\n</span>' - '</pre></div>' + self.assertTrue( + md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"') ) else: self.assertEqual( @@ -372,13 +354,8 @@ line 3 ] ) if self.has_pygments: - self.assertEqual( - md.convert(text), - '<div class="codehilite"><pre>' - '<span class="hll"><span class="c">#line 1</span>\n</span>' - '<span class="c">#line 2</span>\n' - '<span class="hll"><span class="c">#line 3</span>\n</span>' - '</pre></div>' + self.assertTrue( + md.convert(text).startswith('<div class="codehilite"><pre><span class="hll"') ) else: self.assertEqual( |