From c1cc93c16491df4af041821d502c38cf8b831ab7 Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Wed, 18 May 2022 10:54:36 -0600
Subject: [PATCH] Consolidates test-results

---
 .github/workflows/e2e.yml         | 7 +------
 tests/config/playwright.config.ts | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 6187229b16..1eb2a2a8b3 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -88,9 +88,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-results
-          path: |
-            test-results
-            playwright/screenshots
-            playwright/videos
-            playwright/results
-            playwright/reports
+          path: test-results
diff --git a/tests/config/playwright.config.ts b/tests/config/playwright.config.ts
index 1f9438372f..a5a23366ce 100644
--- a/tests/config/playwright.config.ts
+++ b/tests/config/playwright.config.ts
@@ -32,8 +32,8 @@ const config: PlaywrightTestConfig = {
   maxFailures: headless ? 10 : undefined,
   reporter: [
     [process.env.CI ? "github" : "list"],
-    ["html", { outputFolder: "./playwright/reports/playwright-html-report", open: "never" }],
-    ["junit", { outputFile: "./playwright/reports/results.xml" }],
+    ["html", { outputFolder: path.join(outputDir, "reports/playwright-html-report"), open: "never" }],
+    ["junit", { outputFile: path.join(outputDir, "reports/results.xml") }],
   ],
   globalSetup: require.resolve("./globalSetup"),
   outputDir,