Merge branch 'master' into fence-attrs

tests/components/__snapshots__/TagListItem.snapshot.test.js.snap

@@ -3,6 +3,7 @@
 exports[`TagListItem renders correctly 1`] = `
 <div
   className="tagList-itemContainer"
+  onContextMenu={[Function]}
 >
   <div
     className="tagList-itemNarrow"

tests/fixtures/markdowns.js

@@ -50,11 +50,14 @@ const smartQuotes = 'This is a "QUOTE".'
 
 const breaks = 'This is the first line.\nThis is the second line.'
 
+const shortcuts = '<kbd>Ctrl</kbd>\n\n[[Ctrl]]'
+
 export default {
   basic,
   codeblock,
   katex,
   checkboxes,
   smartQuotes,
-  breaks
+  breaks,
+  shortcuts
 }

tests/lib/find-title-test.js

@@ -20,7 +20,47 @@ test('findNoteTitle#find  should return a correct title (string)', t => {
 
   testCases.forEach(testCase => {
     const [input, expected] = testCase
-    t.is(findNoteTitle(input), expected, `Test for find() input: ${input} expected: ${expected}`)
+    t.is(findNoteTitle(input, false), expected, `Test for find() input: ${input} expected: ${expected}`)
   })
 })
 
+test('findNoteTitle#find  should ignore front matter when enableFrontMatterTitle=false', t => {
+  // [input, expected]
+  const testCases = [
+    ['---\nlayout: test\ntitle:  hoge hoge hoge  \n---\n# fuga', '# fuga'],
+    ['---\ntitle:hoge\n---\n# fuga', '# fuga'],
+    ['title: fuga\n# hoge', '# hoge']
+  ]
+
+  testCases.forEach(testCase => {
+    const [input, expected] = testCase
+    t.is(findNoteTitle(input, false), expected, `Test for find() input: ${input} expected: ${expected}`)
+  })
+})
+
+test('findNoteTitle#find  should respect front matter when enableFrontMatterTitle=true', t => {
+  // [input, expected]
+  const testCases = [
+    ['---\nlayout: test\ntitle:  hoge hoge hoge  \n---\n# fuga', 'hoge hoge hoge'],
+    ['---\ntitle:hoge\n---\n# fuga', 'hoge'],
+    ['title: fuga\n# hoge', '# hoge']
+  ]
+
+  testCases.forEach(testCase => {
+    const [input, expected] = testCase
+    t.is(findNoteTitle(input, true), expected, `Test for find() input: ${input} expected: ${expected}`)
+  })
+})
+
+test('findNoteTitle#find  should respect frontMatterTitleField when provided', t => {
+  // [input, expected]
+  const testCases = [
+    ['---\ntitle: hoge\n---\n# fuga', '# fuga'],
+    ['---\ncustom: hoge\n---\n# fuga', 'hoge']
+  ]
+
+  testCases.forEach(testCase => {
+    const [input, expected] = testCase
+    t.is(findNoteTitle(input, true, 'custom'), expected, `Test for find() input: ${input} expected: ${expected}`)
+  })
+})

tests/lib/markdown-test.js

@@ -43,3 +43,8 @@ test('Markdown.render() should render line breaks correctly', t => {
   const renderedNonBreaks = newmd.render(markdownFixtures.breaks)
   t.snapshot(renderedNonBreaks)
 })
+
+test('Markdown.render() should render shortcuts correctly', t => {
+  const rendered = md.render(markdownFixtures.shortcuts)
+  t.snapshot(rendered)
+})

tests/lib/snapshots/markdown-test.js.md

@@ -18,6 +18,14 @@ Generated by [AVA](https://ava.li).
     This is the second line.</p>␊
     `
 
+## Markdown.render() should render shortcuts correctly
+
+> Snapshot 1
+
+    `<p data-line="0"><kbd>Ctrl</kbd></p>␊
+    <p data-line="2"><kbd>Ctrl</kbd></p>␊
+    `
+
 ## Markdown.render() should renders KaTeX correctly
 
 > Snapshot 1