diff --git a/webui/react/src/e2e/tests/experimentList.spec.ts b/webui/react/src/e2e/tests/experimentList.spec.ts index 8e8e18f025b6..86502fa91ce2 100644 --- a/webui/react/src/e2e/tests/experimentList.spec.ts +++ b/webui/react/src/e2e/tests/experimentList.spec.ts @@ -4,7 +4,7 @@ import { ProjectDetails } from 'e2e/models/pages/ProjectDetails'; import { detExecSync, fullPath } from 'e2e/utils/detCLI'; import { safeName } from 'e2e/utils/naming'; import { repeatWithFallback } from 'e2e/utils/polling'; -import { V1Project, V1Workspace } from 'services/api-ts-sdk'; +import { V1Project } from 'services/api-ts-sdk'; import { ExperimentBase } from 'types'; test.describe('Experiment List', () => { @@ -563,48 +563,30 @@ test.describe('Experiment List', () => { test.describe('Row Actions', () => { let destinationProject: V1Project; - let destinationWorkspace: V1Workspace; let experimentId: number; // create a new project, workspace and experiment - test.beforeAll(async ({ backgroundApiProject, backgroundApiWorkspace }) => { - destinationWorkspace = (await backgroundApiWorkspace.createWorkspace( - backgroundApiWorkspace.new(), - )).workspace; + test.beforeAll(async ({ backgroundApiProject, newProject: { response: { project } } }) => { destinationProject = (await backgroundApiProject.createProject( - destinationWorkspace.id, - backgroundApiProject.new(), + project.workspaceId, + backgroundApiProject.new({ projectProps: { workspaceId: project.workspaceId } }), )).project; const expId = Number(detExecSync( - `experiment create ${fullPath('examples/tutorials/mnist_pytorch/adaptive.yaml')} --paused --project_id ${destinationProject.id}`, + `experiment create ${fullPath('examples/tutorials/mnist_pytorch/adaptive.yaml')} --paused --project_id ${project.id}`, ).split(' ')[2]); // returns in the format "Created experiment " if (!Number.isNaN(expId)) experimentId = expId; }); - test.beforeEach(async ({ authedPage, newProject }) => { - test.slow(); - projectDetailsPage = new ProjectDetails(authedPage); - - await projectDetailsPage.gotoProject(newProject.response.project.id); - - const grid = projectDetailsPage.f_experimentList.dataGrid; - - await grid.setColumnHeight(); - await grid.headRow.setColumnDefs(); - }); - // cleanup - test.afterAll(async ({ backgroundApiProject, backgroundApiWorkspace }) => { + test.afterAll(async ({ backgroundApiProject }) => { if (experimentId !== undefined) { detExecSync(`experiment kill ${experimentId}`); detExecSync(`experiment delete ${experimentId} --y`); } await backgroundApiProject.deleteProject(destinationProject.id); - await backgroundApiWorkspace.deleteWorkspace(destinationProject.id); - }); test('move experiment', async () => { @@ -615,7 +597,6 @@ test.describe('Experiment List', () => { const menuMove = await newExperimentRow.experimentActionDropdown.open(); await menuMove.menuItem('Move').pwLocator.click(); - await menuMove.moveModal.destinationWorkspace.pwLocator.fill(destinationProject.workspaceName ?? ''); await menuMove.moveModal.destinationProject.pwLocator.waitFor({ state: 'visible' }); await menuMove.moveModal.destinationProject.pwLocator.fill(destinationProject.name); await menuMove.moveModal.footer.submit.pwLocator.click();