Merge pull request #83 from instant-markdown/fix/highlight-js

Tests for highlight.js

Author: ashwinvis

.github/workflows/nodejs.yml

@@ -16,10 +16,9 @@ jobs:
         os:
           - ubuntu-latest
         node_version:
-          - 8
-          - 10
           - 12
           - 14
+          - 16
         include:
           - os: windows-latest
             node_version: 14

package.json

@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/instant-markdown/instant-markdown-d",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=12.0.0"
   },
   "main": "./src/cli.js",
   "preferGlobal": "true",

src/cli.js

@@ -73,7 +73,7 @@ let md = new MarkdownIt({
   highlight: function(str, lang) {
     if (lang && hljs.getLanguage(lang)) {
       try {
-        return hljs.highlight(lang, str).value;
+        return hljs.highlight(str, {language: lang}).value;
       } catch (err) {
         // Do nothing
       }

tests/conftest.py

@@ -124,10 +124,10 @@ def send(self, via, markdown_file):
                 "Has instant-markdown-d failed to start?"
             )
 
-        method = getattr(self, f"send_{via}")
+        method = getattr(self, f"_send_{via}")
         method(markdown_file)
 
-    def send_stdin(self, markdown_file):
+    def _send_stdin(self, markdown_file):
         logger.info(f"send via stdin {markdown_file}")
         with open(markdown_file, "rb") as file:
             text = file.read()
@@ -138,7 +138,7 @@ def send_stdin(self, markdown_file):
             except subprocess.TimeoutExpired:
                 pass
 
-    def send_curl(self, markdown_file):
+    def _send_curl(self, markdown_file):
         logger.info(f"send via curl using REST API {markdown_file}")
 
         # Equivalent to

tests/test_code.md

@@ -0,0 +1,31 @@
+<span class="test-case"></span>
+
+# Code with Highlight.js
+
+Courtesy: [Rosetta Code](https://rosettacode.org/wiki/Factorial)
+
+## JavaScript / ES6
+
+```js
+var factorial = n => (n < 2) ? 1 : n * factorial(n - 1);
+```
+
+## Python
+
+```python
+def factorial(n):
+    return n * factorial(n - 1) if n else 1
+```
+
+
+## Vim script
+
+```vim
+function! Factorial(n)
+  if a:n < 2
+    return 1
+  else
+    return a:n * Factorial(a:n-1)
+  endif
+endfunction
+```

tests/test_code.py

@@ -0,0 +1,16 @@
+import pytest
+
+
+def test_code(browser, Server):
+
+    with Server("--debug", 8090) as srv:
+        srv.send("curl", "tests/test_code.md")
+
+        result = browser.get(srv.port)
+
+    assert '<span class="test-case"></span>' in result, "No text was rendered"
+
+    elems = browser.find_elements_by_xpath("//pre/code/span")
+    assert all(
+        e.get_attribute("class").startswith("hljs-") for e in elems
+    ), "Highlight.js processing not completed"