From 6c63a8d4dc8448aa6c027891c1e555add43c287e Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 9 Feb 2021 13:01:23 -0500
Subject: [PATCH 1/8] preliminary work

---
 src/route-config.ts                                  | 12 ++++++++++++
 .../UserFederationKerberosSettings.tsx               |  4 ++++
 src/user-federation/UserFederationSection.tsx        |  9 +++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/route-config.ts b/src/route-config.ts
index 2c72f8b288..54c58c2f11 100644
--- a/src/route-config.ts
+++ b/src/route-config.ts
@@ -220,12 +220,24 @@ export const routes: RoutesFn = (t: TFunction) => [
     breadcrumb: t("common:settings"),
     access: "view-realm",
   },
+  {
+    path: "/:realm/user-federation/kerberos/new",
+    component: UserFederationKerberosSettings,
+    breadcrumb: t("common:settings"),
+    access: "view-realm",
+  },
   {
     path: "/:realm/user-federation/ldap/:id",
     component: UserFederationLdapSettings,
     breadcrumb: t("common:settings"),
     access: "view-realm",
   },
+  {
+    path: "/:realm/user-federation/ldap/new",
+    component: UserFederationLdapSettings,
+    breadcrumb: t("common:settings"),
+    access: "view-realm",
+  },
   {
     path: "/:realm/",
     component: DashboardSection,
diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index ffa9a6e197..410c30f471 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -92,6 +92,8 @@ export const UserFederationKerberosSettings = () => {
   }, []);
 
   const setupForm = (component: ComponentRepresentation) => {
+    console.log("READING as:");
+    console.log(component);
     Object.entries(component).map((entry) => {
       form.setValue(
         "config.allowPasswordAuthentication",
@@ -105,6 +107,8 @@ export const UserFederationKerberosSettings = () => {
   };
 
   const save = async (component: ComponentRepresentation) => {
+    console.log("SAVING as:");
+    console.log(component);
     try {
       await adminClient.components.update({ id }, component);
       setupForm(component as ComponentRepresentation);
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index fe316dbb18..13715a789e 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -26,6 +26,8 @@ import { useAdminClient, asyncStateFetch } from "../context/auth/AdminClient";
 import { useConfirmDialog } from "../components/confirm-dialog/ConfirmDialog";
 import "./user-federation.css";
 
+import { useHistory, useRouteMatch } from "react-router-dom";
+
 export const UserFederationSection = () => {
   const [userFederations, setUserFederations] = useState<
     ComponentRepresentation[]
@@ -37,6 +39,9 @@ export const UserFederationSection = () => {
   const [key, setKey] = useState(0);
   const refresh = () => setKey(new Date().getTime());
 
+  const { url } = useRouteMatch();
+  const history = useHistory();
+
   useEffect(() => {
     return asyncStateFetch(
       () => {
@@ -53,8 +58,8 @@ export const UserFederationSection = () => {
   }, [key]);
 
   const ufAddProviderDropdownItems = [
-    <DropdownItem key="itemLDAP">LDAP</DropdownItem>,
-    <DropdownItem key="itemKerberos">Kerberos</DropdownItem>,
+    <DropdownItem key="itemLDAP" onClick={() => history.push(`${url}/ldap/new`)}>LDAP</DropdownItem>,
+    <DropdownItem key="itemKerberos" onClick={() => history.push(`${url}/kerberos/new`)}>Kerberos</DropdownItem>,
   ];
 
   const learnMoreLinkProps = {

From 70f1629be0653860d1826b551ec9415c86ad34dc Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 9 Feb 2021 16:12:50 -0500
Subject: [PATCH 2/8] small update - id is an issue

---
 src/user-federation/UserFederationKerberosSettings.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index 410c30f471..5c5009182e 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -110,7 +110,11 @@ export const UserFederationKerberosSettings = () => {
     console.log("SAVING as:");
     console.log(component);
     try {
-      await adminClient.components.update({ id }, component);
+      if (id) {
+        await adminClient.components.update({ id }, component);
+      } else {
+        await adminClient.components.create(component);
+      }
       setupForm(component as ComponentRepresentation);
       addAlert(t("saveSuccess"), AlertVariant.success);
     } catch (error) {

From 1a78540c8fec0c54d2fc79c30b79f1cd7cc6c240 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Wed, 10 Feb 2021 16:54:21 -0500
Subject: [PATCH 3/8] kerberos save logic

---
 .../UserFederationKerberosSettings.tsx        | 65 +++++++++++--------
 src/user-federation/UserFederationSection.tsx | 14 +++-
 .../kerberos/KerberosSettingsRequired.tsx     | 15 +++--
 src/user-federation/messages.json             |  6 +-
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index 5c5009182e..d84d2d7f75 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -37,6 +37,7 @@ const KerberosSettingsHeader = ({
   toggleDeleteDialog,
 }: KerberosSettingsHeaderProps) => {
   const { t } = useTranslation("user-federation");
+  const { id } = useParams<{ id: string }>();
   const [toggleDisableDialog, DisableConfirm] = useConfirmDialog({
     titleKey: "user-federation:userFedDisableConfirmTitle",
     messageKey: "user-federation:userFedDisableConfirm",
@@ -49,24 +50,28 @@ const KerberosSettingsHeader = ({
   return (
     <>
       <DisableConfirm />
-      <ViewHeader
-        titleKey="Kerberos"
-        subKey=""
-        dropdownItems={[
-          <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
-            {t("deleteProvider")}
-          </DropdownItem>,
-        ]}
-        isEnabled={value === "true"}
-        onToggle={(value) => {
-          if (!value) {
-            toggleDisableDialog();
-          } else {
-            onChange("" + value);
-            save();
-          }
-        }}
-      />
+      {id === "new" ? (
+        <ViewHeader titleKey="Kerberos" subKey="" />
+      ) : (
+        <ViewHeader
+          titleKey="Kerberos"
+          subKey=""
+          dropdownItems={[
+            <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
+              {t("deleteProvider")}
+            </DropdownItem>,
+          ]}
+          isEnabled={value === "true"}
+          onToggle={(value) => {
+            if (!value) {
+              toggleDisableDialog();
+            } else {
+              onChange("" + value);
+              save();
+            }
+          }}
+        />
+      )}
     </>
   );
 };
@@ -92,8 +97,6 @@ export const UserFederationKerberosSettings = () => {
   }, []);
 
   const setupForm = (component: ComponentRepresentation) => {
-    console.log("READING as:");
-    console.log(component);
     Object.entries(component).map((entry) => {
       form.setValue(
         "config.allowPasswordAuthentication",
@@ -107,18 +110,24 @@ export const UserFederationKerberosSettings = () => {
   };
 
   const save = async (component: ComponentRepresentation) => {
-    console.log("SAVING as:");
-    console.log(component);
     try {
       if (id) {
-        await adminClient.components.update({ id }, component);
-      } else {
-        await adminClient.components.create(component);
+        if (id === "new") {
+          await adminClient.components.create(component);
+        } else {
+          await adminClient.components.update({ id }, component);
+        }
       }
       setupForm(component as ComponentRepresentation);
-      addAlert(t("saveSuccess"), AlertVariant.success);
+      addAlert(
+        t(id === "new" ? "createSuccess" : "saveSuccess"),
+        AlertVariant.success
+      );
     } catch (error) {
-      addAlert(`${t("saveError")} '${error}'`, AlertVariant.danger);
+      addAlert(
+        `${t(id === "new" ? "createError" : "saveError")} '${error}'`,
+        AlertVariant.danger
+      );
     }
   };
 
@@ -143,7 +152,7 @@ export const UserFederationKerberosSettings = () => {
       <DeleteConfirm />
       <Controller
         name="config.enabled[0]"
-        defaultValue={["true"]}
+        defaultValue={["true"][0]}
         control={form.control}
         render={({ onChange, value }) => (
           <KerberosSettingsHeader
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index 13715a789e..9948af9937 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -58,8 +58,18 @@ export const UserFederationSection = () => {
   }, [key]);
 
   const ufAddProviderDropdownItems = [
-    <DropdownItem key="itemLDAP" onClick={() => history.push(`${url}/ldap/new`)}>LDAP</DropdownItem>,
-    <DropdownItem key="itemKerberos" onClick={() => history.push(`${url}/kerberos/new`)}>Kerberos</DropdownItem>,
+    <DropdownItem
+      key="itemLDAP"
+      onClick={() => history.push(`${url}/ldap/new`)}
+    >
+      LDAP
+    </DropdownItem>,
+    <DropdownItem
+      key="itemKerberos"
+      onClick={() => history.push(`${url}/kerberos/new`)}
+    >
+      Kerberos
+    </DropdownItem>,
   ];
 
   const learnMoreLinkProps = {
diff --git a/src/user-federation/kerberos/KerberosSettingsRequired.tsx b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
index 9b8eb579e9..6d85aa923e 100644
--- a/src/user-federation/kerberos/KerberosSettingsRequired.tsx
+++ b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
@@ -11,6 +11,7 @@ import { useTranslation } from "react-i18next";
 import { UseFormMethods, Controller, useWatch } from "react-hook-form";
 
 import { FormAccess } from "../../components/form-access/FormAccess";
+import { useRealm } from "../../context/realm-context/RealmContext";
 
 import { HelpItem } from "../../components/help-enabler/HelpItem";
 import _ from "lodash";
@@ -29,6 +30,7 @@ export const KerberosSettingsRequired = ({
 }: KerberosSettingsRequiredProps) => {
   const { t } = useTranslation("user-federation");
   const helpText = useTranslation("user-federation-help").t;
+  const { realm } = useRealm();
 
   const [isEditModeDropdownOpen, setIsEditModeDropdownOpen] = useState(false);
 
@@ -62,18 +64,19 @@ export const KerberosSettingsRequired = ({
           isRequired
         >
           {/* These hidden fields are required so data object written back matches data retrieved */}
-          <TextInput
+          {/* <TextInput
             hidden
             type="text"
             id="kc-console-id"
             name="id"
             ref={form.register}
-          />
+          /> */}
           <TextInput
             hidden
             type="text"
             id="kc-console-providerId"
             name="providerId"
+            defaultValue="kerberos"
             ref={form.register}
           />
           <TextInput
@@ -81,6 +84,7 @@ export const KerberosSettingsRequired = ({
             type="text"
             id="kc-console-providerType"
             name="providerType"
+            defaultValue="org.keycloak.storage.UserStorageProvider"
             ref={form.register}
           />
           <TextInput
@@ -88,6 +92,7 @@ export const KerberosSettingsRequired = ({
             type="text"
             id="kc-console-parentId"
             name="parentId"
+            defaultValue={realm}
             ref={form.register}
           />
 
@@ -222,7 +227,7 @@ export const KerberosSettingsRequired = ({
           {" "}
           <Controller
             name="config.debug"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
@@ -251,7 +256,7 @@ export const KerberosSettingsRequired = ({
         >
           <Controller
             name="config.allowPasswordAuthentication"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
@@ -324,7 +329,7 @@ export const KerberosSettingsRequired = ({
         >
           <Controller
             name="config.updateProfileFirstLogin"
-            defaultValue={false}
+            defaultValue={["false"]}
             control={form.control}
             render={({ onChange, value }) => (
               <Switch
diff --git a/src/user-federation/messages.json b/src/user-federation/messages.json
index b40023f59f..c115a8f3fa 100644
--- a/src/user-federation/messages.json
+++ b/src/user-federation/messages.json
@@ -80,8 +80,10 @@
     "oneLevel": "One Level",
     "subtree": "Subtree",
 
-    "saveSuccess": "User federation successfully saved",
-    "saveError": "User federation could not be saved: {error}",
+    "saveSuccess": "User federation provider successfully saved",
+    "saveError": "User federation provider could not be saved: {error}",
+    "createSuccess": "User federation provider successfully created",
+    "createError": "User federation provider could not be created: {error}",
 
     "learnMore": "Learn more",
     "addNewProvider": "Add new provider",

From cf8451fe9d00383ad65d9f8159dab6b88b2bb678 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Mon, 15 Feb 2021 14:35:25 -0500
Subject: [PATCH 4/8] adding preliminary cypress tests

---
 src/components/keycloak-card/KeycloakCard.tsx |   2 +-
 .../UserFederationKerberosSettings.tsx        |   3 +-
 src/user-federation/UserFederationSection.tsx |   8 +-
 .../kerberos/KerberosSettingsRequired.tsx     |   4 +
 src/user-federation/shared/SettingsCache.tsx  |   2 +
 .../user_fed_kerberos_test.spec.ts            |  85 +++++++++++
 .../providers/CreateKerberosProviderPage.ts   | 133 ++++++++++++++++++
 tests/cypress/tsconfig.json                   |  10 ++
 8 files changed, 243 insertions(+), 4 deletions(-)
 create mode 100644 tests/cypress/integration/user_fed_kerberos_test.spec.ts
 create mode 100644 tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
 create mode 100644 tests/cypress/tsconfig.json

diff --git a/src/components/keycloak-card/KeycloakCard.tsx b/src/components/keycloak-card/KeycloakCard.tsx
index 8c36a538f0..acb2758caa 100644
--- a/src/components/keycloak-card/KeycloakCard.tsx
+++ b/src/components/keycloak-card/KeycloakCard.tsx
@@ -67,7 +67,7 @@ export const KeycloakCard = ({
             />
           )}
         </CardActions>
-        <CardTitle>{title}</CardTitle>
+        <CardTitle data-cy="keycloak-card-title">{title}</CardTitle>
       </CardHeader>
       <CardBody />
       <CardFooter>
diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index d84d2d7f75..e16afb281d 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -170,12 +170,13 @@ export const UserFederationKerberosSettings = () => {
         <SettingsCache form={form} showSectionHeading />
         <Form onSubmit={form.handleSubmit(save)}>
           <ActionGroup>
-            <Button variant="primary" type="submit">
+            <Button variant="primary" type="submit" data-cy="kerberos-save">
               {t("common:save")}
             </Button>
             <Button
               variant="link"
               onClick={() => history.push(`/${realm}/user-federation`)}
+              data-cy="kerberos-cancel"
             >
               {t("common:cancel")}
             </Button>
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index 9948af9937..1ebe6a2be9 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -47,7 +47,7 @@ export const UserFederationSection = () => {
       () => {
         const testParams: { [name: string]: string | number } = {
           parentId: realm,
-          type: "org.keycloak.storage.UserStorageProvider", // MF note that this is providerType in the output, but API call is still type
+          type: "org.keycloak.storage.UserStorageProvider",
         };
         return adminClient.components.find(testParams);
       },
@@ -172,7 +172,11 @@ export const UserFederationSection = () => {
             </TextContent>
             <hr className="pf-u-mb-lg" />
             <Gallery hasGutter>
-              <Card isHoverable>
+              <Card
+                isHoverable
+                onClick={() => history.push(`${url}/kerberos/new`)}
+                data-cy="kerberos-card"
+              >
                 <CardTitle>
                   <Split hasGutter>
                     <SplitItem>
diff --git a/src/user-federation/kerberos/KerberosSettingsRequired.tsx b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
index 6d85aa923e..e53e6c0259 100644
--- a/src/user-federation/kerberos/KerberosSettingsRequired.tsx
+++ b/src/user-federation/kerberos/KerberosSettingsRequired.tsx
@@ -107,6 +107,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateName")}`,
               },
             })}
+            data-cy="kerberos-name"
           />
           {form.errors.name && (
             <div className="error">{form.errors.name.message}</div>
@@ -136,6 +137,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateRealm")}`,
               },
             })}
+            data-cy="kerberos-realm"
           />
           {form.errors.config &&
             form.errors.config.kerberosRealm &&
@@ -169,6 +171,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateServerPrincipal")}`,
               },
             })}
+            data-cy="kerberos-principal"
           />
           {form.errors.config &&
             form.errors.config.serverPrincipal &&
@@ -202,6 +205,7 @@ export const KerberosSettingsRequired = ({
                 message: `${t("validateKeyTab")}`,
               },
             })}
+            data-cy="kerberos-keytab"
           />
           {form.errors.config &&
             form.errors.config.keyTab &&
diff --git a/src/user-federation/shared/SettingsCache.tsx b/src/user-federation/shared/SettingsCache.tsx
index ba41fb576a..69bc9b56c0 100644
--- a/src/user-federation/shared/SettingsCache.tsx
+++ b/src/user-federation/shared/SettingsCache.tsx
@@ -126,6 +126,7 @@ export const SettingsCache = ({
                 }}
                 selections={value}
                 variant={SelectVariant.single}
+                data-cy="kerberos-cache-policy"
               >
                 <SelectOption key={0} value={["DEFAULT"]} isPlaceholder />
                 <SelectOption key={1} value={["EVICT_DAILY"]} />
@@ -292,6 +293,7 @@ export const SettingsCache = ({
               id="kc-max-lifespan"
               name="config.maxLifespan[0]"
               ref={form.register}
+              data-cy="kerberos-cache-lifespan"
             />
           </FormGroup>
         ) : (
diff --git a/tests/cypress/integration/user_fed_kerberos_test.spec.ts b/tests/cypress/integration/user_fed_kerberos_test.spec.ts
new file mode 100644
index 0000000000..87bbac1ada
--- /dev/null
+++ b/tests/cypress/integration/user_fed_kerberos_test.spec.ts
@@ -0,0 +1,85 @@
+import LoginPage from "../support/pages/LoginPage";
+import SidebarPage from "../support/pages/admin_console/SidebarPage";
+// import ListingPage from "../support/pages/admin_console/ListingPage";
+import CreateKerberosProviderPage from "../support/pages/admin_console/manage/providers/CreateKerberosProviderPage";
+// import Masthead from "../support/pages/admin_console/Masthead";
+// import { wait } from "@testing-library/react";
+
+const loginPage = new LoginPage();
+// const masthead = new Masthead();
+const sidebarPage = new SidebarPage();
+// const listingPage = new ListingPage();
+const providersPage = new CreateKerberosProviderPage();
+
+// config info
+const kerberosName = "my-kerberos";
+const kerberosRealm = "my-realm";
+const kerberosPrincipal = "my-principal";
+const kerberosKeytab = "my-keytab";
+// const kerberosSecondName = "my-kerberos-2";
+
+const policy = "EVICT_WEEKLY"
+const kerberosDay = "Tuesday";
+const kerberosHour = "11";
+const kerberosMinute = "45";
+// const kerberosLifespan = "24";
+
+describe('User Fed Kerberos test', () => {
+    it('Kerberos provider creation from empty state', () => {
+        cy.visit("");
+        loginPage.logIn();
+
+        // CREATE FROM EMPTY STATE CARD PAGE
+        sidebarPage.goToUserFederation();
+        cy.get('[data-cy=kerberos-card]').click();
+        // cy.get('[data-cy=kerberos-name]').type("my-kerberos-provider");
+        providersPage.fillKerberosRequiredData(kerberosName, kerberosRealm, kerberosPrincipal, kerberosKeytab);
+        providersPage.save();
+        // TODO verify save message
+
+
+        // UPDATE
+        sidebarPage.goToUserFederation();
+        cy.get('[data-cy="keycloak-card-title"]').contains("my-kerberos").click();
+
+
+        providersPage.selectCacheType(policy);
+        // cy.get('[data-cy="kerberos-cache-policy"]').select(policy);
+        providersPage.fillCachedData( kerberosHour, kerberosMinute)
+
+
+
+
+        // TODO verify update message
+
+
+        // CREATE FROM USER FED CARD PAGE
+
+
+
+
+   
+    })
+    
+    // Messages:
+    // User federation provider successfully created
+    // The user federation provider has been deleted.
+
+
+
+
+    // it("should open kerberos empty settings page by clicking card", function () {
+
+    // //     // listingPage.goToCreateItem();
+    // // cy.get('[data-cy=kerberos-card]').click();
+    // // cy.get('[data-cy=kerberos-name]').type("my-kerberos-provider");
+    // //     // providersPage.fillKerberosRequiredData(kerberosName, kerberosRealm, kerberosPrincipal, kerberosKeytab);
+  
+    // //     // providersPage.save();
+  
+    // //     // The error should inform about duplicated name/id (THIS MESSAGE DOES NOT HAVE QUOTES AS THE OTHERS)
+    // //     // masthead.checkNotificationMessage(
+    // //     //   "Could not create role: Role with name admin already exists"
+    // //     // );
+    //    });
+})
\ No newline at end of file
diff --git a/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts b/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
new file mode 100644
index 0000000000..3355843086
--- /dev/null
+++ b/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
@@ -0,0 +1,133 @@
+export default class CreateKerberosProviderPage {
+  kerberosNameInput: string;
+  kerberosRealmInput: string;
+  kerberosPrincipalInput: string;
+  kerberosKeytabInput: string;
+
+  // clientScopeTypeDrpDwn: string;
+  // this.clientScopeTypeDrpDwn = "#kc-protocol";
+  // selectClientScopeType(clientScopeType: string) {
+  //   cy.get(this.clientScopeTypeDrpDwn).click();
+  //   cy.get(this.clientScopeTypeList).contains(clientScopeType).click();
+
+  //   return this;
+  // }
+
+  // kerberosCachePolicyInput: string;
+  kerberosCacheDayInput: string;
+  kerberosCacheDayList: string;
+  kerberosCacheHourInput: string;
+  kerberosCacheHourList: string;
+  kerberosCacheMinuteInput: string;
+  kerberosCacheMinuteList: string;
+  // kerberosCacheLifespanInput: string;
+
+  kerberosCachePolicyInput: string;
+  kerberosCachePolicyList: string;
+
+  realmRoleNameError: string;
+  realmRoleDescriptionInput: string;
+  saveBtn: string;
+  cancelBtn: string;
+
+  constructor() {
+    // cypress IDs
+    this.kerberosNameInput = "data-cy=kerberos-name";
+    this.kerberosRealmInput = "data-cy=kerberos-realm";
+    this.kerberosPrincipalInput = "data-cy=kerberos-principal";
+    this.kerberosKeytabInput = "data-cy=kerberos-keytab";
+
+    this.kerberosCachePolicyInput = "#kc-cache-policy";
+    this.kerberosCachePolicyList = "#kc-cache-policy + ul";
+
+    this.kerberosCacheDayInput = "#kc-eviction-day";
+    this.kerberosCacheDayList = "#kc-eviction-day + ul";
+    this.kerberosCacheHourInput = "#kc-eviction-hour";
+    this.kerberosCacheHourList = "#kc-eviction-hour + ul";
+    this.kerberosCacheMinuteInput = "#kc-eviction-minute";
+    this.kerberosCacheMinuteList = "#kc-eviction-minute + ul";
+    // this.kerberosCacheLifespanInput = "data-cy=kerberos-cache-lifespan";
+
+    this.realmRoleNameError = "#kc-name-helper";
+    this.realmRoleDescriptionInput = "#kc-role-description";
+
+    this.saveBtn = "data-cy=kerberos-save";
+    this.cancelBtn = "data-cy=kerberos-cancel";
+
+    // this.cardTitle = "keycloak-card-title";
+  }
+
+  //#region Required Settings
+  fillKerberosRequiredData(
+    name: string,
+    realm: string,
+    principal: string,
+    keytab: string
+  ) {
+    // cy.get(this.realmRoleNameInput).clear();
+    if (name) {
+      cy.get(`[${this.kerberosNameInput}]`).type(name);
+    }
+    if (realm) {
+      cy.get(`[${this.kerberosRealmInput}]`).type(realm);
+    }
+    if (principal) {
+      cy.get(`[${this.kerberosPrincipalInput}]`).type(principal);
+    }
+    if (keytab) {
+      cy.get(`[${this.kerberosKeytabInput}]`).type(keytab);
+    }
+
+    return this;
+  }
+
+  selectCacheType(cacheType: string) {
+    cy.get(this.kerberosCachePolicyInput).click();
+
+    cy.get(this.kerberosCachePolicyList).contains(cacheType).click();
+
+    return this;
+  }
+
+  // fillCachedData(day: string, hour: string, minute: string) {
+    fillCachedData(hour: string, minute: string) {
+      // cy.get(this.realmRoleNameInput).clear();
+    // if (policy) {
+    //   cy.get(`[${this.kerberosNameInput}]`).type(policy);
+    // }
+    // if (day) {
+    //   cy.get(this.kerberosCacheDayInput).click();
+    //   // cy.get(this.kerberosCacheDayInput).contains(day).click();
+    //   cy.get(this.kerberosCacheDayInput).contains().click();
+
+    // }
+    if (hour) {
+      cy.get(this.kerberosCacheHourInput).click();
+      cy.get(this.kerberosCacheHourInput).contains(hour).click();
+    }
+    if (minute) {
+      cy.get(this.kerberosCacheMinuteInput).click();
+      cy.get(this.kerberosCacheMinuteInput).contains(minute).click();
+    }
+    return this;
+  }
+
+  // checkRealmRoleNameRequiredMessage(exist = true) {
+  //   cy.get(this.realmRoleNameError).should((!exist ? "not." : "") + "exist");
+
+  //   return this;
+  // }
+  //#endregion
+
+  save() {
+    cy.get(`[${this.saveBtn}]`).click();
+
+    return this;
+  }
+
+  cancel() {
+    cy.get(this.cancelBtn).click();
+
+    return this;
+  }
+}
diff --git a/tests/cypress/tsconfig.json b/tests/cypress/tsconfig.json
new file mode 100644
index 0000000000..08bba6121a
--- /dev/null
+++ b/tests/cypress/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+      "target": "es5",
+      "lib": ["es5", "dom"],
+      "types": ["cypress"]
+    },
+    "include": [
+      "**/*.ts"
+    ]
+  }
\ No newline at end of file

From 8c4d6d4eb4d2337597fe5305ceedee6f1073c74c Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 16 Feb 2021 14:42:30 -0500
Subject: [PATCH 5/8] complete suite of kerberos cypress tests

---
 src/components/keycloak-card/KeycloakCard.tsx |   1 +
 src/components/view-header/ViewHeader.tsx     |   1 +
 .../UserFederationKerberosSettings.tsx        |   6 +-
 src/user-federation/UserFederationSection.tsx |   1 +
 src/user-federation/shared/SettingsCache.tsx  |   1 +
 .../user_fed_kerberos_test.spec.ts            | 249 ++++++++++++++----
 .../providers/CreateKerberosProviderPage.ts   |  66 +----
 7 files changed, 213 insertions(+), 112 deletions(-)

diff --git a/src/components/keycloak-card/KeycloakCard.tsx b/src/components/keycloak-card/KeycloakCard.tsx
index acb2758caa..f8dda497e5 100644
--- a/src/components/keycloak-card/KeycloakCard.tsx
+++ b/src/components/keycloak-card/KeycloakCard.tsx
@@ -64,6 +64,7 @@ export const KeycloakCard = ({
               onClick={(e) => handleCardMenuClick(e)}
               isOpen={isDropdownOpen}
               dropdownItems={dropdownItems}
+              data-cy={`${title}-dropdown`}
             />
           )}
         </CardActions>
diff --git a/src/components/view-header/ViewHeader.tsx b/src/components/view-header/ViewHeader.tsx
index be5ebfd01e..05bd28c6ec 100644
--- a/src/components/view-header/ViewHeader.tsx
+++ b/src/components/view-header/ViewHeader.tsx
@@ -112,6 +112,7 @@ export const ViewHeader = ({
                       }
                       isOpen={isDropdownOpen}
                       dropdownItems={dropdownItems}
+                      data-cy="action-dropdown"
                     />
                   </ToolbarItem>
                 )}
diff --git a/src/user-federation/UserFederationKerberosSettings.tsx b/src/user-federation/UserFederationKerberosSettings.tsx
index e16afb281d..2ea8b81e8e 100644
--- a/src/user-federation/UserFederationKerberosSettings.tsx
+++ b/src/user-federation/UserFederationKerberosSettings.tsx
@@ -57,7 +57,11 @@ const KerberosSettingsHeader = ({
           titleKey="Kerberos"
           subKey=""
           dropdownItems={[
-            <DropdownItem key="delete" onClick={() => toggleDeleteDialog()}>
+            <DropdownItem
+              key="delete"
+              onClick={() => toggleDeleteDialog()}
+              data-cy="delete-provider-cmd"
+            >
               {t("deleteProvider")}
             </DropdownItem>,
           ]}
diff --git a/src/user-federation/UserFederationSection.tsx b/src/user-federation/UserFederationSection.tsx
index 1ebe6a2be9..b7cd3ce9d6 100644
--- a/src/user-federation/UserFederationSection.tsx
+++ b/src/user-federation/UserFederationSection.tsx
@@ -110,6 +110,7 @@ export const UserFederationSection = () => {
           onClick={() => {
             toggleDeleteForCard(userFederation.id!);
           }}
+          data-cy="card-delete"
         >
           {t("common:delete")}
         </DropdownItem>,
diff --git a/src/user-federation/shared/SettingsCache.tsx b/src/user-federation/shared/SettingsCache.tsx
index 69bc9b56c0..2e15db8d68 100644
--- a/src/user-federation/shared/SettingsCache.tsx
+++ b/src/user-federation/shared/SettingsCache.tsx
@@ -156,6 +156,7 @@ export const SettingsCache = ({
               control={form.control}
               render={({ onChange, value }) => (
                 <Select
+                  data-cy="cache-day"
                   toggleId="kc-eviction-day"
                   required
                   onToggle={() =>
diff --git a/tests/cypress/integration/user_fed_kerberos_test.spec.ts b/tests/cypress/integration/user_fed_kerberos_test.spec.ts
index 87bbac1ada..e469c48f31 100644
--- a/tests/cypress/integration/user_fed_kerberos_test.spec.ts
+++ b/tests/cypress/integration/user_fed_kerberos_test.spec.ts
@@ -1,85 +1,224 @@
 import LoginPage from "../support/pages/LoginPage";
 import SidebarPage from "../support/pages/admin_console/SidebarPage";
-// import ListingPage from "../support/pages/admin_console/ListingPage";
 import CreateKerberosProviderPage from "../support/pages/admin_console/manage/providers/CreateKerberosProviderPage";
-// import Masthead from "../support/pages/admin_console/Masthead";
-// import { wait } from "@testing-library/react";
+import Masthead from "../support/pages/admin_console/Masthead";
+import ModalUtils from "../support/util/ModalUtils";
 
 const loginPage = new LoginPage();
-// const masthead = new Masthead();
+const masthead = new Masthead();
 const sidebarPage = new SidebarPage();
-// const listingPage = new ListingPage();
 const providersPage = new CreateKerberosProviderPage();
+const modalUtils = new ModalUtils();
 
-// config info
-const kerberosName = "my-kerberos";
-const kerberosRealm = "my-realm";
-const kerberosPrincipal = "my-principal";
-const kerberosKeytab = "my-keytab";
-// const kerberosSecondName = "my-kerberos-2";
+const firstKerberosName = "my-kerberos";
+const firstKerberosRealm = "my-realm";
+const firstKerberosPrincipal = "my-principal";
+const firstKerberosKeytab = "my-keytab";
 
-const policy = "EVICT_WEEKLY"
-const kerberosDay = "Tuesday";
-const kerberosHour = "11";
-const kerberosMinute = "45";
-// const kerberosLifespan = "24";
+const secondKerberosName = `${firstKerberosName}-2`;
+const secondKerberosRealm = `${firstKerberosRealm}-2`;
+const secondKerberosPrincipal = `${firstKerberosPrincipal}-2`;
+const secondKerberosKeytab = `${firstKerberosKeytab}-2`;
 
-describe('User Fed Kerberos test', () => {
-    it('Kerberos provider creation from empty state', () => {
-        cy.visit("");
-        loginPage.logIn();
+const defaultPolicy = "DEFAULT";
+const newPolicy = "EVICT_WEEKLY";
+const defaultKerberosDay = "Sunday";
+const defaultKerberosHour = "00";
+const defaultKerberosMinute = "00";
+const newKerberosDay = "Wednesday";
+const newKerberosHour = "15";
+const newKerberosMinute = "55";
 
-        // CREATE FROM EMPTY STATE CARD PAGE
-        sidebarPage.goToUserFederation();
-        cy.get('[data-cy=kerberos-card]').click();
-        // cy.get('[data-cy=kerberos-name]').type("my-kerberos-provider");
-        providersPage.fillKerberosRequiredData(kerberosName, kerberosRealm, kerberosPrincipal, kerberosKeytab);
-        providersPage.save();
-        // TODO verify save message
+const createdSuccessMessage = "User federation provider successfully created";
+const savedSuccessMessage = "User federation provider successfully saved";
+const deletedSuccessMessage = "The user federation provider has been deleted.";
+const deleteModalTitle = "Delete user federation provider?";
+const disableModalTitle = "Disable user federation provider?";
 
+describe("User Fed Kerberos tests", () => {
+  it("Create Kerberos provider from empty state", () => {
+    cy.visit("");
+    loginPage.logIn();
 
-        // UPDATE
-        sidebarPage.goToUserFederation();
-        cy.get('[data-cy="keycloak-card-title"]').contains("my-kerberos").click();
+    sidebarPage.goToUserFederation();
+    cy.get("[data-cy=kerberos-card]").click();
 
+    providersPage.fillKerberosRequiredData(
+      firstKerberosName,
+      firstKerberosRealm,
+      firstKerberosPrincipal,
+      firstKerberosKeytab
+    );
+    providersPage.save();
 
-        providersPage.selectCacheType(policy);
-        // cy.get('[data-cy="kerberos-cache-policy"]').select(policy);
-        providersPage.fillCachedData( kerberosHour, kerberosMinute)
+    masthead.checkNotificationMessage(createdSuccessMessage);
+    sidebarPage.goToUserFederation();
+  });
 
+  it("Update an existing Kerberos provider and save", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
 
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
 
+    cy.contains(defaultKerberosDay).click();
+    cy.contains(newKerberosDay).click();
 
-        // TODO verify update message
+    cy.contains(defaultKerberosHour).click();
+    cy.contains(newKerberosHour).click();
 
+    cy.contains(defaultKerberosMinute).click();
+    cy.contains(newKerberosMinute).click();
 
-        // CREATE FROM USER FED CARD PAGE
+    providersPage.save();
+    masthead.checkNotificationMessage(savedSuccessMessage);
 
+    sidebarPage.goToUserFederation();
+    cy.wait(1000);
 
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
 
+    expect(cy.contains(newPolicy).should("exist"));
+    expect(cy.contains(defaultPolicy).should("not.exist"));
+  });
 
-   
-    })
-    
-    // Messages:
-    // User federation provider successfully created
-    // The user federation provider has been deleted.
+  it("Change existing Kerberos provider and click button to cancel", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
 
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
 
+    cy.contains(newKerberosDay).click();
+    cy.contains(defaultKerberosDay).click();
 
+    cy.contains(newKerberosHour).click();
+    cy.contains(defaultKerberosHour).click();
 
-    // it("should open kerberos empty settings page by clicking card", function () {
+    cy.contains(newKerberosMinute).click();
+    cy.contains(defaultKerberosMinute).click();
 
-    // //     // listingPage.goToCreateItem();
-    // // cy.get('[data-cy=kerberos-card]').click();
-    // // cy.get('[data-cy=kerberos-name]').type("my-kerberos-provider");
-    // //     // providersPage.fillKerberosRequiredData(kerberosName, kerberosRealm, kerberosPrincipal, kerberosKeytab);
-  
-    // //     // providersPage.save();
-  
-    // //     // The error should inform about duplicated name/id (THIS MESSAGE DOES NOT HAVE QUOTES AS THE OTHERS)
-    // //     // masthead.checkNotificationMessage(
-    // //     //   "Could not create role: Role with name admin already exists"
-    // //     // );
-    //    });
-})
\ No newline at end of file
+    providersPage.cancel();
+
+    cy.wait(1000);
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+    providersPage.selectCacheType(newPolicy);
+
+    expect(cy.contains(newKerberosDay).should("exist"));
+    expect(cy.contains(newKerberosHour).should("exist"));
+    expect(cy.contains(newKerberosMinute).should("exist"));
+
+    expect(cy.contains(defaultKerberosMinute).should("not.exist"));
+
+    sidebarPage.goToUserFederation();
+  });
+
+  it("Disable an existing Kerberos provider", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+
+    providersPage.disableEnabledSwitch();
+
+    modalUtils.checkModalTitle(disableModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+    expect(cy.contains("Disabled").should("exist"));
+  });
+
+  it("Enable an existing previously-disabled Kerberos provider", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+
+    providersPage.enableEnabledSwitch();
+    masthead.checkNotificationMessage(savedSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+
+    cy.wait(1000);
+    expect(cy.contains("Enabled").should("exist"));
+  });
+
+  it("Create new Kerberos provider using the New Provider dropdown", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.contains("Add new provider").click();
+    cy.contains("Kerberos").click();
+    providersPage.fillKerberosRequiredData(
+      secondKerberosName,
+      secondKerberosRealm,
+      secondKerberosPrincipal,
+      secondKerberosKeytab
+    );
+    providersPage.save();
+    masthead.checkNotificationMessage(createdSuccessMessage);
+
+    sidebarPage.goToUserFederation();
+  });
+
+  it("Delete a Kerberos provider from card view using the card's menu", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-cy="my-kerberos-2-dropdown"]').click();
+    cy.get('[data-cy="card-delete"]').click();
+
+    modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(deletedSuccessMessage);
+  });
+
+  it("Delete a Kerberos provider using the Settings view's Action menu", () => {
+    cy.visit("");
+    loginPage.logIn();
+    sidebarPage.goToUserFederation();
+
+    cy.get('[data-cy="keycloak-card-title"]')
+      .contains(firstKerberosName)
+      .click();
+    cy.wait(1000);
+
+    cy.get('[data-cy="action-dropdown"]').click();
+    cy.get('[data-cy="delete-provider-cmd"]').click();
+
+    modalUtils.checkModalTitle(deleteModalTitle).confirmModal();
+
+    masthead.checkNotificationMessage(deletedSuccessMessage);
+  });
+});
diff --git a/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts b/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
index 3355843086..32b8319aa1 100644
--- a/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
+++ b/tests/cypress/support/pages/admin_console/manage/providers/CreateKerberosProviderPage.ts
@@ -4,41 +4,27 @@ export default class CreateKerberosProviderPage {
   kerberosPrincipalInput: string;
   kerberosKeytabInput: string;
 
-  // clientScopeTypeDrpDwn: string;
-  // this.clientScopeTypeDrpDwn = "#kc-protocol";
-  // selectClientScopeType(clientScopeType: string) {
-  //   cy.get(this.clientScopeTypeDrpDwn).click();
-  //   cy.get(this.clientScopeTypeList).contains(clientScopeType).click();
+  kerberosEnabledInput: string;
 
-  //   return this;
-  // }
-
-  // kerberosCachePolicyInput: string;
   kerberosCacheDayInput: string;
   kerberosCacheDayList: string;
   kerberosCacheHourInput: string;
   kerberosCacheHourList: string;
   kerberosCacheMinuteInput: string;
   kerberosCacheMinuteList: string;
-  // kerberosCacheLifespanInput: string;
-
   kerberosCachePolicyInput: string;
   kerberosCachePolicyList: string;
 
-  realmRoleNameError: string;
-  realmRoleDescriptionInput: string;
   saveBtn: string;
   cancelBtn: string;
 
   constructor() {
-    // cypress IDs
     this.kerberosNameInput = "data-cy=kerberos-name";
     this.kerberosRealmInput = "data-cy=kerberos-realm";
     this.kerberosPrincipalInput = "data-cy=kerberos-principal";
     this.kerberosKeytabInput = "data-cy=kerberos-keytab";
 
-    this.kerberosCachePolicyInput = "#kc-cache-policy";
-    this.kerberosCachePolicyList = "#kc-cache-policy + ul";
+    this.kerberosEnabledInput = "#Kerberos-switch";
 
     this.kerberosCacheDayInput = "#kc-eviction-day";
     this.kerberosCacheDayList = "#kc-eviction-day + ul";
@@ -46,15 +32,11 @@ export default class CreateKerberosProviderPage {
     this.kerberosCacheHourList = "#kc-eviction-hour + ul";
     this.kerberosCacheMinuteInput = "#kc-eviction-minute";
     this.kerberosCacheMinuteList = "#kc-eviction-minute + ul";
-    // this.kerberosCacheLifespanInput = "data-cy=kerberos-cache-lifespan";
-
-    this.realmRoleNameError = "#kc-name-helper";
-    this.realmRoleDescriptionInput = "#kc-role-description";
+    this.kerberosCachePolicyInput = "#kc-cache-policy";
+    this.kerberosCachePolicyList = "#kc-cache-policy + ul";
 
     this.saveBtn = "data-cy=kerberos-save";
     this.cancelBtn = "data-cy=kerberos-cancel";
-
-    // this.cardTitle = "keycloak-card-title";
   }
 
   //#region Required Settings
@@ -64,7 +46,6 @@ export default class CreateKerberosProviderPage {
     principal: string,
     keytab: string
   ) {
-    // cy.get(this.realmRoleNameInput).clear();
     if (name) {
       cy.get(`[${this.kerberosNameInput}]`).type(name);
     }
@@ -77,57 +58,30 @@ export default class CreateKerberosProviderPage {
     if (keytab) {
       cy.get(`[${this.kerberosKeytabInput}]`).type(keytab);
     }
-
     return this;
   }
 
   selectCacheType(cacheType: string) {
     cy.get(this.kerberosCachePolicyInput).click();
-
     cy.get(this.kerberosCachePolicyList).contains(cacheType).click();
-
     return this;
   }
 
-  // fillCachedData(day: string, hour: string, minute: string) {
-    fillCachedData(hour: string, minute: string) {
-      // cy.get(this.realmRoleNameInput).clear();
-    // if (policy) {
-    //   cy.get(`[${this.kerberosNameInput}]`).type(policy);
-    // }
-    // if (day) {
-    //   cy.get(this.kerberosCacheDayInput).click();
-    //   // cy.get(this.kerberosCacheDayInput).contains(day).click();
-    //   cy.get(this.kerberosCacheDayInput).contains().click();
-
-    // }
-    if (hour) {
-      cy.get(this.kerberosCacheHourInput).click();
-      cy.get(this.kerberosCacheHourInput).contains(hour).click();
-    }
-    if (minute) {
-      cy.get(this.kerberosCacheMinuteInput).click();
-      cy.get(this.kerberosCacheMinuteInput).contains(minute).click();
-    }
-    return this;
+  disableEnabledSwitch() {
+    cy.get(this.kerberosEnabledInput).uncheck({ force: true });
   }
 
-  // checkRealmRoleNameRequiredMessage(exist = true) {
-  //   cy.get(this.realmRoleNameError).should((!exist ? "not." : "") + "exist");
-
-  //   return this;
-  // }
-  //#endregion
+  enableEnabledSwitch() {
+    cy.get(this.kerberosEnabledInput).check({ force: true });
+  }
 
   save() {
     cy.get(`[${this.saveBtn}]`).click();
-
     return this;
   }
 
   cancel() {
-    cy.get(this.cancelBtn).click();
-
+    cy.get(`[${this.cancelBtn}]`).click();
     return this;
   }
 }

From 8345f5cb3d869d1e3d6f106d123734d030d1fc04 Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 16 Feb 2021 14:45:50 -0500
Subject: [PATCH 6/8] fix broken test

---
 .../add/__tests__/__snapshots__/MapperDialog.test.tsx.snap       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
index 6278887e11..d690e9aa8e 100644
--- a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
+++ b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
@@ -21009,7 +21009,6 @@ exports[`<MapperDialog/> should return selected protocol mapping type on click 1
                             <ul
                               aria-label="chooseAMapperType"
                               className="pf-c-data-list pf-m-compact pf-m-grid-md"
-                              style={Object {}}
                             >
                               <DataListItem
                                 aria-labelledby="User Realm Role"

From 2f0b343661eae72b67ce890d907b6371d6ca649a Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 16 Feb 2021 15:29:06 -0500
Subject: [PATCH 7/8] put id higher in props

---
 src/components/keycloak-card/KeycloakCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/keycloak-card/KeycloakCard.tsx b/src/components/keycloak-card/KeycloakCard.tsx
index f8dda497e5..163869b592 100644
--- a/src/components/keycloak-card/KeycloakCard.tsx
+++ b/src/components/keycloak-card/KeycloakCard.tsx
@@ -58,13 +58,13 @@ export const KeycloakCard = ({
         <CardActions>
           {dropdownItems && (
             <Dropdown
+              data-cy={`${title}-dropdown`}
               isPlain
               position={"right"}
               toggle={<KebabToggle onToggle={onDropdownToggle} />}
               onClick={(e) => handleCardMenuClick(e)}
               isOpen={isDropdownOpen}
               dropdownItems={dropdownItems}
-              data-cy={`${title}-dropdown`}
             />
           )}
         </CardActions>

From 757288ded9cd215ad533b664676204f39b99a25b Mon Sep 17 00:00:00 2001
From: mfrances <mfrances@redhat.com>
Date: Tue, 16 Feb 2021 15:52:45 -0500
Subject: [PATCH 8/8] update test snap

---
 .../add/__tests__/__snapshots__/MapperDialog.test.tsx.snap       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
index d690e9aa8e..6278887e11 100644
--- a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
+++ b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
@@ -21009,6 +21009,7 @@ exports[`<MapperDialog/> should return selected protocol mapping type on click 1
                             <ul
                               aria-label="chooseAMapperType"
                               className="pf-c-data-list pf-m-compact pf-m-grid-md"
+                              style={Object {}}
                             >
                               <DataListItem
                                 aria-labelledby="User Realm Role"