|
1 | 1 | import { CR_Type, Organization, Scope_CR_Why_Type, User, WBS_Element_Status } from '@prisma/client'; |
2 | 2 | import { createTestOrganization, createTestUser, resetUsers } from '../test-utils'; |
3 | 3 | import ChangeRequestsService from '../../src/services/change-requests.services'; |
4 | | -import { |
5 | | - supermanAdmin, |
6 | | - aquamanLeadership, |
7 | | - greenlanternHead, |
8 | | - flashAdmin, |
9 | | - robinMember |
10 | | -} from '../test-data/users.test-data'; |
| 4 | +import { supermanAdmin, aquamanLeadership, greenlanternHead, flashAdmin, robinMember } from '../test-data/users.test-data'; |
11 | 5 | import { ProjectProposedChangesCreateArgs, WorkPackageProposedChangesCreateArgs } from 'shared'; |
12 | 6 | import prisma from '../../src/prisma/prisma'; |
13 | 7 | import { AccessDeniedException } from '../../src/utils/errors.utils'; |
@@ -301,7 +295,7 @@ describe('Change Request Tests', () => { |
301 | 295 | let changeRequestId: string; |
302 | 296 |
|
303 | 297 | beforeEach(async () => { |
304 | | - submitterUser = await createTestUser(supermanAdmin, orgId); |
| 298 | + submitterUser = user; |
305 | 299 | leadershipUser1 = await createTestUser(aquamanLeadership, orgId); |
306 | 300 | leadershipUser2 = await createTestUser(greenlanternHead, orgId); |
307 | 301 | nonRequestedLeadership = await createTestUser(flashAdmin, orgId); |
@@ -448,24 +442,12 @@ describe('Change Request Tests', () => { |
448 | 442 | ); |
449 | 443 |
|
450 | 444 | await expect( |
451 | | - ChangeRequestsService.reviewChangeRequest( |
452 | | - memberUser, |
453 | | - changeRequestId, |
454 | | - 'I want to review', |
455 | | - false, |
456 | | - organization, |
457 | | - null |
458 | | - ) |
| 445 | + ChangeRequestsService.reviewChangeRequest(memberUser, changeRequestId, 'I want to review', false, organization, null) |
459 | 446 | ).rejects.toThrow(); |
460 | 447 | }); |
461 | 448 |
|
462 | 449 | it('allows rejection by non-requested leadership when reviewers are requested', async () => { |
463 | | - await ChangeRequestsService.requestCRReview( |
464 | | - submitterUser, |
465 | | - [leadershipUser1.userId], |
466 | | - changeRequestId, |
467 | | - organization |
468 | | - ); |
| 450 | + await ChangeRequestsService.requestCRReview(submitterUser, [leadershipUser1.userId], changeRequestId, organization); |
469 | 451 |
|
470 | 452 | await expect( |
471 | 453 | ChangeRequestsService.reviewChangeRequest( |
|
0 commit comments