daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not remove config on local e2e run

Browse Source
This commit is contained in:
Igor Lobanov
2025-02-05 11:18:29 +01:00
parent 42846cce08
commit 6fef2df6b9
5 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -108,7 +108,7 @@ js-build: ; $(NPM) $(NPM_FLAGS) run build-prod
js-deps: ; $(NPM) $(NPM_INSTALL_FLAGS) ci js-deps: ; $(NPM) $(NPM_INSTALL_FLAGS) ci
js-lint: ; $(NPM) $(NPM_FLAGS) run lint js-lint: ; $(NPM) $(NPM_FLAGS) run lint
js-test: ; $(NPM) $(NPM_FLAGS) run test js-test: ; $(NPM) $(NPM_FLAGS) run test
js-test-e2e: ; npx $(NPM_FLAGS) playwright install --with-deps && $(NPM) $(NPM_FLAGS) run test:e2e js-test-e2e: ; $(NPM) $(NPM_FLAGS) run test:e2e
go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh
go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh

2
bamboo-specs/test.yaml
View File

@@ -199,7 +199,7 @@
mv /tmp/AdGuardHome/AdGuardHome ./AdGuardHome mv /tmp/AdGuardHome/AdGuardHome ./AdGuardHome
make VERBOSE=1 js-deps js-test-e2e make VERBOSE=1 js-test-e2e
'requirements': 'requirements':
- 'adg-docker': 'true' - 'adg-docker': 'true'

5
client/playwright.config.ts vendored
View File

@@ -8,6 +8,7 @@ import path from 'path';
export default defineConfig({ export default defineConfig({
testDir: './tests/e2e', testDir: './tests/e2e',
globalSetup: path.resolve('./tests/e2e/globalSetup.ts'), globalSetup: path.resolve('./tests/e2e/globalSetup.ts'),
globalTeardown: path.resolve('./tests/e2e/globalTeardown.ts'),
timeout: 5000, timeout: 5000,
/* Run tests in files in parallel */ /* Run tests in files in parallel */
fullyParallel: true, fullyParallel: true,
@@ -41,9 +42,7 @@ export default defineConfig({
webServer: { webServer: {
stdout: process.env.CI ? 'pipe' : 'ignore', stdout: process.env.CI ? 'pipe' : 'ignore',
command: process.env.CI command: process.env.CI ? './AdGuardHome --local-frontend -v' : 'sudo ./AdGuardHome --local-frontend -v',
? './AdGuardHome --local-frontend -v'
: 'rm -f AdGuardHome.yaml && sudo ./AdGuardHome --local-frontend -v',
url: 'http://127.0.0.1:3000', url: 'http://127.0.0.1:3000',
cwd: '..', cwd: '..',
reuseExistingServer: !process.env.CI, reuseExistingServer: !process.env.CI,

10
client/tests/e2e/globalSetup.ts
View File

@@ -1,8 +1,18 @@
import { chromium, FullConfig } from '@playwright/test'; import { chromium, FullConfig } from '@playwright/test';
import { existsSync, renameSync } from 'fs';
import { join } from 'path';
import { ADMIN_USERNAME, ADMIN_PASSWORD, PORT } from '../constants'; import { ADMIN_USERNAME, ADMIN_PASSWORD, PORT } from '../constants';
export const CONFIG_FILE = 'AdGuardHome.yaml';
export const TEMP_CONFIG_FILE = 'AdGuardHome.yaml.temp';
async function globalSetup(config: FullConfig) { async function globalSetup(config: FullConfig) {
// Backup existing config file if it exists
if (existsSync(CONFIG_FILE)) {
renameSync(CONFIG_FILE, TEMP_CONFIG_FILE);
}
const browser = await chromium.launch({ const browser = await chromium.launch({
slowMo: 100, slowMo: 100,
}); });

20
client/tests/e2e/globalTeardown.ts Normal file
View File

@@ -0,0 +1,20 @@
import { chromium, FullConfig } from '@playwright/test';
import { ADMIN_USERNAME, ADMIN_PASSWORD, PORT } from '../constants';
import { existsSync, renameSync, unlinkSync } from 'fs';
import { CONFIG_FILE, TEMP_CONFIG_FILE } from './globalSetup';
async function globalTeardown() {
// Remove the test config file
if (existsSync(CONFIG_FILE)) {
unlinkSync(CONFIG_FILE);
}
// Restore the original config file if it exists
if (existsSync(TEMP_CONFIG_FILE)) {
renameSync(TEMP_CONFIG_FILE, CONFIG_FILE);
}
}
export default globalTeardown;