obsidian-testing-framework 0.4.7 → 0.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/index.js +6 -5
- package/lib/internal-util.js +3 -3
- package/package.json +1 -1
package/lib/index.js
CHANGED
|
@@ -11,7 +11,13 @@ export const test = base.extend({
|
|
|
11
11
|
___vaultId: [
|
|
12
12
|
async ({}, run) => {
|
|
13
13
|
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = "true";
|
|
14
|
+
const obsidianPath = inject("obsidianPath") ?? undefined;
|
|
14
15
|
const vaultHash = randomBytes(8).toString("hex").toLocaleLowerCase();
|
|
16
|
+
const concurrent = inject("concurrent") ?? "copy";
|
|
17
|
+
const vault = inject("vault");
|
|
18
|
+
const vaultPoolDir = inject("vaultPoolDir");
|
|
19
|
+
console.log("asar located at:", getExe(obsidianPath));
|
|
20
|
+
await generateVaultConfig(vault, vaultHash, concurrent, vaultPoolDir);
|
|
15
21
|
await run(vaultHash);
|
|
16
22
|
},
|
|
17
23
|
{ auto: true, scope: "file" },
|
|
@@ -19,11 +25,6 @@ export const test = base.extend({
|
|
|
19
25
|
electronApp: [
|
|
20
26
|
async ({ ___vaultId: vaultId }, run) => {
|
|
21
27
|
const obsidianPath = inject("obsidianPath") ?? undefined;
|
|
22
|
-
const concurrent = inject("concurrent") ?? "copy";
|
|
23
|
-
const vault = inject("vault");
|
|
24
|
-
const vaultPoolDir = inject("vaultPoolDir");
|
|
25
|
-
console.log("asar located at:", getExe(obsidianPath));
|
|
26
|
-
await generateVaultConfig(vault, vaultId, concurrent, vaultPoolDir);
|
|
27
28
|
const tmp = JSON.parse(readFileSync(path.join(findConfig(), "obsidian.json")).toString());
|
|
28
29
|
console.log("vaultid", vaultId, vaultId in tmp.vaults);
|
|
29
30
|
let uriArg = "";
|
package/lib/internal-util.js
CHANGED
|
@@ -74,14 +74,14 @@ export async function generateVaultConfig(vault, vaultHash, concurrent, vaultPoo
|
|
|
74
74
|
const json = JSON.parse((await readFile(obsidianConfigFile)).toString());
|
|
75
75
|
const hasVault = Object.values(json.vaults).some((a) => a.path === vault) && !concurrent;
|
|
76
76
|
if (concurrent === "symlink") {
|
|
77
|
-
await symlinkDir(vault, path.join(vaultPoolDir, vaultHash));
|
|
77
|
+
await symlinkDir(vault, path.join(vaultPoolDir, `vault-${vaultHash}`));
|
|
78
78
|
}
|
|
79
79
|
else if (concurrent === "copy") {
|
|
80
|
-
await cp(vault, path.join(vaultPoolDir, vaultHash), { recursive: true });
|
|
80
|
+
await cp(vault, path.join(vaultPoolDir, `vault-${vaultHash}`), { recursive: true });
|
|
81
81
|
}
|
|
82
82
|
if (!hasVault) {
|
|
83
83
|
json.vaults[vaultHash] = {
|
|
84
|
-
path: concurrent ? path.join(vaultPoolDir, vaultHash) : vault,
|
|
84
|
+
path: concurrent ? path.join(vaultPoolDir, `vault-${vaultHash}`) : vault,
|
|
85
85
|
ts: Date.now(),
|
|
86
86
|
};
|
|
87
87
|
await writeFile(obsidianConfigFile, JSON.stringify(json, null, "\t"));
|