From bbecb8403259a4e2d01a204557bac42204c6e0b8 Mon Sep 17 00:00:00 2001 From: Jesse Mazzella Date: Fri, 25 Oct 2024 19:28:48 -0700 Subject: [PATCH] chore: fix pathing --- package.json | 4 ++-- packages/e2e/playwright-ci.config.js | 4 ++-- packages/e2e/playwright-local.config.js | 2 +- packages/e2e/playwright-mobile.config.js | 4 ++-- packages/e2e/playwright-visual-a11y.config.js | 2 +- packages/e2e/playwright-watch.config.js | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index ac1eae19f4..950fb2c930 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "webpack-merge": "5.10.0" }, "scripts": { - "clean": "rm -rf ./dist ./node_modules ./coverage ./html-test-results ./e2e/test-results ./.nyc_output ./e2e/.nyc_output", + "clean": "rm -rf ./dist ./node_modules ./coverage ./html-test-results ./packages/e2e/test-results ./.nyc_output ./packages/e2e/.nyc_output", "start": "npx webpack serve --config ./.webpack/webpack.dev.mjs", "start:prod": "npx webpack serve --config ./.webpack/webpack.prod.mjs", "start:coverage": "npx webpack serve --config ./.webpack/webpack.coverage.mjs", @@ -130,7 +130,7 @@ "test:perf:memory": "npm test --workspace packages/e2e -- --config=playwright-performance-prod.config.js --project=chrome-memory", "update-about-dialog-copyright": "perl -pi -e 's/20\\d\\d\\-202\\d/2014\\-2024/gm' ./src/ui/layout/AboutDialog.vue", "update-copyright-date": "npm run update-about-dialog-copyright && grep -lr --null --include=*.{js,scss,vue,ts,sh,html,md,frag} 'Copyright (c) 20' . | xargs -r0 perl -pi -e 's/Copyright\\s\\(c\\)\\s20\\d\\d\\-20\\d\\d/Copyright \\(c\\)\\ 2014\\-2024/gm'", - "cov:e2e:report": "nyc report --reporter=lcovonly --report-dir=./coverage/e2e", + "cov:e2e:report": "nyc report --cwd=./packages/e2e --reporter=lcovonly --report-dir=../../coverage/e2e", "prepare": "npm run build:prod && npx tsc" }, "homepage": "https://nasa.github.io/openmct", diff --git a/packages/e2e/playwright-ci.config.js b/packages/e2e/playwright-ci.config.js index f4d07ca651..d1b64d9609 100644 --- a/packages/e2e/playwright-ci.config.js +++ b/packages/e2e/playwright-ci.config.js @@ -31,7 +31,7 @@ const config = { trace: 'on-first-retry', video: 'off', // @ts-ignore - custom configuration option for nyc codecoverage output path - coveragePath: fileURLToPath(new URL('../.nyc_output', import.meta.url)) + coveragePath: fileURLToPath(new URL('.nyc_output', import.meta.url)) }, projects: [ { @@ -77,7 +77,7 @@ const config = { 'html', { open: 'never', - outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 + outputFolder: '../../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 } ], ['junit', { outputFile: '../test-results/results.xml' }] diff --git a/packages/e2e/playwright-local.config.js b/packages/e2e/playwright-local.config.js index 5a4b72e791..c13adc98b3 100644 --- a/packages/e2e/playwright-local.config.js +++ b/packages/e2e/playwright-local.config.js @@ -80,7 +80,7 @@ const config = { 'html', { open: 'on-failure', - outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 + outputFolder: '../../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 } ] ] diff --git a/packages/e2e/playwright-mobile.config.js b/packages/e2e/playwright-mobile.config.js index f8e31bfb8d..923b9e8e0f 100644 --- a/packages/e2e/playwright-mobile.config.js +++ b/packages/e2e/playwright-mobile.config.js @@ -30,7 +30,7 @@ const config = { trace: 'on-first-retry', video: 'off', // @ts-ignore - custom configuration option for nyc codecoverage output path - coveragePath: fileURLToPath(new URL('../.nyc_output', import.meta.url)) + coveragePath: fileURLToPath(new URL('.nyc_output', import.meta.url)) }, projects: [ { @@ -62,7 +62,7 @@ const config = { 'html', { open: 'never', - outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 + outputFolder: '../../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 } ], ['junit', { outputFile: '../test-results/results.xml' }] diff --git a/packages/e2e/playwright-visual-a11y.config.js b/packages/e2e/playwright-visual-a11y.config.js index 81e7fadef7..646609b504 100644 --- a/packages/e2e/playwright-visual-a11y.config.js +++ b/packages/e2e/playwright-visual-a11y.config.js @@ -52,7 +52,7 @@ const config = { 'html', { open: 'on-failure', - outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 + outputFolder: '../../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 } ] ] diff --git a/packages/e2e/playwright-watch.config.js b/packages/e2e/playwright-watch.config.js index 5d578f25f0..3f6397a9fb 100644 --- a/packages/e2e/playwright-watch.config.js +++ b/packages/e2e/playwright-watch.config.js @@ -61,7 +61,7 @@ const config = { 'html', { open: 'never', - outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 + outputFolder: '../../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840 } ], ['junit', { outputFile: '../test-results/results.xml' }]