From 7ce11d32fa898c4a6543cbb246fc9d1867364d0d Mon Sep 17 00:00:00 2001 From: Sampo Tawast Date: Tue, 2 May 2023 10:10:29 +0300 Subject: [PATCH] Fix merge issue on kesaseteli handler package.json --- frontend/kesaseteli/employer/package.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frontend/kesaseteli/employer/package.json b/frontend/kesaseteli/employer/package.json index 8c532344f4..7a8a485959 100644 --- a/frontend/kesaseteli/employer/package.json +++ b/frontend/kesaseteli/employer/package.json @@ -13,14 +13,8 @@ "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test", "test:staged": "yarn test --watchAll=false --findRelatedTests", "test:coverage": "yarn test --verbose --coverage", -<<<<<<< HEAD - "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/", - "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\" --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/", - "browser-test:wsl2win": "testcafe 'path:`/mnt/c/Program Files/Google/Chrome/Application/chrome.exe` --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --live --dev browser-tests/" -======= "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless", "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\" --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless" ->>>>>>> 18250892 (Try experimental proxyless test run) }, "dependencies": { "@frontend/kesaseteli-shared": "*",