Merge pull request #3686 from gnestor/upgrade-marked

Upgrade marked

Author: takluyver

bower.json

@@ -13,7 +13,7 @@
     "jquery": "components/jquery#~3.3",
     "jquery-typeahead": "~2.0.0",
     "jquery-ui": "components/jqueryui#~1.10",
-    "marked": "~0.3",
+    "marked": "~0.4",
     "MathJax": "components/MathJax#~2.6",
     "moment": "~2.19.3",
     "preact": "https://unpkg.com/preact@^7.2.0/dist/preact.min.js",

notebook/tests/notebook/markdown.js

@@ -96,11 +96,11 @@ casper.notebook_test(function () {
     };
 
     var codeblock = '```\nx = 1\n```'
-    var result = '<pre><code>x = 1\n</code></pre>'
+    var result = '<pre><code>x = 1</code></pre>'
     md_render_test(codeblock, result, 'Markdown code block no language');
 
     codeblock = '```aaaa\nx = 1\n```'
-    result = '<pre><code class="cm-s-ipython language-aaaa">x = 1\n</code></pre>'
+    result = '<pre><code class="cm-s-ipython language-aaaa">x = 1</code></pre>'
     md_render_test(codeblock, result, 'Markdown code block unknown language');
 
     function mathjax_render_test(input_string, result, message){

notebook/tests/selenium/test_markdown.py

@@ -20,8 +20,8 @@ def test_markdown_cell(notebook):
     expected_contents = ['<h1 id="Foo">Foo<a class="anchor-link" href="#Foo">¶</a></h1>',
                          '<p><strong>Bar</strong></p>',
                          '<p><em>Baz</em></p>', 
-                         '<pre><code>x = 1\n</code></pre>',
-                         '<pre><code class="cm-s-ipython language-aaaa">x = 1\n</code></pre>'
+                         '<pre><code>x = 1</code></pre>',
+                         '<pre><code class="cm-s-ipython language-aaaa">x = 1</code></pre>'
                          ]
     nb.append(*cell_text, cell_type="markdown")
     nb.run_all()