From 42846cce0893ccd5b943d43c1ea9abb27ee31adb Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Wed, 5 Feb 2025 11:51:34 +0300 Subject: [PATCH] review fix --- .gitignore | 8 ++++---- Makefile | 8 ++++---- bamboo-specs/test.yaml | 6 ------ client/playwright.config.ts | 30 ------------------------------ 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 1f674784..5fd6dc60 100644 --- a/.gitignore +++ b/.gitignore @@ -33,9 +33,9 @@ AdGuardHome.exe AdGuardHome.yaml* coverage.txt node_modules/ -client/test-results/ -client/playwright-report/ -client/blob-report/ -client/playwright/.cache/ +/client/blob-report/ +/client/playwright-report/ +/client/playwright/.cache/ +/client/test-results/ !/build/gitkeep diff --git a/Makefile b/Makefile index c85cfcc8..f28314f1 100644 --- a/Makefile +++ b/Makefile @@ -104,10 +104,10 @@ build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT)) $(ENV) "$(SHELL)" ./scripts/make/build-release.sh -js-build: ; $(NPM) $(NPM_FLAGS) run build-prod -js-deps: ; $(NPM) $(NPM_INSTALL_FLAGS) ci -js-lint: ; $(NPM) $(NPM_FLAGS) run lint -js-test: ; $(NPM) $(NPM_FLAGS) run test +js-build: ; $(NPM) $(NPM_FLAGS) run build-prod +js-deps: ; $(NPM) $(NPM_INSTALL_FLAGS) ci +js-lint: ; $(NPM) $(NPM_FLAGS) run lint +js-test: ; $(NPM) $(NPM_FLAGS) run test js-test-e2e: ; npx $(NPM_FLAGS) playwright install --with-deps && $(NPM) $(NPM_FLAGS) run test:e2e go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index b26e5615..5dded53a 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -199,12 +199,6 @@ mv /tmp/AdGuardHome/AdGuardHome ./AdGuardHome - chmod +x ./AdGuardHome - - ls -l ./AdGuardHome - - tree ./build/ - make VERBOSE=1 js-deps js-test-e2e 'requirements': - 'adg-docker': 'true' diff --git a/client/playwright.config.ts b/client/playwright.config.ts index e621722a..32aa3bd6 100644 --- a/client/playwright.config.ts +++ b/client/playwright.config.ts @@ -37,36 +37,6 @@ export default defineConfig({ name: 'chromium', use: { ...devices['Desktop Chrome'] }, }, - - // { - // name: 'firefox', - // use: { ...devices['Desktop Firefox'] }, - // }, - // - // { - // name: 'webkit', - // use: { ...devices['Desktop Safari'] }, - // }, - - /* Test against mobile viewports. */ - // { - // name: 'Mobile Chrome', - // use: { ...devices['Pixel 5'] }, - // }, - // { - // name: 'Mobile Safari', - // use: { ...devices['iPhone 12'] }, - // }, - - /* Test against branded browsers. */ - // { - // name: 'Microsoft Edge', - // use: { ...devices['Desktop Edge'], channel: 'msedge' }, - // }, - // { - // name: 'Google Chrome', - // use: { ...devices['Desktop Chrome'], channel: 'chrome' }, - // }, ], webServer: {