Skip to content

Commit cefc15f

Browse files
committed
Addressed PR comments
1 parent 44ff635 commit cefc15f

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
- name: Run tests
4040
run: >
4141
node test/folder-structure-testing/populator.mjs &&
42-
yarn run test:unit:ci
42+
yarn run test

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"license": "MIT",
99
"type": "module",
1010
"scripts": {
11-
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
1211
"run": "quasar dev -m electron --modern",
1312
"dev": "quasar dev -m electron --modern --devtools",
1413
"sync": "ts-node ./scripts/sync.ts",
@@ -18,7 +17,7 @@
1817
"publish": "quasar build --mode electron --publish always",
1918
"publish-win": "quasar build --mode electron -T win32 --publish always",
2019
"publish-linux": "quasar build --mode electron -T linux --publish always",
21-
"test:unit:ci": "vitest run ./test/vitest"
20+
"test": "vitest run ./test/vitest"
2221
},
2322
"dependencies": {
2423
"@node-steam/vdf": "^2.1.0",
@@ -102,7 +101,7 @@
102101
"wallaby-vue-compiler": "^1.0.3"
103102
},
104103
"engines": {
105-
"node": ">= 18.0.0",
104+
"node": "^20.19.0 || >=22.12.0",
106105
"npm": ">= 10.0.0",
107106
"yarn": ">= 1.21.1"
108107
}
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { AppWindowProvider } from './app_window';
22

3-
let execIdentifier = 0;
4-
53
export const AppWindowImplementation: AppWindowProvider = {
64
getPlatform: () => window.app.getPlatform(),
75
}

test/vitest/tests/unit/ModLinker/ModLinker.spec.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import ManagerSettings from '../../../../../src/r2mm/manager/ManagerSettings';
99
import FileUtils from '../../../../../src/utils/FileUtils';
1010
import GameDirectoryResolverProvider from '../../../../../src/providers/ror2/game/GameDirectoryResolverProvider';
1111
import { ManagerSettingsInterfaceHolder } from '../../../../../src/r2mm/manager/SettingsDexieStore';
12-
import InMemoryFsProvider from "../../../stubs/providers/InMemory.FsProvider";
13-
import SettingsRedirectGameDirectoryResolver from "../../../stubs/providers/SettingsRedirectGameDirectoryResolver";
12+
import InMemoryFsProvider from '../../../stubs/providers/InMemory.FsProvider';
13+
import SettingsRedirectGameDirectoryResolver from '../../../stubs/providers/SettingsRedirectGameDirectoryResolver';
1414
import { describe, beforeAll, test, expect } from 'vitest';
1515
import { providePathImplementation } from '../../../../../src/providers/node/path/path';
1616
import { TestPathProvider } from '../../../stubs/providers/node/Node.Path.Provider';
1717
import { provideAppWindowImplementation } from '../../../../../src/providers/node/app/app_window';
1818
import { TestAppWindowProvider } from '../../../stubs/providers/node/AppWindow.Provider';
19-
2
19+
2020
class ProfileProviderImpl extends ProfileProvider {
2121
ensureProfileDirectory(directory: string, profile: string): void {
2222
FsProvider.instance.mkdirs(path.join(directory, profile));
@@ -28,7 +28,7 @@ describe.skipIf(process.platform !== 'win32')('ModLinker', async () => {
2828
let settings!: ManagerSettings;
2929

3030
beforeAll(async () => {
31-
providePathImplementation(() => TestPathProvider);
31+
providePathImplementation(() => TestPathProvider);
3232
provideAppWindowImplementation(() => TestAppWindowProvider);
3333

3434
new Profile('TestProfile');
@@ -46,32 +46,32 @@ describe.skipIf(process.platform !== 'win32')('ModLinker', async () => {
4646
// Hack to work around Dexie loading issue during test
4747
(ManagerSettings['CONTEXT'] as any) = ({
4848
global: {
49-
steamDirectory: "TEST_STEAM_PATH"
49+
steamDirectory: 'TEST_STEAM_PATH'
5050
},
5151
gameSpecific: {
52-
gameDirectory: "TEST_GAME_DIRECTORY"
52+
gameDirectory: 'TEST_GAME_DIRECTORY'
5353
}
54-
} as ManagerSettingsInterfaceHolder)
54+
} as ManagerSettingsInterfaceHolder);
5555
// await settings.setGameDirectory("GAME_DIR");
5656
await FileUtils.ensureDirectory(settings.getContext().gameSpecific.gameDirectory!);
5757
});
5858

5959
test('Install, no existing files', async () => {
60-
const testFile = Profile.getActiveProfile().joinToProfilePath("test_file");
61-
await FsProvider.instance.writeFile(testFile, "content");
62-
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, "test_file"))).toBeFalsy();
60+
const testFile = Profile.getActiveProfile().joinToProfilePath('test_file');
61+
await FsProvider.instance.writeFile(testFile, 'content');
62+
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, 'test_file'))).toBeFalsy();
6363
await ModLinker.link(Profile.getActiveAsImmutableProfile(), GameManager.defaultGame);
64-
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, "test_file"))).toBeTruthy();
64+
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, 'test_file'))).toBeTruthy();
6565
});
6666

6767
test('Install, file already exists, no overwrite', async () => {
68-
const testFile = Profile.getActiveProfile().joinToProfilePath("test_file");
68+
const testFile = Profile.getActiveProfile().joinToProfilePath('test_file');
6969
expect(await FsProvider.instance.exists(testFile)).toBeTruthy();
7070
const oldStat = await FsProvider.instance.stat(testFile);
7171
await new Promise(resolve => {
7272
setTimeout(async () => {
7373
await ModLinker.link(Profile.getActiveAsImmutableProfile(), GameManager.defaultGame);
74-
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, "test_file"))).toBeTruthy();
74+
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, 'test_file'))).toBeTruthy();
7575
const newStat = await FsProvider.instance.stat(testFile);
7676
expect(newStat.mtime).toEqual(oldStat.mtime);
7777
resolve(undefined);
@@ -80,14 +80,14 @@ describe.skipIf(process.platform !== 'win32')('ModLinker', async () => {
8080
});
8181

8282
test('Install, file already exists, overwritten', async () => {
83-
const testFile = Profile.getActiveProfile().joinToProfilePath("test_file");
83+
const testFile = Profile.getActiveProfile().joinToProfilePath('test_file');
8484
expect(await FsProvider.instance.exists(testFile)).toBeTruthy();
8585
const oldStat = await FsProvider.instance.stat(testFile);
86-
await FsProvider.instance.writeFile(testFile, "modified");
86+
await FsProvider.instance.writeFile(testFile, 'modified');
8787
await new Promise(resolve => {
8888
setTimeout(async () => {
8989
await ModLinker.link(Profile.getActiveAsImmutableProfile(), GameManager.defaultGame);
90-
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, "test_file"))).toBeTruthy();
90+
expect(await FsProvider.instance.exists(path.join(settings.getContext().gameSpecific.gameDirectory!, 'test_file'))).toBeTruthy();
9191
const newStat = await FsProvider.instance.stat(testFile);
9292
expect(newStat.mtime).not.toEqual(oldStat.mtime);
9393
resolve(undefined);

test/vitest/utils/InstallLogicUtils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export async function installLogicBeforeEach(internalFolderName: string) {
5454
InstallationRules.apply();
5555
ConflictManagementProvider.provide(() => new ConflictManagementProviderImpl());
5656
InMemoryFsProvider.setMatchMode("CASE_SENSITIVE");
57-
providePathImplementation(() => TestPathProvider);
5857
}
5958

6059
/**

0 commit comments

Comments
 (0)