diff --git a/ui/litellm-dashboard/e2e_tests/constants.ts b/ui/litellm-dashboard/e2e_tests/constants.ts index 0de1ab571d7..b07bd68fcf1 100644 --- a/ui/litellm-dashboard/e2e_tests/constants.ts +++ b/ui/litellm-dashboard/e2e_tests/constants.ts @@ -1,2 +1 @@ export const ADMIN_STORAGE_PATH = "admin.storageState.json"; -export const INTERNAL_USER_VIEWER_STORAGE_PATH = "internalViewer.storageState.json"; \ No newline at end of file diff --git a/ui/litellm-dashboard/e2e_tests/fixtures/users.ts b/ui/litellm-dashboard/e2e_tests/fixtures/users.ts index 64d0597ee7e..d1f1eab00e5 100644 --- a/ui/litellm-dashboard/e2e_tests/fixtures/users.ts +++ b/ui/litellm-dashboard/e2e_tests/fixtures/users.ts @@ -7,8 +7,4 @@ export const users = { email: "admin", password: isCI ? "gm" : "sk-1234", }, - [Role.InternalUserViewer]: { - email: "internalViewer@test.com", - password: "test", - }, }; diff --git a/ui/litellm-dashboard/e2e_tests/globalSetup.ts b/ui/litellm-dashboard/e2e_tests/globalSetup.ts index e75362a2b36..a725c58f35b 100644 --- a/ui/litellm-dashboard/e2e_tests/globalSetup.ts +++ b/ui/litellm-dashboard/e2e_tests/globalSetup.ts @@ -1,30 +1,17 @@ import { chromium } from "@playwright/test"; import { users } from "./fixtures/users"; import { Role } from "./fixtures/roles"; -import { ADMIN_STORAGE_PATH, INTERNAL_USER_VIEWER_STORAGE_PATH } from "./constants"; - -async function loginAndSaveState( - browser, - user, - storagePath: string -) { - const context = await browser.newContext(); - const page = await context.newPage(); - - await page.goto("http://localhost:4000/ui/login"); - await page.getByPlaceholder("Enter your username").fill(user.email); - await page.getByPlaceholder("Enter your password").fill(user.password); - await page.getByRole("button", { name: "Login" }).click(); - await page.getByText('AI GATEWAY').waitFor(); - - await context.storageState({ path: storagePath }); - await context.close(); -} async function globalSetup() { const browser = await chromium.launch(); - await loginAndSaveState(browser, users[Role.ProxyAdmin], ADMIN_STORAGE_PATH); - await loginAndSaveState(browser, users[Role.InternalUserViewer], INTERNAL_USER_VIEWER_STORAGE_PATH); + const page = await browser.newPage(); + await page.goto("http://localhost:4000/ui/login"); + await page.getByPlaceholder("Enter your username").fill(users[Role.ProxyAdmin].email); + await page.getByPlaceholder("Enter your password").fill(users[Role.ProxyAdmin].password); + const loginButton = page.getByRole("button", { name: "Login" }); + await loginButton.click(); + await page.waitForSelector("text=AI Gateway"); + await page.context().storageState({ path: "admin.storageState.json" }); await browser.close(); } diff --git a/ui/litellm-dashboard/e2e_tests/tests/login/login.spec.ts b/ui/litellm-dashboard/e2e_tests/tests/login/login.spec.ts index 5e24780dd09..5ac977ff0c8 100644 --- a/ui/litellm-dashboard/e2e_tests/tests/login/login.spec.ts +++ b/ui/litellm-dashboard/e2e_tests/tests/login/login.spec.ts @@ -3,7 +3,7 @@ import { users } from "../../fixtures/users"; import { Role } from "../../fixtures/roles"; test("user can log in", async ({ page }) => { - await page.goto("/ui/login"); + await page.goto("http://localhost:4000/ui/login"); await page.getByPlaceholder("Enter your username").fill(users[Role.ProxyAdmin].email); await page.getByPlaceholder("Enter your password").fill(users[Role.ProxyAdmin].password); const loginButton = page.getByRole("button", { name: "Login" }); diff --git a/ui/litellm-dashboard/e2e_tests/tests/navigation/sidebar.spec.ts b/ui/litellm-dashboard/e2e_tests/tests/navigation/sidebar.spec.ts index 3d783621271..ce07cc2b83d 100644 --- a/ui/litellm-dashboard/e2e_tests/tests/navigation/sidebar.spec.ts +++ b/ui/litellm-dashboard/e2e_tests/tests/navigation/sidebar.spec.ts @@ -1,6 +1,6 @@ import test, { expect } from "@playwright/test"; import { Role } from "../../fixtures/roles"; -import { ADMIN_STORAGE_PATH, INTERNAL_USER_VIEWER_STORAGE_PATH } from "../../constants"; +import { ADMIN_STORAGE_PATH } from "../../constants"; import { Page } from "../../fixtures/pages"; import { menuLabelToPage } from "../../fixtures/menuMappings"; import { navigateToPage } from "../../helpers/navigation"; @@ -8,28 +8,17 @@ import { navigateToPage } from "../../helpers/navigation"; const sidebarButtons = { [Role.ProxyAdmin]: [ "Virtual Keys", - "MCP Servers", "Playground", "Models", "Usage", - "Logs", "Teams", "Internal Users", "API Reference", "AI Hub", ], - [Role.InternalUserViewer]: [ - "Virtual Keys", - "MCP Servers", - "Usage", - "Teams", - "Logs", - "API Reference", - "AI Hub", - ], }; -const roles = [{ role: Role.ProxyAdmin, storage: ADMIN_STORAGE_PATH }, { role: Role.InternalUserViewer, storage: INTERNAL_USER_VIEWER_STORAGE_PATH }]; +const roles = [{ role: Role.ProxyAdmin, storage: ADMIN_STORAGE_PATH }]; for (const { role, storage } of roles) { test.describe(`${role} sidebar`, () => { diff --git a/ui/litellm-dashboard/vitest.config.ts b/ui/litellm-dashboard/vitest.config.ts index 7c52b88d3b6..108f0715704 100644 --- a/ui/litellm-dashboard/vitest.config.ts +++ b/ui/litellm-dashboard/vitest.config.ts @@ -7,7 +7,6 @@ export default defineConfig({ setupFiles: ["tests/setupTests.ts"], globals: true, css: true, // lets you import CSS/modules without extra mocks - testTimeout: 10000, coverage: { provider: "v8", reporter: ["text", "lcov"],