Skip to content

Commit

Permalink
fix: tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mistahj67
mistahj67 committed Oct 16, 2024
1 parent e700e51 commit d8b8911
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 61 deletions.
8 changes: 4 additions & 4 deletions packages/javascript/bh-shared-ui/src/components/CreateMenu/CreateMenu.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ describe('CreateMenu', () => {
{ title: 'SAML Provider', onClick: openSAMLProviderDialog },
{ title: 'OIDC Provider', onClick: openOIDCProviderDialog },
]}
menuItems={[{ title: 'SAML Provider', onClick: openSAMLProviderDialog }]}
menuItems={[{ title: 'Create SAML Provider', onClick: openSAMLProviderDialog }]}
/>
);

expect(screen.getByRole('button', { name: /create provider/i })).toBeInTheDocument();
expect(screen.getByRole('button', { name: /create saml provider/i })).toBeInTheDocument();
});

it('calls openSAMLProviderDialog when create provider button is clicked', async () => {
Expand All @@ -174,12 +174,12 @@ describe('CreateMenu', () => {
{ title: 'SAML Provider', onClick: openSAMLProviderDialog },
{ title: 'OIDC Provider', onClick: openOIDCProviderDialog },
]}
menuItems={[{ title: 'SAML Provider', onClick: openSAMLProviderDialog }]}
menuItems={[{ title: 'Create SAML Provider', onClick: openSAMLProviderDialog }]}
/>
);

// click button to open menu
await user.click(screen.getByRole('button', { name: /create provider/i }));
await user.click(screen.getByRole('button', { name: /create saml provider/i }));

expect(openSAMLProviderDialog).toHaveBeenCalled();
});
Expand Down
4 changes: 2 additions & 2 deletions ...javascript/bh-shared-ui/src/components/SSOProviderInfoPanel/SSOProviderInfoPanel.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const samlProvider: SSOProvider = {
id: 1,
slug: 'gotham-saml',
name: 'Gotham SAML',
type: 'saml',
type: 'SAML',
details: {
idp_issuer_uri: 'http://test-idp-2:8081/metadata',
idp_sso_uri: 'http://test-idp-2.localhost/sso',
Expand All @@ -41,7 +41,7 @@ const oidcProvider: SSOProvider = {
id: 1,
slug: 'gotham-oidc',
name: 'Gotham OIDC',
type: 'oidc',
type: 'OIDC',
details: {
issuer: 'http://bloodhound.localhost/test-idp-2',
client_id: 'gotham-oidc',
Expand Down
4 changes: 2 additions & 2 deletions packages/javascript/bh-shared-ui/src/components/SSOProviderTable/SSOProviderTable.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const samlProvider: SSOProvider = {
id: 1,
slug: 'gotham-saml',
name: 'Gotham SAML',
type: 'saml',
type: 'SAML',
created_at: '2022-02-24T23:38:41.420271Z',
updated_at: '2022-02-24T23:38:41.420271Z',
details: {} as SAMLProviderInfo,
Expand All @@ -33,7 +33,7 @@ const oidcProvider: SSOProvider = {
id: 1,
slug: 'gotham-oidc',
name: 'Gotham OIDC',
type: 'oidc',
type: 'OIDC',
created_at: '2022-02-24T23:38:41.420271Z',
updated_at: '2022-02-24T23:38:41.420271Z',
details: {} as OIDCProviderInfo,
Expand Down
95 changes: 43 additions & 52 deletions packages/javascript/bh-shared-ui/src/views/SSOConfiguration/SSOConfiguration.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,46 +18,45 @@ import userEvent from '@testing-library/user-event';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import { render, screen } from '../../test-utils';
import MakeSSOConfiguration from './SSOConfiguration';
import SSOConfiguration from './SSOConfiguration';
import { ListSSOProvidersResponse, SAMLProviderInfo, SSOProvider } from 'js-client-library';

const initialSAMLProvider: CreateSAMLProviderResponse = {
const initialSAMLProvider: SSOProvider = {
id: 1,
name: 'test-idp-1',
display_name: 'Test IDP 1',
idp_issuer_uri: 'http://test-idp-1:8081/metadata',
idp_sso_uri: 'http://test-idp-1.localhost/sso',
principal_attribute_mappings: null,
sp_issuer_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1',
sp_sso_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/sso',
sp_metadata_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/metadata',
sp_acs_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/acs',
type: 'SAML',
slug: 'test-idp-1',
name: 'Test IDP 1',
details: {
idp_issuer_uri: 'http://test-idp-1:8081/metadata',
idp_sso_uri: 'http://test-idp-1.localhost/sso',
principal_attribute_mappings: null,
sp_issuer_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1',
sp_sso_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/sso',
sp_metadata_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/metadata',
sp_acs_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-1/acs',
} as SAMLProviderInfo,
created_at: '2022-02-24T23:38:41.420271Z',
updated_at: '2022-02-24T23:38:41.420271Z',
deleted_at: { Time: '0001-01-01T00:00:00Z', Valid: false },
};

const samlProviders = [initialSAMLProvider];
let autoId = 1;

const getNewSAMLProvider = (): CreateSAMLProviderResponse => {
const now = new Date().toISOString();
const ssoProviders = [initialSAMLProvider];

const newSAMLProvider: CreateSAMLProviderResponse = {
id: ++autoId,
name: 'test-idp-2',
display_name: 'Test IDP 2',
const newSAMLProvider: SSOProvider = {
id: 2,
type: 'SAML',
slug: 'test-idp-2',
name: 'Test IDP 2',
details: {
idp_issuer_uri: 'http://test-idp-2:8081/metadata',
idp_sso_uri: 'http://test-idp-2.localhost/sso',
principal_attribute_mappings: null,
sp_issuer_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-2',
sp_sso_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-2/sso',
sp_metadata_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-2/metadata',
sp_acs_uri: 'http://bloodhound.localhost/api/v2/login/saml/test-idp-2/acs',
created_at: now,
updated_at: now,
deleted_at: { Time: '0001-01-01T00:00:00Z', Valid: false },
};
return newSAMLProvider;
} as SAMLProviderInfo,
created_at: new Date().toISOString(),
updated_at: new Date().toISOString(),
};

interface CreateSAMLProviderBody {
Expand All @@ -78,27 +77,20 @@ interface CreateSAMLProviderResponse {
sp_acs_uri: string;
created_at: string;
updated_at: string;
deleted_at: {
Time: string;
Valid: boolean;
};
}

const server = setupServer(
rest.get<{ saml_providers: CreateSAMLProviderResponse[] }>('/api/v2/saml', (req, res, ctx) => {
rest.get<any, any, ListSSOProvidersResponse>('/api/v2/sso-providers', (req, res, ctx) => {
return res(
ctx.json({
data: {
saml_providers: samlProviders,
},
data: ssoProviders,
})
);
}),

rest.post<CreateSAMLProviderBody, any, CreateSAMLProviderResponse>('/api/v2/saml/providers', (req, res, ctx) => {
const newSAMLProvider = getNewSAMLProvider();
samlProviders.push(newSAMLProvider);
return res(ctx.json(newSAMLProvider));
ssoProviders.push(newSAMLProvider);
return res(ctx.json({ ...newSAMLProvider, ...(newSAMLProvider.details as SAMLProviderInfo) }));
})
);

Expand Down Expand Up @@ -128,10 +120,6 @@ vi.mock('../../hooks/useFeatureFlags', () => {
});

describe('SSOConfiguration', async () => {
const addSnackbar = vi.fn();
const useAppDispatch = vi.fn();
const SSOConfiguration = MakeSSOConfiguration(addSnackbar, useAppDispatch);

it('should eventually render previously configured SSO providers', async () => {
const user = userEvent.setup();

Expand All @@ -140,19 +128,20 @@ describe('SSOConfiguration', async () => {
expect(await screen.findByText(initialSAMLProvider.name)).toBeInTheDocument();
expect(await screen.findByText('SAML')).toBeInTheDocument();

await user.click(screen.getByRole('button', { name: 'test-idp-1' }));
await user.click(screen.getByRole('button', { name: initialSAMLProvider.name }));

const initialSAMLDetails = initialSAMLProvider.details as SAMLProviderInfo;

expect(await screen.findByText(initialSAMLProvider.idp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLProvider.sp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLProvider.sp_acs_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLProvider.sp_metadata_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLDetails.idp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLDetails.sp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLDetails.sp_acs_uri)).toBeInTheDocument();
expect(await screen.findByText(initialSAMLDetails.sp_metadata_uri)).toBeInTheDocument();
});

it('should allow user to create new SAML provder and then display it in the table', async () => {
const user = userEvent.setup();
const newSAMLProvider = getNewSAMLProvider();
const newSAMLProviderRequest: CreateSAMLProviderBody = {
name: newSAMLProvider.name,
name: newSAMLProvider.slug,
metadata: new File([], 'new-saml-provider.xml'),
};

Expand All @@ -173,9 +162,11 @@ describe('SSOConfiguration', async () => {

await user.click(await screen.findByText(newSAMLProvider.name));

expect(await screen.findByText(newSAMLProvider.idp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLProvider.sp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLProvider.sp_acs_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLProvider.sp_metadata_uri)).toBeInTheDocument();
const newSAMLDetails = newSAMLProvider.details as SAMLProviderInfo;

expect(await screen.findByText(newSAMLDetails.idp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLDetails.sp_sso_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLDetails.sp_acs_uri)).toBeInTheDocument();
expect(await screen.findByText(newSAMLDetails.sp_metadata_uri)).toBeInTheDocument();
});
});
2 changes: 1 addition & 1 deletion packages/javascript/bh-shared-ui/src/views/SSOConfiguration/SSOConfiguration.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const SSOConfiguration: FC = () => {
{ title: 'SAML Provider', onClick: openSAMLProviderDialog },
{ title: 'OIDC Provider', onClick: openOIDCProviderDialog },
]}
menuItems={[{ title: 'SAML Provider', onClick: openSAMLProviderDialog }]}
menuItems={[{ title: 'Create SAML Provider', onClick: openSAMLProviderDialog }]}
/>
</Grid>
<Grid item xs={6}>
Expand Down

0 comments on commit d8b8911

Please sign in to comment.