self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Electron: Fixed issue with conflict folder and fixed sync tests

Browse Source
This commit is contained in:
Laurent Cozic
2017-11-12 18:57:59 +00:00
parent f8bcb56964
commit be77f15ef7
10 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/tests/synchronizer.js
View File

@@ -1,3 +1,5 @@
require('app-module-path').addPath(__dirname);
const { time } = require('lib/time-utils.js');
const { setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId } = require('test-utils.js');
const { Folder } = require('lib/models/folder.js');

3
CliClient/tests/test-utils.js
View File

@@ -14,7 +14,7 @@ const { Synchronizer } = require('lib/synchronizer.js');
const { FileApi } = require('lib/file-api.js');
const { FileApiDriverMemory } = require('lib/file-api-driver-memory.js');
const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');
const { FsDriverNode } = require('../app/fs-driver-node.js');
const { FsDriverNode } = require('lib/fs-driver-node.js');
const { time } = require('lib/time-utils.js');
let databases_ = [];
@@ -107,6 +107,7 @@ function setupDatabase(id = null) {
}).then(() => {
databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
// databases_[id].setLogger(logger);
// console.info(filePath);
return databases_[id].open({ name: filePath }).then(() => {
BaseModel.db_ = databases_[id];
return setupDatabase(id);