1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-15 18:56:22 +00:00

Merge branch 'master' into html-to-md

# Conflicts:
#	browser/main/modals/NewNoteModal.js
#	package-lock.json
#	package.json
#	yarn.lock
This commit is contained in:
AWolf81
2019-06-29 23:25:52 +02:00
249 changed files with 234965 additions and 4645 deletions

View File

@@ -12,7 +12,7 @@ const TestDummy = require('../fixtures/TestDummy')
const sander = require('sander')
const os = require('os')
const CSON = require('@rokt33r/season')
const faker = require('faker')
// const faker = require('faker')
const storagePath = path.join(os.tmpdir(), 'test/create-note-from-url')
@@ -42,10 +42,10 @@ test.serial('Create a note from URL', (t) => {
const jsonData2 = CSON.readFileSync(path.join(storagePath, 'notes', data1.key + '.cson'))
// <<<<<< fix me - input2 & data not defined
t.is(input2.content, data2.content)
/* t.is(input2.content, data2.content)
t.is(input2.content, jsonData2.content)
t.is(input2.tags.length, data2.tags.length)
t.is(input2.tags.length, jsonData2.tags.length)
t.is(input2.tags.length, jsonData2.tags.length) */
})
})