Merge upstream into master

2026-01-06 21:49:19 +00:00 · 2019-08-01 19:55:21 +08:00
parent 090b5c32f0 606be4304d
commit 918a8627e9
75 changed files with 489 additions and 217 deletions
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -287,7 +287,11 @@ it('should replace the all ":storage" path with the actual storage path', functi
    '        </p>\n' +
    '        <pre class="fence" data-line="8">\n' +
    '            <span class="filename"></span>\n' +
-    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">:storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + 'f939b2c3.jpg</div>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">:storage' + mdurl.encode(path.win32.sep) + noteKey + mdurl.encode(path.win32.sep) + 'f939b2c3.jpg</div>\n' +
+    '        </pre>\n' +
+    '        <pre class="fence" data-line="10">\n' +
+    '            <span class="filename"></span>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">:storage' + mdurl.encode(path.posix.sep) + noteKey + mdurl.encode(path.posix.sep) + 'f939b2c3.jpg</div>\n' +
    '        </pre>\n' +
    '    </body>\n' +
    '</html>'
@@ -300,17 +304,21 @@ it('should replace the all ":storage" path with the actual storage path', functi
    '    <body data-theme="default">\n' +
    '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
    '        <p data-line="2">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src="file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
    '        </p>\n' +
    '        <p data-line="4">\n' +
-    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href="file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
    '        </p>\n' +
    '        <p data-line="6">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
+    '            <img src="file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
    '        </p>\n' +
    '        <pre class="fence" data-line="8">\n' +
    '            <span class="filename"></span>\n' +
-    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + 'f939b2c3.jpg</div>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + 'f939b2c3.jpg</div>\n' +
+    '        </pre>\n' +
+    '        <pre class="fence" data-line="10">\n' +
+    '            <span class="filename"></span>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + 'f939b2c3.jpg</div>\n' +
    '        </pre>\n' +
    '    </body>\n' +
    '</html>'
@@ -345,10 +353,10 @@ it('should replace the ":storage" path with the actual storage path when they ha
    '    <body data-theme="default">\n' +
    '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
    '        <p data-line="2">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src="file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
    '        </p>\n' +
    '        <p data-line="4">\n' +
-    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href="file:///' + storagePath + '/' + storageFolder + '/' + noteKey + '/' + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
    '        </p>\n' +
    '    </body>\n' +
    '</html>'
--- a/tests/dataApi/copyFile-test.js
+++ b/tests/dataApi/copyFile-test.js
@@ -3,6 +3,9 @@ const copyFile = require('browser/main/lib/dataApi/copyFile')

 const path = require('path')
 const fs = require('fs')
+const os = require('os')
+const execSync = require('child_process').execSync
+const removeDirCommand = os.platform() === 'win32' ? 'rmdir /s /q ' : 'rm -rf '

 const testFile = 'test.txt'
 const srcFolder = path.join(__dirname, '🤔')
@@ -29,7 +32,7 @@ test('`copyFile` should handle encoded URI on src path', (t) => {
 test.after((t) => {
  fs.unlinkSync(srcPath)
  fs.unlinkSync(dstPath)
-  fs.rmdirSync(srcFolder)
-  fs.rmdirSync(dstFolder)
+  execSync(removeDirCommand + '"' + srcFolder + '"')
+  execSync(removeDirCommand + '"' + dstFolder + '"')
 })

--- a/tests/fixtures/markdowns.js
+++ b/tests/fixtures/markdowns.js
@@ -104,6 +104,11 @@ Term 2 with *inline markup*
 `
 const shortcuts = '<kbd>Ctrl</kbd>\n\n[[Ctrl]]'

+const footnote = `
+^[hello-world]
+hello-world: https://github.com/BoostIO/Boostnote/
+`
+
 export default {
  basic,
  codeblock,
@@ -115,5 +120,6 @@ export default {
  subTexts,
  supTexts,
  deflists,
-  shortcuts
+  shortcuts,
+  footnote
 }
--- a/tests/lib/contextMenuBuilder.test.js
+++ b/tests/lib/contextMenuBuilder.test.js
@@ -4,8 +4,13 @@ jest.mock('electron', () => {
 })

 const spellcheck = require('browser/lib/spellcheck')
+<<<<<<< HEAD
 const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
 const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder')
+=======
+const buildEditorContextMenu = require('browser/lib/contextMenuBuilder').buildEditorContextMenu
+const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder').buildMarkdownPreviewContextMenu
+>>>>>>> upstream/master

 beforeEach(() => {
  menuBuilderParameter = null
--- a/tests/lib/markdown-test.js
+++ b/tests/lib/markdown-test.js
@@ -68,3 +68,8 @@ test('Markdown.render() should render shortcuts correctly', t => {
  const rendered = md.render(markdownFixtures.shortcuts)
  t.snapshot(rendered)
 })
+
+test('Markdown.render() should render footnote correctly', t => {
+  const rendered = md.render(markdownFixtures.footnote)
+  t.snapshot(rendered)
+})
--- a/tests/lib/slugify-test.js
+++ b/tests/lib/slugify-test.js
@@ -0,0 +1,58 @@
+import test from 'ava'
+import slugify from 'browser/lib/slugify'
+
+test('alphabet and digit', t => {
+  const upperAlphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  const lowerAlphabet = 'abcdefghijklmnopqrstuvwxyz'
+  const digit = '0123456789'
+  const testCase = upperAlphabet + lowerAlphabet + digit
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === testCase)
+})
+
+test('should delete unavailable symbols', t => {
+  const availableSymbols = '_-'
+  const testCase = availableSymbols + '][!\'#$%&()*+,./:;<=>?@\\^{|}~`'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === availableSymbols)
+})
+
+test('should convert from white spaces between words to hyphens', t => {
+  const testCase = 'This is one'
+  const expectedString = 'This-is-one'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === expectedString)
+})
+
+test('should remove leading white spaces', t => {
+  const testCase = '                   This is one'
+  const expectedString = 'This-is-one'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === expectedString)
+})
+
+test('should remove trailing white spaces', t => {
+  const testCase = 'This is one                   '
+  const expectedString = 'This-is-one'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === expectedString)
+})
+
+test('2-byte charactor support', t => {
+  const testCase = '菠萝芒果テストÀžƁƵ'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === testCase)
+})
+
+test('emoji', t => {
+  const testCase = '🌸'
+  const decodeSlug = decodeURI(slugify(testCase))
+
+  t.true(decodeSlug === testCase)
+})
--- a/tests/lib/snapshots/markdown-test.js.md
+++ b/tests/lib/snapshots/markdown-test.js.md
@@ -4,6 +4,21 @@ The actual snapshot is saved in `markdown-test.js.snap`.

 Generated by [AVA](https://ava.li).

+## Markdown.render() should render footnote correctly
+
+> Snapshot 1
+
+    `<p data-line="1"><sup class="footnote-ref"><a href="#fn1" id="fnref1">[1]</a></sup><br />␊
+    hello-world: <a href="https://github.com/BoostIO/Boostnote/">https://github.com/BoostIO/Boostnote/</a></p>␊
+    <hr class="footnotes-sep" />␊
+    <section class="footnotes">␊
+    <ol class="footnotes-list">␊
+    <li id="fn1" class="footnote-item"><p>hello-world <a href="#fnref1" class="footnote-backref">↩︎</a></p>␊
+    </li>␊
+    </ol>␊
+    </section>␊
+    `
+
 ## Markdown.render() should render line breaks correctly

 > Snapshot 1
--- a/tests/lib/snapshots/markdown-test.js.snap
+++ b/tests/lib/snapshots/markdown-test.js.snap