diff --git a/package.json b/package.json
index 7ee171d5..e3548431 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
"@rokt33r/season": "^5.3.0",
"aws-sdk": "^2.48.0",
"aws-sdk-mobile-analytics": "^0.9.2",
- "codemirror": "^5.19.0",
+ "codemirror": "^5.37.0",
"codemirror-mode-elixir": "^1.1.1",
"electron-config": "^0.2.1",
"electron-gh-releases": "^2.0.2",
diff --git a/tests/dataApi/attachmentManagement.test.js b/tests/dataApi/attachmentManagement.test.js
index 9511f6d7..feb9207c 100644
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -8,6 +8,7 @@ jest.mock('unique-slug')
const uniqueSlug = require('unique-slug')
const mdurl = require('mdurl')
const fse = require('fs-extra')
+const sander = require('sander')
const systemUnderTest = require('browser/main/lib/dataApi/attachmentManagement')
@@ -262,6 +263,19 @@ it('should remove the all ":storage" and noteKey references', function () {
expect(actual).toEqual(expectedOutput)
})
+it('should delete the correct attachment folder if a note is deleted', function () {
+ const dummyStorage = {path: 'dummyStoragePath'}
+ const storageKey = 'storageKey'
+ const noteKey = 'noteKey'
+ findStorage.findStorage = jest.fn(() => dummyStorage)
+ sander.rimrafSync = jest.fn()
+
+ const expectedPathToBeDeleted = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, noteKey)
+ systemUnderTest.deleteAttachmentFolder(storageKey, noteKey)
+ expect(findStorage.findStorage).toHaveBeenCalledWith(storageKey)
+ expect(sander.rimrafSync).toHaveBeenCalledWith(expectedPathToBeDeleted)
+})
+
it('should test that deleteAttachmentsNotPresentInNote deletes all unreferenced attachments ', function () {
const dummyStorage = {path: 'dummyStoragePath'}
const noteKey = 'noteKey'
diff --git a/tests/dataApi/deleteNote-test.js b/tests/dataApi/deleteNote-test.js
index 611022de..9c809dcf 100644
--- a/tests/dataApi/deleteNote-test.js
+++ b/tests/dataApi/deleteNote-test.js
@@ -14,6 +14,8 @@ const sander = require('sander')
const os = require('os')
const CSON = require('@rokt33r/season')
const faker = require('faker')
+const fs = require('fs')
+const attachmentManagement = require('browser/main/lib/dataApi/attachmentManagement')
const storagePath = path.join(os.tmpdir(), 'test/delete-note')
@@ -42,6 +44,11 @@ test.serial('Delete a note', (t) => {
return Promise.resolve()
.then(function doTest () {
return createNote(storageKey, input1)
+ .then(function createAttachmentFolder (data) {
+ fs.mkdirSync(path.join(storagePath, attachmentManagement.DESTINATION_FOLDER))
+ fs.mkdirSync(path.join(storagePath, attachmentManagement.DESTINATION_FOLDER, data.key))
+ return data
+ })
.then(function (data) {
return deleteNote(storageKey, data.key)
})
@@ -52,8 +59,13 @@ test.serial('Delete a note', (t) => {
t.fail('note cson must be deleted.')
} catch (err) {
t.is(err.code, 'ENOENT')
+ return data
}
})
+ .then(function assertAttachmentFolderDeleted (data) {
+ const attachmentFolderPath = path.join(storagePath, attachmentManagement.DESTINATION_FOLDER, data.noteKey)
+ t.is(fs.existsSync(attachmentFolderPath), false)
+ })
})
test.after(function after () {
diff --git a/tests/fixtures/markdowns.js b/tests/fixtures/markdowns.js
index 8db35485..69e335e0 100644
--- a/tests/fixtures/markdowns.js
+++ b/tests/fixtures/markdowns.js
@@ -48,10 +48,13 @@ const checkboxes = `
const smartQuotes = 'This is a "QUOTE".'
+const breaks = 'This is the first line.\nThis is the second line.'
+
export default {
basic,
codeblock,
katex,
checkboxes,
- smartQuotes
+ smartQuotes,
+ breaks
}
diff --git a/tests/lib/markdown-test.js b/tests/lib/markdown-test.js
index b2a81fdf..73b68799 100644
--- a/tests/lib/markdown-test.js
+++ b/tests/lib/markdown-test.js
@@ -34,3 +34,12 @@ test('Markdown.render() should text with quotes correctly', t => {
const renderedNonSmartQuotes = newmd.render(markdownFixtures.smartQuotes)
t.snapshot(renderedNonSmartQuotes)
})
+
+test('Markdown.render() should render line breaks correctly', t => {
+ const renderedBreaks = md.render(markdownFixtures.breaks)
+ t.snapshot(renderedBreaks)
+
+ const newmd = new Markdown({ breaks: false })
+ const renderedNonBreaks = newmd.render(markdownFixtures.breaks)
+ t.snapshot(renderedNonBreaks)
+})
diff --git a/tests/lib/snapshots/markdown-test.js.md b/tests/lib/snapshots/markdown-test.js.md
index d4f0469e..ffc3d699 100644
--- a/tests/lib/snapshots/markdown-test.js.md
+++ b/tests/lib/snapshots/markdown-test.js.md
@@ -4,6 +4,20 @@ The actual snapshot is saved in `markdown-test.js.snap`.
Generated by [AVA](https://ava.li).
+## Markdown.render() should render line breaks correctly
+
+> Snapshot 1
+
+ `
This is the first line.
␊
+ This is the second line.
␊
+ `
+
+> Snapshot 2
+
+ `
This is the first line.␊
+ This is the second line.
␊
+ `
+
## Markdown.render() should renders KaTeX correctly
> Snapshot 1
diff --git a/tests/lib/snapshots/markdown-test.js.snap b/tests/lib/snapshots/markdown-test.js.snap
index 71ff221d..fc310cfd 100644
Binary files a/tests/lib/snapshots/markdown-test.js.snap and b/tests/lib/snapshots/markdown-test.js.snap differ