use built showcase for tests (#1085)

finos · Dec 21, 2023 · 2596a92 · 2596a92
1 parent 1e6db73
commit 2596a92
Show file tree

Hide file tree

Showing 6 changed files with 274 additions and 216 deletions.
diff --git a/.github/workflows/test-ui.yml b/.github/workflows/test-ui.yml
@@ -49,21 +49,21 @@ jobs:
           install: false
           working-directory: ./vuu-ui
           browser: chrome
-          build: npm run build
-          start: npm run showcase
-          wait-on: "http://localhost:5173"
+          build: npm run showcase:build
+          start: npm run showcase:preview
+          wait-on: "http://localhost:4173"
       - name: Run end-to-end tests in Edge
         uses: cypress-io/github-action@bd9dda317ed2d4fbffc808ba6cdcd27823b2a13b
         with:
           install: false
           working-directory: ./vuu-ui
           browser: edge
-          build: npm run build
-          start: npm run showcase
-          wait-on: "http://localhost:5173"
+          build: npm run showcase:build
+          start: npm run showcase:preview
+          wait-on: "http://localhost:4173"
 
-  # ensure the vuu example and showcase still build
-  vuu-and-showcase-build:
+  # ensure the vuu example still builds
+  vuu-app-build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -76,7 +76,5 @@ jobs:
         run: cd ./vuu-ui && npm install
       - name: Build Vuu Libraries
         run: cd ./vuu-ui && npm run build
-      - name: Build showcase
-        run: cd ./vuu-ui && npm run showcase:build
       - name: Build Vuu app
         run: cd ./vuu-ui && npm run build:app
diff --git a/vuu-ui/cypress.config.ts b/vuu-ui/cypress.config.ts
@@ -27,29 +27,6 @@ const viteConfig: UserConfig = {
     },
   },
 };
-// if (isCI) {
-//   viteConfig = mergeConfig(viteConfig, {
-//     resolve: {
-//       alias: {
-//         "@salt-ds/core": path.resolve(__dirname, "./dist/salt-ds-core"),
-//         "@salt-ds/data-grid": path.resolve(
-//           __dirname,
-//           "./dist/salt-ds-data-grid"
-//         ),
-//         "@salt-ds/lab": path.resolve(__dirname, "./dist/salt-ds-lab"),
-//         "@salt-ds/icons": path.resolve(__dirname, "./dist/salt-ds-icons"),
-//       },
-//     },
-//     optimizeDeps: {
-//       include: [
-//         "@salt-ds/core",
-//         "@salt-ds/data-grid",
-//         "@salt-ds/lab",
-//         "@salt-ds/icons",
-//       ],
-//     },
-//   } as UserConfig);
-// }
 
 export default defineConfig({
   viewportWidth: 1280,
@@ -78,7 +55,7 @@ export default defineConfig({
   },
 
   e2e: {
-    baseUrl: "http://localhost:5173/",
+    baseUrl: "http://localhost:4173/",
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setupNodeEvents(on, config) {
       // implement node event listeners here

diff --git a/vuu-ui/cypress/support/component/commands.tsx b/vuu-ui/cypress/support/component/commands.tsx
@@ -5,7 +5,7 @@ import "cypress-axe";
 import { Options } from "cypress-axe";
 // import { PerformanceResult, PerformanceTester } from "./PerformanceTester";
 import { ReactNode } from "react";
-import { ThemeProvider } from "@finos/vuu-shell";
+import { ThemeProvider } from "@finos/vuu-utils";
 
 const SupportedThemeModeValues = ["light", "dark"] as const;
 type SupportedThemeMode = (typeof SupportedThemeModeValues)[number];