Skip to content

Commit b33a8c7

Browse files
committed
linting and tests fix
1 parent 4644423 commit b33a8c7

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/backend/tests/unit/users.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe('User Tests', () => {
7272

7373
await expect(
7474
async () => await UsersService.updateUserRole(guest.userId, leadership, RoleEnum.HEAD, organization)
75-
).rejects.toThrow(new AccessDeniedException('Guests, members, and leadership cannot update user roles!'));
75+
).rejects.toThrow(new AccessDeniedException('Cannot promote someone to your own role or higher'));
7676
});
7777

7878
it('prevents leadership from promoting member to higher role', async () => {
@@ -81,7 +81,7 @@ describe('User Tests', () => {
8181

8282
await expect(
8383
async () => await UsersService.updateUserRole(memberUser.userId, leadership, RoleEnum.HEAD, organization)
84-
).rejects.toThrow(new AccessDeniedException('Guests, members, and leadership cannot update user roles!'));
84+
).rejects.toThrow(new AccessDeniedException('Cannot promote someone to your own role or higher'));
8585
});
8686

8787
it('allows head to promote guest to member (existing functionality)', async () => {
@@ -107,7 +107,7 @@ describe('User Tests', () => {
107107

108108
await expect(
109109
async () => await UsersService.updateUserRole(guest2.userId, guest1, RoleEnum.MEMBER, organization)
110-
).rejects.toThrow(new AccessDeniedException('Guests, members, and leadership cannot update user roles!'));
110+
).rejects.toThrow(new AccessDeniedException('Guests and members cannot update user roles!'));
111111
});
112112

113113
it('prevents member from updating any user role', async () => {
@@ -116,7 +116,7 @@ describe('User Tests', () => {
116116

117117
await expect(
118118
async () => await UsersService.updateUserRole(guest.userId, memberUser, RoleEnum.MEMBER, organization)
119-
).rejects.toThrow(new AccessDeniedException('Guests, members, and leadership cannot update user roles!'));
119+
).rejects.toThrow(new AccessDeniedException('Guests and members cannot update user roles!'));
120120
});
121121
});
122122
});

src/frontend/src/pages/AdminToolsPage/AdminToolsUserManagement.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { useAllUsers, useCurrentUser, useUpdateUserRole } from '../../hooks/user
1212
import LoadingIndicator from '../../components/LoadingIndicator';
1313
import ErrorPage from '../ErrorPage';
1414
import { fullNamePipe } from '../../utils/pipes';
15-
import { RoleEnum, User, isAdmin, isLeadership, rankUserRole } from 'shared';
15+
import { RoleEnum, User, rankUserRole } from 'shared';
1616
import NERAutocomplete from '../../components/NERAutocomplete';
1717
import { useToast } from '../../hooks/toasts.hooks';
1818

src/frontend/src/pages/AdminToolsPage/ScheduleConfig/Machinery/EditMachineryModal.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const EditMachineryModal = ({ open, onClose, machinery }: EditMachineryModalProp
3434
currentMachineryId = updatedMachinery.machineryId;
3535
}
3636

37-
const originalShopIds = new Set(originalShops.map((sm) => sm.shop.shopId));
3837
const newShopIds = new Set(shopEntries.map((e) => e.shopId));
3938

4039
// Remove shops that were removed from the form

0 commit comments

Comments
 (0)