From 77ee74952d105973d04f9b02eaf8e455e8be6fc3 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 30 Sep 2022 08:55:02 -0700
Subject: [PATCH] Fixed UI Tests

---
 ui/src/app/metadata/domain/index.test.js         |  4 ++--
 .../source/definition/SourceDefinition.test.js   |  1 +
 ui/src/app/metadata/hooks/schema.test.js         |  2 ++
 .../wizard/MetadataSourceProtocolSelector.js     |  2 +-
 ui/src/testing/uiSchema.js                       | 16 +++++++++++++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/metadata/domain/index.test.js b/ui/src/app/metadata/domain/index.test.js
index dd5d62c63..537d701a2 100644
--- a/ui/src/app/metadata/domain/index.test.js
+++ b/ui/src/app/metadata/domain/index.test.js
@@ -1,7 +1,7 @@
 import { NameIDFilterEditor } from './filter/definition/NameIdFilterDefinition';
 import { getDefinition } from './index';
 import { FileSystemMetadataProviderEditor } from './provider/definition/FileSystemMetadataProviderDefinition';
-import { SourceEditor } from './source/definition/SourceDefinition';
+import { OidcSourceEditor } from './source/definition/OidcSourceDefinition';
 
 jest.mock('../../App.constant', () => ({
     get API_BASE_PATH() {
@@ -11,7 +11,7 @@ jest.mock('../../App.constant', () => ({
 
 describe('getDefinitions method', () => {
     it('should retrieve the definition', () => {
-        expect(getDefinition('source')).toBe(SourceEditor);
+        expect(getDefinition('OIDC')).toBe(OidcSourceEditor);
         expect(getDefinition('NameIDFormat')).toBe(NameIDFilterEditor);
         expect(getDefinition('FilesystemMetadataResolver')).toBe(FileSystemMetadataProviderEditor);
     });
diff --git a/ui/src/app/metadata/domain/source/definition/SourceDefinition.test.js b/ui/src/app/metadata/domain/source/definition/SourceDefinition.test.js
index 92801c052..51a3d3217 100644
--- a/ui/src/app/metadata/domain/source/definition/SourceDefinition.test.js
+++ b/ui/src/app/metadata/domain/source/definition/SourceDefinition.test.js
@@ -1,4 +1,5 @@
 import { SourceBase } from './SourceDefinition';
+jest.mock('../../metadata/hoc/MetadataSchema');
 
 jest.mock('../../../../App.constant', () => ({
     get API_BASE_PATH() {
diff --git a/ui/src/app/metadata/hooks/schema.test.js b/ui/src/app/metadata/hooks/schema.test.js
index b1d68e55a..cd881e6eb 100644
--- a/ui/src/app/metadata/hooks/schema.test.js
+++ b/ui/src/app/metadata/hooks/schema.test.js
@@ -15,6 +15,8 @@ jest.mock('../../App.constant', () => ({
     }
 }));
 
+jest.mock('../../metadata/hoc/MetadataSchema');
+
 describe('useUiSchema', () => {
     let realUseMemo;
     let useMemoMock;
diff --git a/ui/src/app/metadata/wizard/MetadataSourceProtocolSelector.js b/ui/src/app/metadata/wizard/MetadataSourceProtocolSelector.js
index ee7b55cfb..c273b8df3 100644
--- a/ui/src/app/metadata/wizard/MetadataSourceProtocolSelector.js
+++ b/ui/src/app/metadata/wizard/MetadataSourceProtocolSelector.js
@@ -8,7 +8,7 @@ import Translate from '../../i18n/components/translate';
 import { InfoIcon } from '../../form/component/InfoIcon';
 import { useTranslator } from '../../i18n/hooks';
 import { useMetadataSources } from '../hooks/api';
-import Button from 'react-bootstrap/esm/Button';
+import Button from 'react-bootstrap/Button';
 
 export function MetadataSourceProtocolSelector({ types = [], loading, children}) {
 
diff --git a/ui/src/testing/uiSchema.js b/ui/src/testing/uiSchema.js
index a58082e38..7a181d1ca 100644
--- a/ui/src/testing/uiSchema.js
+++ b/ui/src/testing/uiSchema.js
@@ -9,6 +9,7 @@ const schema = {
             {
                 "size": 6,
                 "fields": [
+                    "protocol",
                     "serviceProviderName",
                     "entityId",
                     "organization"
@@ -27,7 +28,7 @@ const schema = {
                 ]
             },
             {
-                "size": 6,
+                "size": 12,
                 "fields": [
                     "serviceProviderSsoDescriptor"
                 ]
@@ -135,7 +136,7 @@ const schema = {
                     "fields": [
                         "authenticationRequestsSigned",
                         "wantAssertionsSigned",
-                        "x509Certificates"
+                        "keyDescriptors"
                     ]
                 }
             ]
@@ -152,11 +153,17 @@ const schema = {
                 "inline": true
             }
         },
-        "x509Certificates": {
+        "keyDescriptors": {
             "type": "certificate",
             "ui:options": {
                 "orderable": false
             },
+            "ui:order": [
+                "name",
+                "elementType",
+                "type",
+                "value",
+            ],
             "items": {
                 "type": {
                     "ui:widget": "radio",
@@ -208,6 +215,9 @@ const schema = {
     "serviceProviderName": {},
     "entityId": {},
     "organization": {},
+    "protocol": {
+        "ui:readonly": true,
+    },
     "ui:disabled": false
 };