Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade marked #3686

Merged
merged 3 commits into from
Jun 16, 2018
Merged

Upgrade marked #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c368ee
Upgrade marked
gnestor Jun 14, 2018
6670d57
Update tests
gnestor Jun 15, 2018
2ca3684
Update selenium tests
gnestor Jun 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions notebook/tests/notebook/markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
4 changes: 2 additions & 2 deletions notebook/tests/selenium/test_markdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down