self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Trying to fix Travis-ci test units

Browse Source
This commit is contained in:
Laurent Cozic
2020-05-31 21:07:24 +01:00
parent fbd42726c0
commit d0de79bffa
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CliClient/tests/synchronizer.js
View File

@ -3,7 +3,7 @@
require('app-module-path').addPath(__dirname); require('app-module-path').addPath(__dirname);
const { time } = require('lib/time-utils.js'); const { time } = require('lib/time-utils.js');
const { setupDatabase, allSyncTargetItemsEncrypted, resourceFetcher, kvStore, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js'); const { setupDatabase, allSyncTargetItemsEncrypted, tempFilePath, resourceFetcher, kvStore, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('test-utils.js');
const { shim } = require('lib/shim.js'); const { shim } = require('lib/shim.js');
const fs = require('fs-extra'); const fs = require('fs-extra');
const Folder = require('lib/models/Folder.js'); const Folder = require('lib/models/Folder.js');
@ -992,7 +992,7 @@ describe('synchronizer', function() {
})); }));
it('should sync resource blob changes', asyncTest(async () => { it('should sync resource blob changes', asyncTest(async () => {
const tempFile = `${__dirname}/tmp/test.txt`; const tempFile = tempFilePath('txt');
await shim.fsDriver().writeFile(tempFile, '1234', 'utf8'); await shim.fsDriver().writeFile(tempFile, '1234', 'utf8');
const folder1 = await Folder.save({ title: 'folder1' }); const folder1 = await Folder.save({ title: 'folder1' });
const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id }); const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
@ -1005,7 +1005,7 @@ describe('synchronizer', function() {
await resourceFetcher().start(); await resourceFetcher().start();
await resourceFetcher().waitForAllFinished(); await resourceFetcher().waitForAllFinished();
let resource1_2 = (await Resource.all())[0]; let resource1_2 = (await Resource.all())[0];
const modFile = `${__dirname}/tmp/test_mod.txt`; const modFile = tempFilePath('txt');
await shim.fsDriver().writeFile(modFile, '1234 MOD', 'utf8'); await shim.fsDriver().writeFile(modFile, '1234 MOD', 'utf8');
await Resource.updateResourceBlobContent(resource1_2.id, modFile); await Resource.updateResourceBlobContent(resource1_2.id, modFile);
const originalSize = resource1_2.size; const originalSize = resource1_2.size;
@ -1027,7 +1027,7 @@ describe('synchronizer', function() {
it('should handle resource conflicts', asyncTest(async () => { it('should handle resource conflicts', asyncTest(async () => {
{ {
const tempFile = `${__dirname}/tmp/test.txt`; const tempFile = tempFilePath('txt');
await shim.fsDriver().writeFile(tempFile, '1234', 'utf8'); await shim.fsDriver().writeFile(tempFile, '1234', 'utf8');
const folder1 = await Folder.save({ title: 'folder1' }); const folder1 = await Folder.save({ title: 'folder1' });
const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id }); const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });
@ -1042,7 +1042,7 @@ describe('synchronizer', function() {
await resourceFetcher().start(); await resourceFetcher().start();
await resourceFetcher().waitForAllFinished(); await resourceFetcher().waitForAllFinished();
const resource = (await Resource.all())[0]; const resource = (await Resource.all())[0];
const modFile2 = `${__dirname}/tmp/test_mod_2.txt`; const modFile2 = tempFilePath('txt');
await shim.fsDriver().writeFile(modFile2, '1234 MOD 2', 'utf8'); await shim.fsDriver().writeFile(modFile2, '1234 MOD 2', 'utf8');
await Resource.updateResourceBlobContent(resource.id, modFile2); await Resource.updateResourceBlobContent(resource.id, modFile2);
await synchronizer().start(); await synchronizer().start();
@ -1053,7 +1053,7 @@ describe('synchronizer', function() {
{ {
// Going to modify a resource without syncing first, which will cause a conflict // Going to modify a resource without syncing first, which will cause a conflict
const resource = (await Resource.all())[0]; const resource = (await Resource.all())[0];
const modFile1 = `${__dirname}/tmp/test_mod_1.txt`; const modFile1 = tempFilePath('txt');
await shim.fsDriver().writeFile(modFile1, '1234 MOD 1', 'utf8'); await shim.fsDriver().writeFile(modFile1, '1234 MOD 1', 'utf8');
await Resource.updateResourceBlobContent(resource.id, modFile1); await Resource.updateResourceBlobContent(resource.id, modFile1);
await synchronizer().start(); // CONFLICT await synchronizer().start(); // CONFLICT
@ -1087,7 +1087,7 @@ describe('synchronizer', function() {
it('should handle resource conflicts if a resource is changed locally but deleted remotely', asyncTest(async () => { it('should handle resource conflicts if a resource is changed locally but deleted remotely', asyncTest(async () => {
{ {
const tempFile = `${__dirname}/tmp/test.txt`; const tempFile = tempFilePath('txt');
await shim.fsDriver().writeFile(tempFile, '1234', 'utf8'); await shim.fsDriver().writeFile(tempFile, '1234', 'utf8');
const folder1 = await Folder.save({ title: 'folder1' }); const folder1 = await Folder.save({ title: 'folder1' });
const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id }); const note1 = await Note.save({ title: 'ma note', parent_id: folder1.id });

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

@ -41,6 +41,7 @@ const ResourceFetcher = require('lib/services/ResourceFetcher.js');
const KvStore = require('lib/services/KvStore.js'); const KvStore = require('lib/services/KvStore.js');
const WebDavApi = require('lib/WebDavApi'); const WebDavApi = require('lib/WebDavApi');
const DropboxApi = require('lib/DropboxApi'); const DropboxApi = require('lib/DropboxApi');
const md5 = require('md5');
const databases_ = []; const databases_ = [];
const synchronizers_ = []; const synchronizers_ = [];
@ -486,6 +487,10 @@ async function createNTestTags(n) {
return tags; return tags;
} }
function tempFilePath(ext) {
return `${Setting.value('tempDir')}/${md5(Date.now() + Math.random())}.${ext}`;
}
// Application for feature integration testing // Application for feature integration testing
class TestApp extends BaseApplication { class TestApp extends BaseApplication {
constructor(hasGui = true) { constructor(hasGui = true) {
@ -554,4 +559,4 @@ class TestApp extends BaseApplication {
} }
} }
module.exports = { kvStore, resourceService, resourceFetcher, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, TestApp }; module.exports = { kvStore, resourceService, resourceFetcher, tempFilePath, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, TestApp };