Merge branch 'master' of https://github.com/UniversityOfHelsinkiCS/lo…

…make
UniversityOfHelsinkiCS · Oct 3, 2024 · 8cea1a8 · 8cea1a8
2 parents d7e5f32 + a1d6dd0
commit 8cea1a8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js b/client/components/FacultyMonitoringView/FacultyMonitoringOverview/MonitoringOverview.js
@@ -48,7 +48,7 @@ const Square = ({ color, setQuestionModal, answerObject, chevron = null }) => {
   const { backgroundColor, hover } = colors[color] || colors.gray
 
   return (
-    <div className="square-container">
+    <div className="square-container" data-cy={`square-${answerObject.faculty}-${answerObject.part.id}`}>
       <Card
         style={{
           ...squareStyles,

diff --git a/client/components/Generic/TrackingTrafficLight.js b/client/components/Generic/TrackingTrafficLight.js
@@ -66,7 +66,7 @@ const TrackingTrafficLight = ({ id, form }) => {
       <Menu secondary style={{ display: 'flex', flexWrap: 'wrap' }}>
         {displayedHistory.length ? (
           displayedHistory.map((entry, index) => (
-            <Menu.Item>
+            <Menu.Item key={`${entry.date}-${index}`}>
               <span className={`answer-circle-big-${entry.color}`} />
               <i>
                 {new Date(entry.date)
@@ -99,7 +99,7 @@ const TrackingTrafficLight = ({ id, form }) => {
         <Grid columns={4} style={{ margin: '1em 0' }}>
           <b>{t('chooseTrafficLight')}</b>
           <Grid.Row>
-            <Grid.Column>
+            <Grid.Column data-cy="date-picker">
               <DatePicker
                 dateFormat="dd.MM.yyyy"
                 onChange={setCustomDate}

diff --git a/cypress/integration/trackingpage.spec.js b/cypress/integration/trackingpage.spec.js
@@ -43,7 +43,7 @@ describe('Tracking page tests', () => {
 
     cy.get('[data-cy=questions-list-0]').click()
 
-    cy.contains('1. Degree programmes include model schedules in curricula that support understanding of the education system, study paths, and course offerings').click()
+    cy.contains('1.').click()
     cy.contains('2.').click()
     cy.get('[data-cy=send-selection-button]').click()
 
@@ -61,4 +61,32 @@ describe('Tracking page tests', () => {
 
     cy.get('[data-cy=send-form]').click()
   })
+
+  it('should modify the date', () => {
+    cy.get(`[data-cy=question-picker-${testFacultyCode}]`).click()
+
+    cy.get('[data-cy=questions-list-0]').click()
+
+    cy.contains('1.').click()
+    cy.get('[data-cy=send-selection-button]').click()
+
+    cy.get('[data-cy=accordion-group-0]').click()
+    cy.get('[data-cy=modify-plan-1]').click()
+
+    cy.get('[data-cy=toggle-chooser]').click()
+    cy.get('[data-cy=color-positive-1]').click()
+
+    cy.get('[data-cy=toggle-chooser]').click()
+    cy.get('[data-cy=date-picker]').type('{selectAll}01.01.2000')
+    cy.get('[data-cy=color-negative-1]').click()
+
+    cy.get('[data-cy=send-form]').click()
+    cy.contains('01.01.2000').should('exist')
+
+    cy.visit(`/faculty-monitoring`)
+    cy.contains('Development Area 1:').click()
+
+    cy.get(`[data-cy=square-${testFacultyCode}-1]`).click()
+    cy.contains('01.01.2000').should('exist')
+  })
 })