Tools: Fixed tests

.eslintignore

@@ -83,6 +83,9 @@ packages/app-cli/tests/MdToHtml.js.map
 packages/app-cli/tests/MdToMd.d.ts
 packages/app-cli/tests/MdToMd.js
 packages/app-cli/tests/MdToMd.js.map
+packages/app-cli/tests/services/keychain/KeychainService.d.ts
+packages/app-cli/tests/services/keychain/KeychainService.js
+packages/app-cli/tests/services/keychain/KeychainService.js.map
 packages/app-cli/tests/services/plugins/PluginService.d.ts
 packages/app-cli/tests/services/plugins/PluginService.js
 packages/app-cli/tests/services/plugins/PluginService.js.map
@@ -1166,9 +1169,6 @@ packages/lib/services/keychain/KeychainServiceDriver.node.js.map
 packages/lib/services/keychain/KeychainServiceDriverBase.d.ts
 packages/lib/services/keychain/KeychainServiceDriverBase.js
 packages/lib/services/keychain/KeychainServiceDriverBase.js.map
-packages/lib/services/keychain/keychainService.test.d.ts
-packages/lib/services/keychain/keychainService.test.js
-packages/lib/services/keychain/keychainService.test.js.map
 packages/lib/services/plugins/BasePluginRunner.d.ts
 packages/lib/services/plugins/BasePluginRunner.js
 packages/lib/services/plugins/BasePluginRunner.js.map

.gitignore

@@ -69,6 +69,9 @@ packages/app-cli/tests/MdToHtml.js.map
 packages/app-cli/tests/MdToMd.d.ts
 packages/app-cli/tests/MdToMd.js
 packages/app-cli/tests/MdToMd.js.map
+packages/app-cli/tests/services/keychain/KeychainService.d.ts
+packages/app-cli/tests/services/keychain/KeychainService.js
+packages/app-cli/tests/services/keychain/KeychainService.js.map
 packages/app-cli/tests/services/plugins/PluginService.d.ts
 packages/app-cli/tests/services/plugins/PluginService.js
 packages/app-cli/tests/services/plugins/PluginService.js.map
@@ -1152,9 +1155,6 @@ packages/lib/services/keychain/KeychainServiceDriver.node.js.map
 packages/lib/services/keychain/KeychainServiceDriverBase.d.ts
 packages/lib/services/keychain/KeychainServiceDriverBase.js
 packages/lib/services/keychain/KeychainServiceDriverBase.js.map
-packages/lib/services/keychain/keychainService.test.d.ts
-packages/lib/services/keychain/keychainService.test.js
-packages/lib/services/keychain/keychainService.test.js.map
 packages/lib/services/plugins/BasePluginRunner.d.ts
 packages/lib/services/plugins/BasePluginRunner.js
 packages/lib/services/plugins/BasePluginRunner.js.map

packages/app-cli/tests/services/keychain/KeychainService.ts

@@ -1,8 +1,7 @@
-import KeychainService from '../../services/keychain/KeychainService';
+import KeychainService from '@joplin/lib/services/keychain/KeychainService';
-import shim from '../../shim';
+import shim from '@joplin/lib/shim';
-import Setting from '../../models/Setting';
+import Setting from '@joplin/lib/models/Setting';
-
+import { db, setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
-const { db, setupDatabaseAndSynchronizer, switchClient } = require('../../testing/test-utils.js');
 
 function describeIfCompatible(name: string, fn: any, elseFn: any) {
 	if (['win32', 'darwin'].includes(shim.platformName())) {

packages/lib/jest.setup.js

@@ -1,17 +1,8 @@
 const { afterEachCleanUp } = require('./testing/test-utils.js');
 const { shimInit } = require('./shim-init-node.js');
-const shim = require('./shim').default;
 const sharp = require('sharp');
 
-let keytar;
+shimInit(sharp, null);
-try {
-	keytar = shim.platformSupportsKeyChain() ? require('keytar') : null;
-} catch (error) {
-	console.error('Cannot load keytar - keychain support will be disabled', error);
-	keytar = null;
-}
-
-shimInit(sharp, keytar);
 
 global.afterEach(async () => {
 	await afterEachCleanUp();

packages/lib/package-lock.json

@@ -4059,24 +4059,6 @@
 				"verror": "1.10.0"
 			}
 		},
-		"keytar": {
-			"version": "7.7.0",
-			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-			"dev": true,
-			"requires": {
-				"node-addon-api": "^3.0.0",
-				"prebuild-install": "^6.0.0"
-			},
-			"dependencies": {
-				"node-addon-api": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.0.tgz",
-					"integrity": "sha512-kcwSAWhPi4+QzAtsL2+2s/awvDo2GKLsvMCwNRxb5BUshteXU8U97NCyvQDsGKs/m0He9WcG4YWew/BnuLx++w==",
-					"dev": true
-				}
-			}
-		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",

packages/lib/package.json

@@ -21,7 +21,6 @@
     "@types/fs-extra": "^9.0.6",
     "jest": "^26.6.3",
     "sharp": "^0.26.2",
-    "keytar": "^7.0.0",
     "typescript": "^4.0.5",
     "clean-html": "^1.5.0"
   },