fix login tests

rucio · Oct 17, 2023 · 55733f7 · 55733f7
1 parent fa1469b
commit 55733f7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/src/component-library/Demos/01_1_Login_OIDC.stories.ts b/src/component-library/Demos/01_1_Login_OIDC.stories.ts
@@ -61,7 +61,7 @@ export const AMultiVOOIDCEnabledLogin: Story = {
         loginViewModel: {
             status: 'success',
             x509Enabled: true,
-            oidcEnabled: false,
+            oidcEnabled: true,
             oidcProviders: [cernOIDCProvider],
             multiVOEnabled: true,
             voList: [voAtlas, voCMS, voLHCb],

diff --git a/src/component-library/Pages/Login/Login.tsx b/src/component-library/Pages/Login/Login.tsx
@@ -134,6 +134,7 @@ export const Login = ({
                     className="flex justify-center flex-col space-y-4"
                     aria-label="Choose Login Method"
                 >
+                    { loginViewModel.oidcEnabled == true ?
                     <div
                         className={twMerge(
                             "flex flex-row justify-center space-x-2",
@@ -145,6 +146,7 @@ export const Login = ({
                             return (<Button theme='orange' label={provider.name} key={index.toString()} icon={<MdAccountCircle />} />)
                         })}
                     </div>
+                    : <></>}
 
                     <Button
                         label="x509"

diff --git a/test/component/Login.test.tsx b/test/component/Login.test.tsx
@@ -49,7 +49,7 @@ describe("Login Page Test", () => {
         await act( async () => render(<Login/>))
 
         // Check OIDC buttons are present but NOT rendered
-        oidcProviders.map((provider) => {
+        voList[1].oidcProviders.map((provider) => {
             const OIDCButton = screen.getByText(provider.name)
             expect(OIDCButton).toBeInTheDocument()
         })
@@ -107,8 +107,8 @@ describe("Login Page Test", () => {
         await act( async () => render(<Login/>))
 
         // Check OIDC buttons: 2 pieces and collapsed
-        const oidcParent = screen.getByRole('generic', {name: /OIDC Login Buttons/})
-        expect(oidcParent.className).toContain('hidden')
+        const oidcParent = screen.queryByRole('generic', { name: /OIDC Login Buttons/ });
+        expect(oidcParent).toBeNull();
 
     })
 

diff --git a/test/fixtures/multi-vo-fixtures.ts b/test/fixtures/multi-vo-fixtures.ts
@@ -14,8 +14,8 @@ export const getSampleVOs = (): VO[] => {
         name: "CMS",
         shortName: "cms",
         logoUrl: "https://cms.ch/logo.png",
-        oidcEnabled: false,
-        oidcProviders: [],
+        oidcEnabled: true,
+        oidcProviders: [getSampleOIDCProviders()[0]],
     };
     vos.push(atlas);
     vos.push(cms);

diff --git a/tools/check-env.ts b/tools/check-env.ts