Skip to content

Commit

Permalink
update shashi comments
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-nowicki committed Oct 16, 2024
1 parent c98f37d commit 737cfd3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 34 deletions.
2 changes: 0 additions & 2 deletions api/apiFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export async function resetPassword({
try {
await account.updatePassword(newPassword, oldPassword);
} catch (error) {
console.error('Password reset failed:', error);
throw error;
}
}
Expand Down Expand Up @@ -141,7 +140,6 @@ export async function updateUserEmail({
},
);
} catch (error) {
console.error('Error updating user email:', error);
throw error;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/(main)/account/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const AccountSettings = (): JSX.Element => {
</LinkCustom>
</div>
<Heading
as="h2"
as="h1"
className="text-4xl font-bold"
data-testid="entry-page-header-page-name"
>
Expand Down
36 changes: 8 additions & 28 deletions components/Nav/Nav.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,10 @@ describe('Nav', () => {
it('renders link to /league/all', async () => {
render(<Nav />);

const drawTrigger = screen.getByTestId('drawer-trigger');
fireEvent.click(drawTrigger);
fireEvent.click(screen.getByTestId('drawer-trigger'));

let linkNav: HTMLElement;
linkNav = await screen.getByTestId('league-link');
linkNav = screen.getByTestId('league-link');
expect(linkNav).toBeInTheDocument();
expect(linkNav).toHaveAttribute('href', '/league/all');
});
Expand All @@ -81,11 +80,9 @@ describe('Nav', () => {

render(<Nav />);

const navElement = screen.getByTestId('nav');
expect(navElement).toBeInTheDocument();
expect(screen.getByTestId('nav')).toBeInTheDocument();

const drawerTrigger = screen.getByTestId('drawer-trigger');
fireEvent.click(drawerTrigger);
fireEvent.click(screen.getByTestId('drawer-trigger'));

expect(screen.getByTestId('settings-link')).toBeInTheDocument();
expect(screen.getByTestId('title')).toBeInTheDocument();
Expand All @@ -102,9 +99,7 @@ describe('Nav', () => {
fireEvent.click(drawerTrigger);

const preferencesLink = await screen.findByTestId('settings-link');

expect(preferencesLink).toHaveAttribute('href', '/account/settings');

fireEvent.click(preferencesLink);

await waitFor(() => {
Expand All @@ -119,7 +114,6 @@ describe('Nav', () => {
render(<Nav />);

const navElement = screen.getByTestId('nav');

expect(navElement).toBeInTheDocument();
expect(navElement).toHaveClass('hidden');
});
Expand All @@ -130,7 +124,6 @@ describe('Nav', () => {
render(<Nav />);

const navElement = screen.getByTestId('nav');

expect(navElement).toBeInTheDocument();
expect(navElement).toHaveClass('hidden');
});
Expand All @@ -140,7 +133,6 @@ describe('Nav', () => {
render(<Nav />);

const navElement = screen.getByTestId('nav');

expect(navElement).toBeInTheDocument();
expect(navElement).toHaveClass('hidden');
});
Expand All @@ -150,7 +142,6 @@ describe('Nav', () => {
render(<Nav />);

const navElement = screen.getByTestId('nav');

expect(navElement).toBeInTheDocument();
expect(navElement).toHaveClass('hidden');
});
Expand All @@ -161,7 +152,6 @@ describe('Nav', () => {
render(<Nav />);

const navElement = screen.getByTestId('nav');

expect(navElement).toBeInTheDocument();
expect(navElement).not.toHaveClass('hidden');
});
Expand All @@ -171,12 +161,9 @@ describe('Nav', () => {

render(<Nav />);

const drawerTrigger = screen.getByTestId('drawer-trigger');
fireEvent.click(drawerTrigger);
fireEvent.click(screen.getByTestId('drawer-trigger'));
fireEvent.click(screen.getByTestId('sign-out-button'));

const signOutButton = screen.getByTestId('sign-out-button');

fireEvent.click(signOutButton);
await waitFor(() => {
expect(mockLogoutAccount).toHaveBeenCalled();
});
Expand All @@ -194,12 +181,9 @@ describe('Nav', () => {
render(<Nav />);

const drawerTrigger = screen.getByTestId('drawer-trigger');

fireEvent.click(drawerTrigger);

const signOutButton = screen.getByTestId('sign-out-button');

fireEvent.click(signOutButton);
fireEvent.click(screen.getByTestId('sign-out-button'));

await waitFor(() => {
expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
Expand All @@ -212,12 +196,8 @@ describe('Nav', () => {
render(<Nav />);

const drawerTrigger = screen.getByTestId('drawer-trigger');

fireEvent.click(drawerTrigger);

const linkNav = screen.getByTestId('league-link');

fireEvent.click(linkNav);
fireEvent.click(screen.getByTestId('league-link'));

await waitFor(() => {
expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
Expand Down
6 changes: 3 additions & 3 deletions components/RestPasswordForm/ResetPasswordForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
FormLabel,
FormMessage,
} from '../Form/Form';
import Link from 'next/link';

const ResetPasswordSchema = z.object({
oldPassword: z.string().min(1, { message: 'Please enter your old password' }),
Expand Down Expand Up @@ -83,7 +84,6 @@ const ResetPasswordForm = (): JSX.Element => {

form.reset({ oldPassword: '', newPassword: '' });
} catch (error) {
console.error('Password Update Failed', error);
toast.custom(
<Alert
variant={AlertVariants.Error}
Expand All @@ -110,7 +110,7 @@ const ResetPasswordForm = (): JSX.Element => {
<p className="text-sm">
This will update the password for your account login. If you
forgot your password you can{' '}
<a
<Link
href="/recover-password"
className="underline underline-offset-4 hover:text-primary-muted transition-colors"
data-testid="recover-password-link"
Expand All @@ -119,7 +119,7 @@ const ResetPasswordForm = (): JSX.Element => {
}}
>
Recover your password
</a>
</Link>
.
</p>
</div>
Expand Down

0 comments on commit 737cfd3

Please sign in to comment.