diff --git a/packages/loot-core/src/mocks/setup.js b/packages/loot-core/src/mocks/setup.js index 40ef7b49853f5276b7d2c8d78ea3a07caf3821dc..172aea37fc4accad5bdf15fe05c422fec3333da1 100644 --- a/packages/loot-core/src/mocks/setup.js +++ b/packages/loot-core/src/mocks/setup.js @@ -6,6 +6,7 @@ import { enableGlobalMutations, disableGlobalMutations } from '../server/mutators'; +import { setServer } from '../server/server-config'; import * as sheet from '../server/sheet'; import { setSyncingMode } from '../server/sync'; import * as tracking from '../server/tracking/events'; @@ -22,6 +23,9 @@ const nativeFs = require('fs'); // By default, syncing is disabled setSyncingMode('disabled'); +// Set a mock url for the testing server +setServer('https://test.env'); + process.on('unhandledRejection', reason => { console.log('REJECTION', reason); }); diff --git a/packages/loot-core/src/server/accounts/__snapshots__/sync.test.js.snap b/packages/loot-core/src/server/accounts/__snapshots__/sync.test.js.snap index 90b4189ebb5cf87629544a0d86d8ed17ae972429..875654905e1619832cd4d6e2c3a17b8d0c59acb4 100644 --- a/packages/loot-core/src/server/accounts/__snapshots__/sync.test.js.snap +++ b/packages/loot-core/src/server/accounts/__snapshots__/sync.test.js.snap @@ -444,8 +444,8 @@ exports[`Account sync import never matches existing with financial ids 3`] = ` \\"account\\": \\"one\\", - \\"amount\\": -1462, + \\"amount\\": -2947, - \\"category\\": null, - \\"cleared\\": 1, ++ \\"category\\": null, ++ \\"cleared\\": 1, + \\"date\\": 20171017, + \\"error\\": null, + \\"id\\": \\"two\\", @@ -488,8 +488,8 @@ exports[`Account sync import never matches existing with financial ids 3`] = ` + Object { + \\"account\\": \\"one\\", + \\"amount\\": 8105, -+ \\"category\\": null, -+ \\"cleared\\": 1, + \\"category\\": null, + \\"cleared\\": 1, \\"date\\": 20171015, \\"error\\": null, - \\"id\\": \\"id20\\", @@ -920,12 +920,15 @@ exports[`Account sync import updates transfers when matched 2`] = ` \\"category\\": null, \\"cleared\\": 1, \\"date\\": 20171015, -@@ -65,10 +87,32 @@ +@@ -62,10 +84,32 @@ + \\"schedule\\": null, + \\"sort_order\\": 123456789, + \\"starting_balance_flag\\": 0, \\"tombstone\\": 0, \\"transfer_id\\": null, - }, - Object { - \\"account\\": \\"one\\", ++ }, ++ Object { ++ \\"account\\": \\"one\\", + \\"amount\\": -2948, + \\"category\\": null, + \\"cleared\\": 0, @@ -945,14 +948,11 @@ exports[`Account sync import updates transfers when matched 2`] = ` + \\"starting_balance_flag\\": 0, + \\"tombstone\\": 0, + \\"transfer_id\\": \\"one\\", -+ }, -+ Object { -+ \\"account\\": \\"one\\", + }, + Object { + \\"account\\": \\"one\\", \\"amount\\": -4207, - \\"category\\": null, - \\"cleared\\": 1, - \\"date\\": 20171015, - \\"error\\": null," + \\"category\\": null," `; exports[`Account sync import updates transfers when matched 3`] = ` diff --git a/packages/loot-core/src/server/accounts/__snapshots__/transfer.test.js.snap b/packages/loot-core/src/server/accounts/__snapshots__/transfer.test.js.snap index d2914a710530776768ccc02ed3996fd36fd974b0..d84f703ecea63e32425e572d250c14d40b42cccb 100644 --- a/packages/loot-core/src/server/accounts/__snapshots__/transfer.test.js.snap +++ b/packages/loot-core/src/server/accounts/__snapshots__/transfer.test.js.snap @@ -51,7 +51,7 @@ exports[`Transfer transfers are properly de-categorized 2`] = ` \\"tombstone\\": 0, - \\"transfer_id\\": null, + \\"transfer_id\\": \\"id7\\", - }, ++ }, + Object { + \\"account\\": \\"three\\", + \\"amount\\": -5000, @@ -73,7 +73,7 @@ exports[`Transfer transfers are properly de-categorized 2`] = ` + \\"starting_balance_flag\\": 0, + \\"tombstone\\": 0, + \\"transfer_id\\": \\"id6\\", -+ }, + }, ]" `; @@ -334,7 +334,7 @@ exports[`Transfer transfers are properly inserted/updated/deleted 5`] = ` - First value + Second value -@@ -11,41 +11,19 @@ +@@ -11,39 +11,17 @@ \\"imported_payee\\": null, \\"is_child\\": 0, \\"is_parent\\": 0, @@ -349,9 +349,8 @@ exports[`Transfer transfers are properly inserted/updated/deleted 5`] = ` \\"starting_balance_flag\\": 0, \\"tombstone\\": 0, - \\"transfer_id\\": \\"id8\\", -+ \\"transfer_id\\": null, - }, - Object { +- }, +- Object { - \\"account\\": \\"three\\", - \\"amount\\": -5000, - \\"category\\": null, @@ -372,13 +371,12 @@ exports[`Transfer transfers are properly inserted/updated/deleted 5`] = ` - \\"starting_balance_flag\\": 0, - \\"tombstone\\": 0, - \\"transfer_id\\": \\"id7\\", -- }, -- Object { ++ \\"transfer_id\\": null, + }, + Object { \\"account\\": \\"one\\", \\"amount\\": 5000, - \\"category\\": null, - \\"cleared\\": 1, - \\"date\\": 20170101," + \\"category\\": null," `; exports[`Transfer transfers are properly inserted/updated/deleted 6`] = ` @@ -386,7 +384,7 @@ exports[`Transfer transfers are properly inserted/updated/deleted 6`] = ` - First value + Second value -@@ -11,19 +11,41 @@ +@@ -11,17 +11,39 @@ \\"imported_payee\\": null, \\"is_child\\": 0, \\"is_parent\\": 0, @@ -402,8 +400,8 @@ exports[`Transfer transfers are properly inserted/updated/deleted 6`] = ` \\"tombstone\\": 0, - \\"transfer_id\\": null, + \\"transfer_id\\": \\"id10\\", - }, - Object { ++ }, ++ Object { + \\"account\\": \\"two\\", + \\"amount\\": -5000, + \\"category\\": null, @@ -424,13 +422,11 @@ exports[`Transfer transfers are properly inserted/updated/deleted 6`] = ` + \\"starting_balance_flag\\": 0, + \\"tombstone\\": 0, + \\"transfer_id\\": \\"id7\\", -+ }, -+ Object { + }, + Object { \\"account\\": \\"one\\", \\"amount\\": 5000, - \\"category\\": null, - \\"cleared\\": 1, - \\"date\\": 20170101," + \\"category\\": null," `; exports[`Transfer transfers are properly inserted/updated/deleted 7`] = ` diff --git a/packages/loot-core/src/server/accounts/sync.test.js b/packages/loot-core/src/server/accounts/sync.test.js index 2f14a559e070cdb8d51d2c583fcb5f47b2876062..8aec8fe7f59ea4a6fe7ce7be1f442ff1baf6297b 100644 --- a/packages/loot-core/src/server/accounts/sync.test.js +++ b/packages/loot-core/src/server/accounts/sync.test.js @@ -98,7 +98,7 @@ async function getAllPayees() { return (await db.getPayees()).filter(p => p.transfer_acct == null); } -describe.skip('Account sync', () => { +describe('Account sync', () => { test('reconcile creates payees correctly', async () => { monthUtils.currentDay = () => '2017-10-15'; let mockTransactions = prepMockTransactions(); @@ -468,7 +468,7 @@ describe.skip('Account sync', () => { }); let testMapped = version => { - test.skip(`reconcile matches unmapped and mapped payees (${version})`, async () => { + test(`reconcile matches unmapped and mapped payees (${version})`, async () => { const { id: acctId } = await prepareDatabase(); if (version === 'v1') { diff --git a/packages/loot-core/src/server/accounts/transfer.test.js b/packages/loot-core/src/server/accounts/transfer.test.js index 7d3b6e2260101e7d1fc621a3e27bd056a745fc6e..97fcff914f73f3aab6b8df2b08ec10a58876630a 100644 --- a/packages/loot-core/src/server/accounts/transfer.test.js +++ b/packages/loot-core/src/server/accounts/transfer.test.js @@ -33,7 +33,7 @@ async function prepareDatabase() { }); } -describe.skip('Transfer', () => { +describe('Transfer', () => { test('transfers are properly inserted/updated/deleted', async () => { await prepareDatabase(); diff --git a/packages/loot-core/src/server/main.test.js b/packages/loot-core/src/server/main.test.js index 8b2a34b21a53bcd6b0a01a9a5c72f0a7627f052e..4f3d8f98ea54e9250522f11058e4abd3e2c454be 100644 --- a/packages/loot-core/src/server/main.test.js +++ b/packages/loot-core/src/server/main.test.js @@ -96,7 +96,7 @@ describe('Budgets', () => { }); }); -describe.skip('Accounts', () => { +describe('Accounts', () => { test('create accounts with correct starting balance', async () => { prefs.loadPrefs(); prefs.savePrefs({ clientId: 'client', groupId: 'group' }); @@ -202,7 +202,7 @@ describe.skip('Accounts', () => { }); }); -describe.skip('Budget', () => { +describe('Budget', () => { test('new budgets should be created', async () => { const spreadsheet = await sheet.loadSpreadsheet(db); @@ -330,7 +330,7 @@ describe.skip('Budget', () => { }); describe('Categories', () => { - test.skip('can be deleted', async () => { + test('can be deleted', async () => { let spreadsheet = await sheet.loadSpreadsheet(db); await runMutator(async () => { diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.test.js b/packages/loot-core/src/server/spreadsheet/spreadsheet.test.js index a22b7ca99aa83fddcee7839180ecf7e910ed27a8..b2ced4f015a400f34557de563569427a6be5cd4d 100644 --- a/packages/loot-core/src/server/spreadsheet/spreadsheet.test.js +++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.test.js @@ -161,7 +161,7 @@ describe('Spreadsheet', () => { expect(spreadsheet.getValue('foo!x')).toBe(1); }); - test.skip('async cells work2', done => { + test('async cells work2', done => { const spreadsheet = new Spreadsheet(); spreadsheet.transaction(() => { diff --git a/packages/loot-core/src/server/sync/sync.test.js b/packages/loot-core/src/server/sync/sync.test.js index b7efcb1040cc88c31ea6f1f0de50c6636693eb06..5cc86445b53a5d857120514a7d8cf40b4361c1f4 100644 --- a/packages/loot-core/src/server/sync/sync.test.js +++ b/packages/loot-core/src/server/sync/sync.test.js @@ -20,7 +20,7 @@ afterEach(() => { setSyncingMode('disabled'); }); -describe.skip('Sync', () => { +describe('Sync', () => { it('should send messages to the server', async () => { prefs.loadPrefs(); prefs.savePrefs({ groupId: 'group' }); @@ -173,7 +173,7 @@ function expectCellNotToExist(sheetName, name, voided) { expect(value).toBe(voided ? 0 : null); } -describe.skip('Sync projections', () => { +describe('Sync projections', () => { test('synced categories should have budgets created', async () => { let groupId, fooId, barId; await asSecondClient(async () => {