Skip to content

Commit 3c594ef

Browse files
Update tests for split settings runtime
1 parent 97f1a9f commit 3c594ef

3 files changed

Lines changed: 30 additions & 23 deletions

File tree

tests/dashboard-layout-regression.test.mjs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ const settingsPagePath = path.join(
88
repoRoot,
99
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/FolderViewPlus.page'
1010
);
11-
const settingsScriptPath = path.join(
12-
repoRoot,
11+
const settingsScriptPaths = [
12+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.runtime-parity.js',
13+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.settings-sections.js',
14+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.setup-assistant.js',
15+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js',
16+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.activity-diagnostics.js',
17+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-editor.js',
1318
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.js'
14-
);
19+
].map((relativePath) => path.join(repoRoot, relativePath));
1520
const dashboardScriptPath = path.join(
1621
repoRoot,
1722
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/dashboard.js'
@@ -34,7 +39,7 @@ const libPhpPath = path.join(
3439
);
3540

3641
const settingsPage = fs.readFileSync(settingsPagePath, 'utf8');
37-
const settingsScript = fs.readFileSync(settingsScriptPath, 'utf8');
42+
const settingsScript = settingsScriptPaths.map((scriptPath) => fs.readFileSync(scriptPath, 'utf8')).join('\n');
3843
const dashboardScript = fs.readFileSync(dashboardScriptPath, 'utf8');
3944
const dashboardCss = fs.readFileSync(dashboardCssPath, 'utf8');
4045
const folderPage = fs.readFileSync(folderPagePath, 'utf8');

tests/mobile-iphone-regression.test.mjs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@ import fs from 'node:fs';
44
import path from 'node:path';
55

66
const repoRoot = path.resolve(process.cwd());
7-
const settingsJsPath = path.join(
8-
repoRoot,
7+
const settingsScriptPaths = [
8+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.runtime-parity.js',
9+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.settings-sections.js',
10+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.setup-assistant.js',
11+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js',
12+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.activity-diagnostics.js',
13+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-editor.js',
914
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.js'
10-
);
15+
].map((relativePath) => path.join(repoRoot, relativePath));
1116
const settingsCssPath = path.join(
1217
repoRoot,
1318
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css'
1419
);
1520

16-
const settingsJs = fs.readFileSync(settingsJsPath, 'utf8');
21+
const settingsJs = settingsScriptPaths.map((scriptPath) => fs.readFileSync(scriptPath, 'utf8')).join('\n');
1722
const settingsCss = fs.readFileSync(settingsCssPath, 'utf8');
1823

1924
test('settings runtime keeps iPhone/mobile compact-layout detection wired', () => {

tests/ui-smoke-layout.test.mjs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ const settingsCssPath = path.join(
1212
repoRoot,
1313
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css'
1414
);
15-
const settingsJsPath = path.join(
16-
repoRoot,
17-
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.js'
18-
);
19-
const settingsWizardJsPath = path.join(
20-
repoRoot,
21-
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.wizard.js'
22-
);
23-
const settingsImportJsPath = path.join(
24-
repoRoot,
15+
const settingsScriptPaths = [
16+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.runtime-parity.js',
17+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.settings-sections.js',
18+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.setup-assistant.js',
19+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js',
20+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.activity-diagnostics.js',
21+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-editor.js',
22+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.js',
23+
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.wizard.js',
2524
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.import.js'
26-
);
25+
].map((relativePath) => path.join(repoRoot, relativePath));
2726
const folderCssPath = path.join(
2827
repoRoot,
2928
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folder.css'
@@ -43,10 +42,8 @@ const vmJsPath = path.join(
4342

4443
const settingsPage = fs.readFileSync(settingsPagePath, 'utf8');
4544
const settingsCss = fs.readFileSync(settingsCssPath, 'utf8');
46-
const settingsJs = fs.readFileSync(settingsJsPath, 'utf8');
47-
const settingsWizardJs = fs.readFileSync(settingsWizardJsPath, 'utf8');
48-
const settingsImportJs = fs.readFileSync(settingsImportJsPath, 'utf8');
49-
const settingsRuntime = `${settingsJs}\n${settingsWizardJs}\n${settingsImportJs}`;
45+
const settingsRuntime = settingsScriptPaths.map((scriptPath) => fs.readFileSync(scriptPath, 'utf8')).join('\n');
46+
const settingsJs = settingsRuntime;
5047
const folderCss = fs.readFileSync(folderCssPath, 'utf8');
5148
const folderJs = fs.readFileSync(folderJsPath, 'utf8');
5249
const dockerJs = fs.readFileSync(dockerJsPath, 'utf8');

0 commit comments

Comments
 (0)