Merge branch 'frontend_testen' of https://github.com/SELab-2/UGent-4 …

…into frontend_testen
SELab-2 · May 23, 2024 · 4886871 · 4886871
2 parents b6c0d63 + 3472d12
commit 4886871
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 20 deletions.
diff --git a/frontend/frontend/cypress/e2e/student/group.cy.ts b/frontend/frontend/cypress/e2e/student/group.cy.ts
@@ -2,18 +2,24 @@ describe('student chooses a group and leaves', () => {
     beforeEach(() => {
       cy.visit('http://localhost:5173')
     })
-
-    it('choose', () => {
-        cy.contains('test course').click()
-        cy.contains('test project').click()
-
-        // TODO 
-    }) 
 
     it('leave', () => {
+        // student should be in a group because of the teacher groups test
         cy.contains('test course').click()
         cy.contains('test project').click()
-
-        // TODO 
+        cy.get('#group').click()
+        cy.contains('Student Testing').should('exist')
+        cy.get('#leaveGroup').click()
+        cy.contains('No members yet').should('exist')
     })
+
+    it('join', () => {
+        cy.contains('test course').click()
+        cy.contains('test project').click()
+        cy.get('#group').click()
+        cy.contains('No members yet').should('exist')
+        cy.get('#joinGroup').click()
+        cy.contains('Student Testing').should('exist')
+    }) 
+
 })
diff --git a/frontend/frontend/cypress/e2e/teacher/groups.cy.ts b/frontend/frontend/cypress/e2e/teacher/groups.cy.ts
@@ -1,22 +1,25 @@
-escribe('add students to groups or let them choose', () => {
+describe('add students to groups or let them choose', () => {
     beforeEach(() => {
       cy.visit('http://localhost:5173')
     })
 
     it('add', () => {
         cy.contains('test course').click()
         cy.contains('test project').click()
-
-
-        // TODO add students to group
+        cy.get('#groupButton').click()
+        cy.get('#randomGroups').click()
+        cy.get('#confirm').click()
+        cy.get('#saveGroups').click()
+        cy.get('#confirm').click()
     })
 
     it('choose', () => {
         cy.contains('test course').click()
         cy.contains('test project').click()
-
-
-        // TODO let students choose a group
+        cy.get('#groupButton').click()
+        cy.get('#studentsChoose').click()
+        cy.get('#saveGroups').click()
+        cy.get('#confirm').click()
     })
 
 

diff --git a/frontend/frontend/cypress/e2e/teacher/project.cy.ts b/frontend/frontend/cypress/e2e/teacher/project.cy.ts
@@ -12,6 +12,7 @@ describe('add and change projects', () => {
         cy.get('.MuiInputBase-input').eq(1).type('220820242359')
         cy.get('.MuiInputBase-input').eq(2).type('290820242359')
         cy.get('#description').type('This is a test project set up by the e2e tests.')
+        cy.get('#setInVisible').click()
         cy.get('#setVisible').click()
         cy.get('#groupSize').clear().type('2')
         cy.get('#maxScore').clear().type('30')

diff --git a/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx b/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
@@ -972,7 +972,7 @@ export function AddChangeAssignmentPage() {
                                                         <IconButton
                                                             // Allows the teacher to select whether
                                                             // the assignment is visible to students or not.
-                                                            id='setVisible'
+                                                            id='setInVisible'
                                                             color={'info'}
                                                             onClick={() =>
                                                                 setVisible(
@@ -988,7 +988,7 @@ export function AddChangeAssignmentPage() {
                                                         </IconButton>
                                                     ) : (
                                                         <IconButton
-                                                            id='setInvisible'
+                                                            id='setVisible'
                                                             color={'info'}
                                                             onClick={() =>
                                                                 setVisible(

diff --git a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
@@ -855,6 +855,7 @@ export function AssignmentPage() {
                                             <>
                                                 {assignment?.student_groep ? (
                                                     <Button
+                                                        id='group'
                                                         sx={{
                                                             bgcolor:
                                                                 'secondary.main',

diff --git a/frontend/frontend/src/pages/groupsPage/ChooseGroup.tsx b/frontend/frontend/src/pages/groupsPage/ChooseGroup.tsx
@@ -51,7 +51,7 @@ function joinLeaveButton(
     if (isin) {
         return (
             <>
-                <Button size={'small'} onClick={handleLeave}>
+                <Button id='leaveGroup' size={'small'} onClick={handleLeave}>
                     <Typography>{t('leave')}</Typography>
                 </Button>
             </>
@@ -66,7 +66,7 @@ function joinLeaveButton(
     }
     return (
         <>
-            <Button size={'small'} onClick={handleJoin}>
+            <Button id= 'joinGroup' size={'small'} onClick={handleJoin}>
                 <Typography>{t('join_group')}</Typography>
             </Button>
         </>

diff --git a/frontend/frontend/src/pages/groupsPage/GroupsPage.tsx b/frontend/frontend/src/pages/groupsPage/GroupsPage.tsx
@@ -443,6 +443,7 @@ export function GroupsPage() {
                                                     <Button
                                                         // If a teacher doesn't want to create groups manually,
                                                         // they can randomize the groups with a single click.variant={'contained'}
+                                                        id='randomGroups'
                                                         onClick={() =>
                                                             setRandomOpen(true)
                                                         }
@@ -480,6 +481,7 @@ export function GroupsPage() {
                                                         />
                                                     ) : (
                                                         <Switch
+                                                            id='studentsChoose'
                                                             checked={
                                                                 studentsCanChoose
                                                             }
@@ -978,6 +980,7 @@ export function GroupsPage() {
                                                         >
                                                             <IconButton
                                                                 // The teacher can save the group changes by clicking on the save icon.type="submit"
+                                                                id='saveGroups'
                                                                 aria-label={
                                                                     'submit'
                                                                 }