Remove feedbackcount col

cypress/integration/emailStatsView.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="Cypress" />
 
-import { admin } from '../fixtures/headers'
+import { admin, student } from '../fixtures/headers'
 
 describe('Admin email stats view', () => {
   beforeEach(() => {
@@ -24,10 +24,11 @@ describe('Admin email stats view', () => {
     cy.contains('[email protected]')
     cy.contains('now open: Testauskurssi')
   })
-  it('shows the email when feedback response reminder should be sent', () => {
-    cy.setFakeFeedbackCount(10)
-    cy.setFeedbackClosed()
+  it.only('shows the email when feedback response reminder should be sent', () => {
     cy.loginAs(admin)
+    cy.setFeedbackActive()
+    cy.giveFeedback(student)
+    cy.setFeedbackClosed()
     cy.visit(`/admin/misc`)
     cy.contains('Email statistics').click()
     cy.contains('Student emails TODAY: 0')

cypress/integration/feedbackCount.spec.js

@@ -0,0 +1,72 @@
+const { teacher, student } = require('../fixtures/headers')
+
+/// <reference types="Cypress" />
+
+describe('Feedback count', () => {
+  beforeEach(() => {
+    cy.createFeedbackTarget({ extraStudents: 5 })
+    cy.setFeedbackActive()
+    cy.getTestFbtId().as('fbtId')
+  })
+
+  it('Feedback count increases everywhere when a student gives feedback', () => {
+    cy.loginAs(teacher)
+    // Initial feedback count on my teaching page
+    cy.visit('/courses')
+    cy.get('@fbtId')
+      .then(id => cy.get(`[data-cy="my-teaching-feedback-target-secondary-text-${id}"]`))
+      .invoke('text')
+      .then(text => {
+        cy.wrap(text).as('myTeachingInitialCount')
+      })
+
+    // Initial feedback count on feedback page
+    cy.get('@fbtId').then(id => cy.visit(`/targets/${id}`))
+    cy.get('[data-cy=feedback-target-feedback-count-percentage]')
+      .invoke('text')
+      .then(text => {
+        cy.wrap(text).as('fbtPageInitialCount')
+      })
+
+    // Student gives feedback
+    cy.loginAs(student)
+    cy.get('[data-cy="navbar-link-My feedback"]').click()
+    cy.get('[data-cy=feedback-item-give-feedback]').click()
+    cy.contains('This feedback is anonymous. Fields marked with an asterisk (*) are required')
+    cy.get('input[value=5]').each($el => {
+      cy.get($el).click()
+    })
+    cy.getUniversityQuestions().then(questions => {
+      const openQuestion = questions.find(q => q.type === 'OPEN')
+      cy.get(`textarea[id=${openQuestion.id}-label]`).type('Other comments and such')
+    })
+    cy.get('[data-cy=feedback-view-give-feedback]').click()
+    cy.contains('Feedback has been given. Thank you for your feedback!')
+
+    // Verify feedback count increased on feedback page
+    cy.loginAs(teacher)
+    cy.get('@fbtId').then(id => cy.visit(`/targets/${id}`))
+    cy.get('[data-cy=feedback-target-feedback-count-percentage]')
+      .invoke('text')
+      .then(newCount => {
+        cy.get('@fbtPageInitialCount').then(initialCount => {
+          const newCountInt = parseInt(newCount.split("/")[0], 10)
+          const initialCountInt = parseInt(initialCount.split("/")[0], 10)
+          expect(newCountInt).to.eq(initialCountInt + 1)
+        })
+      })
+
+    // Verify feedback count increased on my teaching page
+    cy.visit('/courses')
+    cy.get('@fbtId')
+      .then(id => cy.get(`[data-cy="my-teaching-feedback-target-secondary-text-${id}"]`))
+      .invoke('text')
+      .then(newCount => {
+        cy.get('@myTeachingInitialCount').then(initialCount => {
+          const newCountInt = parseInt(newCount.split('/')[0], 10)
+          const initialCountInt = parseInt(initialCount.split('/')[0], 10)
+          expect(newCountInt).to.eq(initialCountInt + 1)
+        })
+      })
+  })
+})

cypress/support/commands.js

@@ -16,19 +16,17 @@ Cypress.Commands.add('buildSummaries', () => {
 
 Cypress.Commands.add('giveFeedback', headers => {
   cy.getTestFbtId().then(id => {
-    cy.getUniversityQuestions()
-      .then(questionIds => {
-        cy.request({
-          method: 'POST',
-          url: '/api/feedbacks',
-          headers,
-          body: {
-            feedbackTargetId: id,
-            data: questionIds.map(q => ({ questionId: q.id, data: '3' })),
-          },
-        })
+    cy.getUniversityQuestions().then(questionIds => {
+      cy.request({
+        method: 'POST',
+        url: '/api/feedbacks',
+        headers,
+        body: {
+          feedbackTargetId: id,
+          data: questionIds.map(q => ({ questionId: q.id, data: '3' })),
+        },
       })
-      .then(() => cy.buildSummaries())
+    })
   })
 })
 
@@ -230,18 +228,6 @@ Cypress.Commands.add('setFeedbackOpeningSoon', () => {
   setFeedbackDatesFromNow(6, 28)
 })
 
-Cypress.Commands.add('setFakeFeedbackCount', feedbackCount => {
-  cy.getTestFbtId().then(id => {
-    cy.request({
-      method: 'PUT',
-      url: `/test/courseRealisation/${id}`,
-      body: {
-        feedbackCount,
-      },
-    })
-  })
-})
-
 Cypress.Commands.add('setContinuousFeedbackActive', () => {
   cy.getTestFbtId().then(id => {
     cy.request({