Fix workbench test

opendatahub-io · Nov 13, 2024 · edf9290 · edf9290
1 parent 9c3909c
commit edf9290
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/workbench.cy.ts
@@ -686,35 +686,11 @@ describe('Workbench page', () => {
     editSpawnerPage.findAcceleratorProfileSelect().findSelectOption('None').click();
     editSpawnerPage.findAcceleratorProfileSelect().should('contain', 'None');
 
-    cy.interceptK8s('PUT', PVCModel, mockPVCK8sResource({ name: 'test-notebook' })).as(
-      'editClusterStorage',
-    );
     cy.interceptK8s('PUT', NotebookModel, mockNotebookK8sResource({})).as('editWorkbenchDryRun');
     cy.interceptK8s('PATCH', NotebookModel, mockNotebookK8sResource({})).as('editWorkbench');
 
     editSpawnerPage.findSubmitButton().click();
 
-    cy.wait('@editClusterStorage').then((interception) => {
-      expect(interception.request.url).to.include('?dryRun=All');
-      expect(interception.request.body).to.containSubset({
-        metadata: {
-          annotations: {
-            'openshift.io/description': '',
-            'openshift.io/display-name': 'Test Storage',
-          },
-          name: 'test-notebook',
-          namespace: 'test-project',
-          labels: {
-            'opendatahub.io/dashboard': 'true',
-          },
-        },
-        spec: {
-          resources: { requests: { storage: '5Gi' } },
-        },
-        status: { phase: 'Pending', accessModes: ['ReadWriteOnce'], capacity: { storage: '5Gi' } },
-      });
-    });
-
     cy.wait('@editWorkbenchDryRun').then((interception) => {
       expect(interception.request.url).to.include('?dryRun=All');
       expect(interception.request.body).to.containSubset({

diff --git a/frontend/src/pages/projects/screens/spawner/SpawnerPage.tsx b/frontend/src/pages/projects/screens/spawner/SpawnerPage.tsx
@@ -115,7 +115,7 @@ const SpawnerPage: React.FC<SpawnerPageProps> = ({ existingNotebook }) => {
             name: k8sNameDescriptionData.data.name || defaultClusterStorage.name,
             description: defaultClusterStorage.description,
             size: defaultClusterStorage.size || defaultNotebookSize,
-            storageClassName: defaultStorageClassName || defaultClusterStorage.storageClassName,
+            storageClassName: defaultStorageClassName,
             mountPath: defaultClusterStorage.mountPath,
           },
         ],

diff --git a/frontend/src/pages/projects/screens/spawner/storage/constants.ts b/frontend/src/pages/projects/screens/spawner/storage/constants.ts
@@ -32,5 +32,4 @@ export const defaultClusterStorage = {
   description: '',
   size: '20Gi',
   mountPath: MOUNT_PATH_PREFIX,
-  storageClassName: '',
 };