From 634fec39c0084b6948e1a80ebb9a40b2b0a8cede Mon Sep 17 00:00:00 2001 From: ZeroX-DG Date: Fri, 8 May 2020 20:13:39 +1200 Subject: [PATCH] migrate more tests to jest --- ...mUrl-test.js => createNoteFromUrl.test.js} | 23 +++++++-------- ...eSnippet-test.js => createSnippet.test.js} | 21 ++++++-------- ...eteFolder-test.js => deleteFolder.test.js} | 28 +++++++++---------- 3 files changed, 35 insertions(+), 37 deletions(-) rename tests/dataApi/{createNoteFromUrl-test.js => createNoteFromUrl.test.js} (67%) rename tests/dataApi/{createSnippet-test.js => createSnippet.test.js} (59%) rename tests/dataApi/{deleteFolder-test.js => deleteFolder.test.js} (76%) diff --git a/tests/dataApi/createNoteFromUrl-test.js b/tests/dataApi/createNoteFromUrl.test.js similarity index 67% rename from tests/dataApi/createNoteFromUrl-test.js rename to tests/dataApi/createNoteFromUrl.test.js index 83b8d4e8..4e067380 100644 --- a/tests/dataApi/createNoteFromUrl-test.js +++ b/tests/dataApi/createNoteFromUrl.test.js @@ -1,4 +1,3 @@ -const test = require('ava') const createNoteFromUrl = require('browser/main/lib/dataApi/createNoteFromUrl') global.document = require('jsdom').jsdom('') @@ -18,32 +17,34 @@ const CSON = require('@rokt33r/season') const storagePath = path.join(os.tmpdir(), 'test/create-note-from-url') -test.beforeEach(t => { - t.context.storage = TestDummy.dummyStorage(storagePath) - localStorage.setItem('storages', JSON.stringify([t.context.storage.cache])) +let storageContext + +beforeEach(() => { + storageContext = TestDummy.dummyStorage(storagePath) + localStorage.setItem('storages', JSON.stringify([storageContext.cache])) }) -test.serial('Create a note from URL', t => { - const storageKey = t.context.storage.cache.key - const folderKey = t.context.storage.json.folders[0].key +it('Create a note from URL', () => { + const storageKey = storageContext.cache.key + const folderKey = storageContext.json.folders[0].key const url = 'https://shapeshed.com/writing-cross-platform-node/' return createNoteFromUrl(url, storageKey, folderKey).then(function assert({ note }) { - t.is(storageKey, note.storage) + expect(storageKey).toEqual(note.storage) const jsonData = CSON.readFileSync( path.join(storagePath, 'notes', note.key + '.cson') ) // Test if saved content is matching the created in memory note - t.is(note.content, jsonData.content) - t.is(note.tags.length, jsonData.tags.length) + expect(note.content).toEqual(jsonData.content) + expect(note.tags.length).toEqual(jsonData.tags.length) }) }) -test.after(function after() { +afterAll(function after() { localStorage.clear() sander.rimrafSync(storagePath) }) diff --git a/tests/dataApi/createSnippet-test.js b/tests/dataApi/createSnippet.test.js similarity index 59% rename from tests/dataApi/createSnippet-test.js rename to tests/dataApi/createSnippet.test.js index e1b9a570..d667a069 100644 --- a/tests/dataApi/createSnippet-test.js +++ b/tests/dataApi/createSnippet.test.js @@ -1,4 +1,3 @@ -const test = require('ava') const createSnippet = require('browser/main/lib/dataApi/createSnippet') const sander = require('sander') const os = require('os') @@ -7,29 +6,27 @@ const path = require('path') const snippetFilePath = path.join(os.tmpdir(), 'test', 'create-snippet') const snippetFile = path.join(snippetFilePath, 'snippets.json') -test.beforeEach(t => { +beforeEach(() => { sander.writeFileSync(snippetFile, '[]') }) -test.serial('Create a snippet', t => { +it('Create a snippet', () => { return Promise.resolve() - .then(function doTest() { - return Promise.all([createSnippet(snippetFile)]) - }) + .then(() => Promise.all([createSnippet(snippetFile)])) .then(function assert(data) { data = data[0] const snippets = JSON.parse(sander.readFileSync(snippetFile)) const snippet = snippets.find( currentSnippet => currentSnippet.id === data.id ) - t.not(snippet, undefined) - t.is(snippet.name, data.name) - t.deepEqual(snippet.prefix, data.prefix) - t.is(snippet.content, data.content) - t.deepEqual(snippet.linesHighlighted, data.linesHighlighted) + expect(snippet).not.toBeUndefined() + expect(snippet.name).toEqual(data.name) + expect(snippet.prefix).toEqual(data.prefix) + expect(snippet.content).toEqual(data.content) + expect(snippet.linesHighlighted).toEqual(data.linesHighlighted) }) }) -test.after.always(() => { +afterAll(() => { sander.rimrafSync(snippetFilePath) }) diff --git a/tests/dataApi/deleteFolder-test.js b/tests/dataApi/deleteFolder.test.js similarity index 76% rename from tests/dataApi/deleteFolder-test.js rename to tests/dataApi/deleteFolder.test.js index 8b930e48..96865164 100644 --- a/tests/dataApi/deleteFolder-test.js +++ b/tests/dataApi/deleteFolder.test.js @@ -1,4 +1,3 @@ -const test = require('ava') const deleteFolder = require('browser/main/lib/dataApi/deleteFolder') const attachmentManagement = require('browser/main/lib/dataApi/attachmentManagement') const createNote = require('browser/main/lib/dataApi/createNote') @@ -23,14 +22,16 @@ const CSON = require('@rokt33r/season') const storagePath = path.join(os.tmpdir(), 'test/delete-folder') -test.beforeEach(t => { - t.context.storage = TestDummy.dummyStorage(storagePath) - localStorage.setItem('storages', JSON.stringify([t.context.storage.cache])) +let storageContext + +beforeEach(() => { + storageContext = TestDummy.dummyStorage(storagePath) + localStorage.setItem('storages', JSON.stringify([storageContext.cache])) }) -test.serial('Delete a folder', t => { - const storageKey = t.context.storage.cache.key - const folderKey = t.context.storage.json.folders[0].key +it('Delete a folder', () => { + const storageKey = storageContext.cache.key + const folderKey = storageContext.json.folders[0].key let noteKey const input1 = { @@ -72,16 +73,15 @@ test.serial('Delete a folder', t => { return deleteFolder(storageKey, folderKey) }) .then(function assert(data) { - t.true(_.find(data.storage.folders, { key: folderKey }) == null) + expect(_.find(data.storage.folders, { key: folderKey })).toBeUndefined() const jsonData = CSON.readFileSync( path.join(data.storage.path, 'boostnote.json') ) - t.true(_.find(jsonData.folders, { key: folderKey }) == null) + expect(_.find(jsonData.folders, { key: folderKey })).toBeUndefined() const notePaths = sander.readdirSync(data.storage.path, 'notes') - t.is( - notePaths.length, - t.context.storage.notes.filter(note => note.folder !== folderKey).length + expect(notePaths.length).toBe( + storageContext.notes.filter(note => note.folder !== folderKey).length ) const attachmentFolderPath = path.join( @@ -89,11 +89,11 @@ test.serial('Delete a folder', t => { attachmentManagement.DESTINATION_FOLDER, noteKey ) - t.false(fs.existsSync(attachmentFolderPath)) + expect(fs.existsSync(attachmentFolderPath)).toBe(false) }) }) -test.after.always(function after() { +afterAll(() => { localStorage.clear() sander.rimrafSync(storagePath) })