Add cypress tests to submit logic (#3631)

opendatahub-io · Jan 10, 2025 · d339863 · d339863
1 parent c4dfc57
commit d339863
Show file tree

Hide file tree

Showing 10 changed files with 966 additions and 61 deletions.
diff --git a/frontend/src/__mocks__/mockModelRegistry.ts b/frontend/src/__mocks__/mockModelRegistry.ts
@@ -4,6 +4,8 @@ type MockModelRegistryType = {
   name?: string;
   namespace?: string;
   conditions?: K8sCondition[];
+  sslRootCertificateConfigMap?: { name: string; key: string } | null;
+  sslRootCertificateSecret?: { name: string; key: string } | null;
 };
 
 export const mockModelRegistry = ({
@@ -25,37 +27,47 @@ export const mockModelRegistry = ({
       type: 'Available',
     },
   ],
-}: MockModelRegistryType): ModelRegistryKind => ({
-  apiVersion: 'modelregistry.opendatahub.io/v1alpha1',
-  kind: 'ModelRegistry',
-  metadata: {
-    name,
-    creationTimestamp: '2024-03-14T08:01:42Z',
-    namespace,
-  },
-  spec: {
-    grpc: {},
-    rest: {},
-    istio: {
-      gateway: {
-        grpc: { tls: {} },
-        rest: { tls: {} },
-      },
+  sslRootCertificateConfigMap = null,
+  sslRootCertificateSecret = null,
+}: MockModelRegistryType): ModelRegistryKind => {
+  const data: ModelRegistryKind = {
+    apiVersion: 'modelregistry.opendatahub.io/v1alpha1',
+    kind: 'ModelRegistry',
+    metadata: {
+      name,
+      creationTimestamp: '2024-03-14T08:01:42Z',
+      namespace,
     },
-    postgres: {
-      database: 'model-registry',
-      host: 'model-registry-db',
-      passwordSecret: {
-        key: 'database-password',
-        name: 'model-registry-db',
+    spec: {
+      grpc: {},
+      rest: {},
+      istio: {
+        gateway: {
+          grpc: { tls: {} },
+          rest: { tls: {} },
+        },
+      },
+      mysql: {
+        database: 'model-registry',
+        host: 'model-registry-db',
+        passwordSecret: {
+          key: 'database-password',
+          name: 'model-registry-db',
+        },
+        port: 5432,
+        skipDBCreation: false,
+        username: 'mlmduser',
       },
-      port: 5432,
-      skipDBCreation: false,
-      sslMode: 'disable',
-      username: 'mlmduser',
     },
-  },
-  status: {
-    conditions,
-  },
-});
+    status: {
+      conditions,
+    },
+  };
+
+  if (sslRootCertificateConfigMap && data.spec.mysql) {
+    data.spec.mysql.sslRootCertificateConfigMap = sslRootCertificateConfigMap;
+  } else if (sslRootCertificateSecret && data.spec.mysql) {
+    data.spec.mysql.sslRootCertificateSecret = sslRootCertificateSecret;
+  }
+  return data;
+};
diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelRegistrySettings.ts b/frontend/src/__tests__/cypress/cypress/pages/modelRegistrySettings.ts
@@ -1,5 +1,7 @@
 import { appChrome } from './appChrome';
+import { Contextual } from './components/Contextual';
 import { K8sNameDescriptionField } from './components/subComponents/K8sNameDescriptionField';
+import { SearchSelector } from './components/subComponents/SearchSelector';
 
 export enum FormFieldSelector {
   NAME = '#mr-name',
@@ -29,6 +31,10 @@ export enum DatabaseDetailsTestId {
 class ModelRegistrySettings {
   k8sNameDescription = new K8sNameDescriptionField('mr');
 
+  resourceNameSelect = new SearchSelector('existing-ca-resource-selector');
+
+  keySelect = new SearchSelector('existing-ca-key-selector');
+
   visit(wait = true) {
     cy.visitWithLogin('/modelRegistrySettings');
     if (wait) {
@@ -130,6 +136,10 @@ class ModelRegistrySettings {
     return cy.findByTestId('existing-ca-radio');
   }
 
+  findUploadNewCertificateRadio() {
+    return cy.findByTestId('new-certificate-ca-radio');
+  }
+
   findAddSecureDbMRCheckbox() {
     return cy.findByTestId('add-secure-db-mr-checkbox');
   }
@@ -141,6 +151,32 @@ class ModelRegistrySettings {
   findExistingCAKeyInputToggle() {
     return cy.findByTestId('existing-ca-key-selector-toggle');
   }
+
+  getNewCertificateUpload() {
+    return new CertificateUpload(() => cy.findByTestId('certificate-upload'));
+  }
+
+  findErrorFetchingResourceAlert() {
+    return cy.findByTestId('error-fetching-resource-alert');
+  }
+
+  findCertificateNote() {
+    return cy.findByTestId('certificate-note');
+  }
+}
+
+class CertificateUpload extends Contextual<HTMLElement> {
+  findUploadCertificateInput() {
+    return this.find().find('[data-testid="new-certificate-upload"] input[type="file"]');
+  }
+
+  uploadPemFile(filePath: string) {
+    this.findUploadCertificateInput().selectFile([filePath], { force: true });
+  }
+
+  findRestrictedFileUploadHelptext() {
+    return cy.findByTestId('restricted-file-example-helpText');
+  }
 }
 
 export const modelRegistrySettings = new ModelRegistrySettings();
diff --git a/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts b/frontend/src/__tests__/cypress/cypress/support/commands/odh.ts
@@ -368,6 +368,10 @@ declare global {
           type: 'GET /api/modelRegistries',
           response: OdhResponse<K8sResourceListResult<ModelRegistryKind>>,
         ) => Cypress.Chainable<null>) &
+        ((
+          type: 'POST /api/modelRegistries',
+          response: OdhResponse<ModelRegistryKind>,
+        ) => Cypress.Chainable<null>) &
         ((
           type: 'PATCH /api/modelRegistries/:modelRegistryName',
           options: {
@@ -656,7 +660,7 @@ declare global {
         ) => Cypress.Chainable<null>) &
         ((
           type: 'GET /api/modelRegistryCertificates',
-          response: ListConfigSecretsResponse,
+          response: OdhResponse<ListConfigSecretsResponse>,
         ) => Cypress.Chainable<null>) &
         ((
           type: 'POST /api/connection-types',

diff --git a/...tend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/mockCertificate.pem b/...tend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/mockCertificate.pem
@@ -0,0 +1 @@
+sample certificate