merge: fixed merge conflicts
This commit is contained in:
commit
90f43e74ba
101 changed files with 2156 additions and 1470 deletions
|
@ -91,9 +91,9 @@ describe('SubmissionRepository', () => {
|
|||
expect(result[2].submissionNumber).toBe(3);
|
||||
});
|
||||
|
||||
it("should find only the submissions for a certain learning object and assignment made for the user's group", async () => {
|
||||
const result = await submissionRepository.findAllSubmissionsForLearningObjectAndAssignment(loId, assignment!, 'Tool');
|
||||
// (student Tool is in group #2)
|
||||
it('should find only the submissions for a certain learning object and assignment made for the given group', async () => {
|
||||
const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 2);
|
||||
const result = await submissionRepository.findAllSubmissionsForLearningObjectAndGroup(loId, group!);
|
||||
|
||||
expect(result).toHaveLength(1);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue