From 212c13fdc367a1494a5e095efdba15e820daa9ab Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Thu, 27 Apr 2023 20:32:35 +0200
Subject: [PATCH 01/33] feat: account test student

---
 web/cypress/e2e/administrator.cy.ts       |  9 +++++++
 web/cypress/e2e/student.cy.ts             | 32 +++++++++++++++++++++++
 web/cypress/e2e/superstudent.cy.ts        |  7 +++++
 web/cypress/e2e/syndicus.cy.ts            |  7 +++++
 web/src/components/forms/AddressForm.vue  |  4 +++
 web/src/components/forms/ContactForm.vue  |  2 ++
 web/src/layouts/MainLayout.vue            |  1 +
 web/src/views/account/AccountSettings.vue |  4 +++
 8 files changed, 66 insertions(+)
 create mode 100644 web/cypress/e2e/administrator.cy.ts
 create mode 100644 web/cypress/e2e/student.cy.ts
 create mode 100644 web/cypress/e2e/superstudent.cy.ts
 create mode 100644 web/cypress/e2e/syndicus.cy.ts

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
new file mode 100644
index 000000000..3be630b9a
--- /dev/null
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -0,0 +1,9 @@
+describe('admin tests', () => {
+  beforeEach(() => {
+    cy.login('administrator@trottoir.be', 'administrator')
+    cy.visit('/planning')
+  })
+
+
+
+})
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
new file mode 100644
index 000000000..a496f13dd
--- /dev/null
+++ b/web/cypress/e2e/student.cy.ts
@@ -0,0 +1,32 @@
+describe('student tests', () => {
+  beforeEach(() => {
+    cy.login('tudent@trottoir.be', 'student')
+    cy.visit('/planning')
+  })
+
+
+  it('wijzig account, maar annuleer', () => {
+    // own db still rough, so based on selab2-1.ugent.be,
+    // there are still some bugs
+    cy.get('#account').click()
+    cy.get('#edit').click()
+    cy.get('#personal').then(() => {
+      cy.get('#phone').clear()
+      // cancel button should not be clickable when a field does not meet the requirements,
+      // this is still possible now
+      cy.get('#phone').type('0111111111')
+      cy.get('#email').type('{backspace}') // depends on position of cursor
+    })
+    cy.get('#address').then(() => {
+      cy.get('#street').type('t')
+      cy.get('#streetnr').type('{backspace}')
+      cy.get('#city').type('olkn')
+      cy.get('#zipcode').type('1')
+    })
+    cy.get('#cancel').click()
+    cy.get('#personal').get('#phone').should('not.contain.text', '0111111111')
+    // cancel keeps the changes, but doesn't push to db, so on reload the changes are gone
+    // obviously the changes should be gone once cancel is pushed, and not just on reload after cancel
+  })
+
+})
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
new file mode 100644
index 000000000..25e52e4fa
--- /dev/null
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -0,0 +1,7 @@
+describe('superstudent tests', () => {
+  beforeEach(() => {
+    cy.login('superstudent@trottoir.be', 'super_student')
+    cy.visit('/planning')
+  })
+
+})
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
new file mode 100644
index 000000000..28aaff1db
--- /dev/null
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -0,0 +1,7 @@
+describe('syndicus tests', () => {
+  beforeEach(() => {
+    cy.login('syndicusr@trottoir.be', 'syndicus')
+    cy.visit('/planning')
+  })
+
+})
diff --git a/web/src/components/forms/AddressForm.vue b/web/src/components/forms/AddressForm.vue
index daaf5da1d..ee0665c30 100644
--- a/web/src/components/forms/AddressForm.vue
+++ b/web/src/components/forms/AddressForm.vue
@@ -8,6 +8,7 @@
       >
         <!-- Text input field for the street name -->
         <v-text-field
+          id="street"
           prepend-inner-icon="mdi-road-variant"
           v-model="address.street"
           label="Straat"
@@ -22,6 +23,7 @@
       <v-col cols="3" class="flex-grow-0 flex-shrink-0 py-0 my-0">
         <!-- Text input field for the house number -->
         <v-text-field
+          id="streetnr"
           v-model="address.number"
           label="Huisnummer"
           :type="readonly ? 'text' : 'number'"
@@ -41,6 +43,7 @@
       >
         <!-- Text input field for the city name -->
         <v-text-field
+          id="city"
           prepend-inner-icon="mdi-city-variant"
           v-model="address.city"
           label="Stad"
@@ -55,6 +58,7 @@
       <v-col cols="3" class="flex-grow-0 flex-shrink-0 py-0 my-0">
         <!-- Text input field for the zip code -->
         <v-text-field
+          id="zipcode"
           v-model="address.zip_code"
           label="Post code"
           :type="readonly ? 'text' : 'number'"
diff --git a/web/src/components/forms/ContactForm.vue b/web/src/components/forms/ContactForm.vue
index 13be1a1f5..56460b856 100644
--- a/web/src/components/forms/ContactForm.vue
+++ b/web/src/components/forms/ContactForm.vue
@@ -1,6 +1,7 @@
 <template>
   <v-list class="ma-0 pa-0">
     <v-text-field
+      id="phone"
       class="mt-2"
       prepend-inner-icon="mdi-phone"
       label="Telefoonnummer"
@@ -13,6 +14,7 @@
       @update:model-value="$emit('onUpdate', contact)"
     ></v-text-field>
     <v-text-field
+      id="email"
       class="mt-2 mb-1"
       prepend-inner-icon="mdi-email"
       label="e-mail"
diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue
index 511b4214b..13caec637 100644
--- a/web/src/layouts/MainLayout.vue
+++ b/web/src/layouts/MainLayout.vue
@@ -46,6 +46,7 @@
               }"
             >
               <v-list-item
+                id="account"
                 prepend-icon="mdi-cog"
                 title="Account"
                 value="account"
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index 4365911be..3d868b7e8 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -17,6 +17,7 @@
         "
       >
         <v-btn
+          id="edit"
           v-if="!edit"
           prepend-icon="mdi-pencil"
           @click="edit = !edit"
@@ -24,6 +25,7 @@
           >Bewerk Account</v-btn
         >
         <v-btn
+          id="cancel"
           v-else
           prepend-icon="mdi-close"
           @click="handleCancelEdit()"
@@ -67,6 +69,7 @@
         </v-col>
       </v-row>
       <ContactForm
+        id="personal"
         :class="edit ? 'mx-4' : 'mx-10'"
         :readonly="!edit"
         :phone="user?.phone"
@@ -79,6 +82,7 @@
     <BorderCard class="mt-4" prepend-icon="mdi-map-marker">
       <template v-slot:title> Adres </template>
       <AddressFrom
+        id="address"
         :class="edit ? 'mx-4' : 'mx-10'"
         :readonly="!edit"
         :street="user?.address.street"

From f5386389d3c623e26ea2c7e096fca9ed5d801f15 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Thu, 27 Apr 2023 22:47:11 +0200
Subject: [PATCH 02/33] feat: description of tests for every type of user

---
 web/cypress/e2e/administrator.cy.ts | 39 +++++++++++++++++++++++++++++
 web/cypress/e2e/login.cy.ts         |  8 +++---
 web/cypress/e2e/student.cy.ts       | 14 +++++++++--
 web/cypress/e2e/superstudent.cy.ts  | 34 ++++++++++++++++++++++++-
 web/cypress/e2e/syndicus.cy.ts      | 18 ++++++++++++-
 5 files changed, 106 insertions(+), 7 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 3be630b9a..a57fb6470 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -4,6 +4,45 @@ describe('admin tests', () => {
     cy.visit('/planning')
   })
 
+  it('add new user', () => {
+    // go to user overview
+    // click new user
+    // add user data
+    // save
+  })
+
+  it('edit a user', () => {
+    // go to user overview
+    // click user
+    // press edit button
+    // alter user data
+    // save
+  })
+
+  it('delete a user', () => {
+    // go to user overview
+    // click user
+    // press edit button
+    // press delete
+    // press confirm
+  })
+
+  it('check the profitability statistics', () => {
+    // not yet implemented
+  })
+
+  it('add garbage schedule to a building', () => {
+    cy.visit('/gebouw')
+    // select building
+  })
+
+  it('edit garbage schedule of a building', () => {
+    cy.visit('/gebouw')
+    // select building
+  })
+
+
+
 
 
 })
diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index ff9001c4c..ed61bb7cb 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -3,10 +3,8 @@ describe('login tests', () => {
     cy.visit('/')
   })
 
-  // TODO .only wegdoen wanneer api niet meer crasht bij foutieve login
-  it.only('log in succesfull', () =>{
+  it('log in succesfull', () =>{
     cy.login('administrator@trottoir.be', 'password')
-    cy.visit('/planning')
   })
 
   it('log in failed: incorrect password', () =>{
@@ -24,4 +22,8 @@ describe('login tests', () => {
     cy.get('#login')
   })
 
+  // TODO: user doesn't yet have a login
+  it('ask login data', () => {
+  })
+
 })
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index a496f13dd..0dff3b01e 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -1,11 +1,21 @@
 describe('student tests', () => {
   beforeEach(() => {
     cy.login('tudent@trottoir.be', 'student')
-    cy.visit('/planning')
   })
 
 
-  it('wijzig account, maar annuleer', () => {
+  it('student performs a round', () => {
+    // we should already be at "/planning"
+    // student selects round which he/her wants to start
+    // student goes to first building,
+    // performs garbage tasks, takes pictures and or leaves a comment
+    // student indicates building as done
+    // repeat for all buildings
+    // student ends the round
+  })
+
+
+  it('edit account, but cancel changes', () => {
     // own db still rough, so based on selab2-1.ugent.be,
     // there are still some bugs
     cy.get('#account').click()
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 25e52e4fa..d958458b5 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,7 +1,39 @@
 describe('superstudent tests', () => {
   beforeEach(() => {
     cy.login('superstudent@trottoir.be', 'super_student')
-    cy.visit('/planning')
+  })
+
+  // there is a lot of overlap for superstudents and admins,
+  // these overlaps will be tested with either a superstudent or an admin. There is no need to test them twice.
+
+  it('create round', () => {
+    // go to round overview?
+    // press create button
+    // add buildings
+    // add name
+    // save
+  })
+
+  it('edit round', () => {
+    // go to round overview
+    cy.visit('/ronde')
+    // press on the round you wish to change
+    // add buildings
+    // add name
+    // save
+  })
+
+  it('give a round to a student', () => {
+    // go to the dedicated page
+    // select round
+    // select student
+    // save
+  })
+
+  it('observe students currently doing a round', () => {
+    // go to the overview page
+    cy.visit('/ronde/overzicht')
+    // click on the student/round to get more details
   })
 
 })
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index 28aaff1db..ec5f36da6 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -1,7 +1,23 @@
 describe('syndicus tests', () => {
   beforeEach(() => {
     cy.login('syndicusr@trottoir.be', 'syndicus')
-    cy.visit('/planning')
+  })
+
+  it('check building', () => {
+    // syndicus checks for comments left on one of their buildings
+  })
+
+  it('add building', () => {
+    // press create button
+    // add building data
+    // save
+  })
+
+  it('edit building', () => {
+    // press building from buildings overview (right now a bit unclear as to how to do this, with the v-for element)
+    // press edit button
+    // alter building data
+    // save
   })
 
 })

From b824be85f82de54586328cba8b2136d44f5aeab0 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Thu, 27 Apr 2023 23:12:20 +0200
Subject: [PATCH 03/33] chore: test component buildingcard with correct props

---
 web/cypress/component/test.cy.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/cypress/component/test.cy.ts b/web/cypress/component/test.cy.ts
index f3d702d10..46eba40fe 100644
--- a/web/cypress/component/test.cy.ts
+++ b/web/cypress/component/test.cy.ts
@@ -1,5 +1,6 @@
 import RoundedButton from '../../src/components/buttons/RoundedButton.vue'
 import AddButton from '../../src/components/buttons/AddButton.vue'
+import BuildingCard from '../../src/components/building/BuildingCard'
 
 describe("test", () => {
   it('uses custom text for the button label', () => {
@@ -21,4 +22,13 @@ describe("test", () => {
     })
     cy.get('#menu-activator').click()
   })
+
+  it('buildingcard', () => {
+    cy.mount(BuildingCard, {
+      props: {
+        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
+      },
+    })
+    // can't really click on it, as there is no active router to perform router.push(...)
+  })
 })

From 5fb92f785d2a634afcd4a9a844572a582fef773e Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Fri, 28 Apr 2023 11:25:43 +0200
Subject: [PATCH 04/33] test: component garbageschedule

---
 web/cypress/component/test.cy.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/web/cypress/component/test.cy.ts b/web/cypress/component/test.cy.ts
index 46eba40fe..ec69bb923 100644
--- a/web/cypress/component/test.cy.ts
+++ b/web/cypress/component/test.cy.ts
@@ -1,6 +1,7 @@
 import RoundedButton from '../../src/components/buttons/RoundedButton.vue'
 import AddButton from '../../src/components/buttons/AddButton.vue'
 import BuildingCard from '../../src/components/building/BuildingCard'
+import GarbageSchedule from '../../src/components/building/GarbageSchedule'
 
 describe("test", () => {
   it('uses custom text for the button label', () => {
@@ -31,4 +32,16 @@ describe("test", () => {
     })
     // can't really click on it, as there is no active router to perform router.push(...)
   })
+
+  it.only('garbageschedule', ()=>{
+    cy.mount(GarbageSchedule, {
+      props: {
+        schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
+          id: 7,
+          user: {first_name: "one", last_name: "two"}
+        }]
+      }
+    })
+    // not exactly correct
+  })
 })

From 5f1700f35dc0f65b4076f844e9c0003be8fc6770 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Fri, 28 Apr 2023 17:45:42 +0200
Subject: [PATCH 05/33] feat: admin user tests + table component test

---
 web/cypress.config.ts                     |  2 +-
 web/cypress/component/table.cy.ts         | 48 ++++++++++++++++++++
 web/cypress/component/test.cy.ts          |  8 ++--
 web/cypress/e2e/administrator.cy.ts       | 54 ++++++++++++++++++++++-
 web/cypress/e2e/student.cy.ts             |  5 ++-
 web/cypress/support/commands.ts           |  6 +--
 web/src/components/forms/RolesForm.vue    |  3 ++
 web/src/components/table/Table.vue        |  2 +-
 web/src/layouts/MainLayout.vue            |  1 +
 web/src/views/account/AccountSettings.vue |  7 ++-
 web/src/views/account/UserCreation.vue    |  9 +++-
 web/src/views/dashboard/Users.vue         |  3 +-
 12 files changed, 132 insertions(+), 16 deletions(-)
 create mode 100644 web/cypress/component/table.cy.ts

diff --git a/web/cypress.config.ts b/web/cypress.config.ts
index 977510690..a5cb9a4e3 100644
--- a/web/cypress.config.ts
+++ b/web/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     supportFile: "cypress/support/e2e.ts",
-    baseUrl: "http://localhost:3000/",
+    baseUrl: "http://sel2-1.ugent.be/",
     setupNodeEvents(on, config) {
       // implement node event listeners here
       require('@cypress/code-coverage/task')(on, config)
diff --git a/web/cypress/component/table.cy.ts b/web/cypress/component/table.cy.ts
new file mode 100644
index 000000000..c8da14ba7
--- /dev/null
+++ b/web/cypress/component/table.cy.ts
@@ -0,0 +1,48 @@
+import Table from '../../src/components/table/Table.vue'
+import {Header} from "../../src/components/table/Header";
+import {RowType} from "../../src/components/table/RowType";
+import {BuildingQuery, Result} from "@selab-2/groep-1-query";
+
+describe("custom table test", () => {
+  it('', () => {
+    // TODO test sorting
+    cy.mount(Table, {
+      props: {
+        entries: [
+          {id: 6, name: "testgebouw", address:
+                {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}},
+          {id: 1, name: "andergebouw", address:
+                {street: "anderestraat", number: 7, zip_code: 9000, city: "Gent"}},
+        ],
+        headers: [{
+            id: 0,
+            name: "Gebouw",
+            fit: false,
+            get: (e) => e.name,
+            type: RowType.TEXT,
+            sortable: false,
+          },
+          {
+            id: 1,
+            name: "Adres",
+            fit: false,
+            get: (e) =>
+              e.address.street + " " + e.address.number,
+            type: RowType.TEXT,
+            sortable: false,
+          }
+        ],
+      },
+    })
+    cy.get('#table').then( () => {
+      // cy.contains('th, Gebouw')
+      // cy.contains('th, Adres')   // table heads aren't just plain text, so this doesn't work
+      cy.contains('td', 'testgebouw')
+      cy.contains('td', 'andergebouw')
+      cy.contains('td', 'teststraat 5')
+      cy.contains('td', 'anderestraat 7')
+      // for this test, there is no City header, so cities shouldn't be displayed in the table
+      cy.contains('td', 'Gent').should('not.exist')
+    })
+  })
+})
diff --git a/web/cypress/component/test.cy.ts b/web/cypress/component/test.cy.ts
index ec69bb923..7009222de 100644
--- a/web/cypress/component/test.cy.ts
+++ b/web/cypress/component/test.cy.ts
@@ -1,10 +1,10 @@
 import RoundedButton from '../../src/components/buttons/RoundedButton.vue'
 import AddButton from '../../src/components/buttons/AddButton.vue'
-import BuildingCard from '../../src/components/building/BuildingCard'
-import GarbageSchedule from '../../src/components/building/GarbageSchedule'
+import BuildingCard from '../../src/components/building/BuildingCard.vue'
+import GarbageSchedule from '../../src/components/building/GarbageSchedule.vue'
 
 describe("test", () => {
-  it('uses custom text for the button label', () => {
+  it('roundedbutton', () => {
     cy.mount(RoundedButton, {
       props: {
         icon: 'mdi-domain',
@@ -33,7 +33,7 @@ describe("test", () => {
     // can't really click on it, as there is no active router to perform router.push(...)
   })
 
-  it.only('garbageschedule', ()=>{
+  it('garbageschedule', ()=>{
     cy.mount(GarbageSchedule, {
       props: {
         schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index a57fb6470..f78ea8d0f 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -1,30 +1,80 @@
 describe('admin tests', () => {
   beforeEach(() => {
     cy.login('administrator@trottoir.be', 'administrator')
-    cy.visit('/planning')
+    cy.visit('/ronde/overzicht')
   })
 
   it('add new user', () => {
     // go to user overview
+    cy.get('#users').click()
     // click new user
+    cy.get('#new').click()
     // add user data
-    // save
+    cy.get('#firstname').type('test')
+    cy.get('#lastname').type('naam')
+    cy.get('#personal').then(() => {
+      cy.get('#phone').type('0123456789')
+      cy.get('#email').type('test@trottoir.be')
+    })
+    cy.get('#address').then(() => {
+      cy.get('#street').type('teststraat')
+      cy.get('#streetnr').type('1')
+      cy.get('#city').type('Teststad')
+      cy.get('#zipcode').type('1234')
+    })
+    cy.get('#password').type('testwachtwoord')
+    cy.get('#repeat').type('testwachtwoord')
+    cy.get('#roles').then(() => {
+      cy.get('#student').check()
+      cy.get('#superstudent').check()
+      cy.get('#administrator').check()
+    })
+    cy.get('#create').click()
+    // check if user in userlist
+    cy.get('#usertable').get('#table').contains('td', 'test naam')
+
   })
 
   it('edit a user', () => {
     // go to user overview
+    cy.get('#users').click()
     // click user
+    cy.get('#usertable').get('#table').contains('td', 'test naam').click()
     // press edit button
+    cy.get('#edit').click()
     // alter user data
+    // most of this has been tested in the student tests,
+    // however only admins can change name, roles or password of a user
+    cy.get("#firstname").clear().type("nieuwe")
+    cy.get("#lastname").clear().type("gebruiker")
+    cy.get('#roles').then(() => {
+      cy.get('#administrator').uncheck()
+    })
+    cy.get('#password').type('nieuwwachtwoord')
+    cy.get('#repeat').type('nieuwwachtwoord')
     // save
+    cy.get('#save').click()
+    // confirm
+    cy.get('#submit').click()
+    // check if user is updated in the table
+    // cy.get('#users').click()
+    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker')
   })
 
   it('delete a user', () => {
     // go to user overview
+    cy.get('#users').click()
     // click user
+    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker').click()
     // press edit button
+    cy.get('#edit').click()
     // press delete
+    cy.get('#delete').click()
     // press confirm
+    cy.get('#submit').click()
+    // user should not be present in the table
+    // cy.get('#users').click()
+    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker').should('not.exist')
   })
 
   it('check the profitability statistics', () => {
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 0dff3b01e..1448eba6f 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -1,6 +1,7 @@
 describe('student tests', () => {
   beforeEach(() => {
-    cy.login('tudent@trottoir.be', 'student')
+    cy.login('student@trottoir.be', 'student')
+    cy.visit('/planning')
   })
 
 
@@ -30,7 +31,7 @@ describe('student tests', () => {
     cy.get('#address').then(() => {
       cy.get('#street').type('t')
       cy.get('#streetnr').type('{backspace}')
-      cy.get('#city').type('olkn')
+      cy.get('#city').type('blabla')
       cy.get('#zipcode').type('1')
     })
     cy.get('#cancel').click()
diff --git a/web/cypress/support/commands.ts b/web/cypress/support/commands.ts
index c49d4af65..609449353 100644
--- a/web/cypress/support/commands.ts
+++ b/web/cypress/support/commands.ts
@@ -50,10 +50,10 @@ Cypress.Commands.add('login' as any, (email: string, password:string) => {
   cy.session([email, password], () =>
   {
     cy.visit('/')
-    cy.get('#email').type('administrator@trottoir.be')
-    cy.get('#password').type('password')
+    cy.get('#email').type(email)
+    cy.get('#password').type(password)
     cy.get('#login').click()
-    cy.get('#logout').should('be.visible')
+    // cy.get('#logout').should('be.visible')
   },
     {
       cacheAcrossSpecs: true
diff --git a/web/src/components/forms/RolesForm.vue b/web/src/components/forms/RolesForm.vue
index 443c89d38..bc6033817 100644
--- a/web/src/components/forms/RolesForm.vue
+++ b/web/src/components/forms/RolesForm.vue
@@ -4,6 +4,7 @@
     <v-col>
       <v-checkbox
         v-model="roles"
+        id="student"
         label="Student"
         value="Student"
         color="primary"
@@ -13,6 +14,7 @@
       />
       <v-checkbox
         v-model="roles"
+        id="superstudent"
         label="Superstudent"
         value="Superstudent"
         color="primary"
@@ -24,6 +26,7 @@
     <v-col>
       <v-checkbox
         v-model="roles"
+        id="administrator"
         label="Admin"
         value="Admin"
         color="primary"
diff --git a/web/src/components/table/Table.vue b/web/src/components/table/Table.vue
index 33fb2e544..dace34542 100644
--- a/web/src/components/table/Table.vue
+++ b/web/src/components/table/Table.vue
@@ -1,5 +1,5 @@
 <template :key="props.entries">
-  <v-table>
+  <v-table id="table">
     <thead>
       <tr>
         <th
diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue
index 13caec637..a6f19004e 100644
--- a/web/src/layouts/MainLayout.vue
+++ b/web/src/layouts/MainLayout.vue
@@ -126,6 +126,7 @@
               prepend-icon="mdi-account-supervisor"
               title="Gebruikers"
               value="users"
+              id="users"
             ></v-list-item>
 
             <v-list-item
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index 3d868b7e8..f3fa7b93e 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -47,6 +47,7 @@
         >
           <!-- Text input field for the first name -->
           <v-text-field
+            id="firstname"
             v-model="user!.first_name"
             label="Voornaam"
             type="text"
@@ -61,6 +62,7 @@
         >
           <!-- Text input field for the last name -->
           <v-text-field
+            id="lastname"
             v-model="user!.last_name"
             label="Achternaam"
             type="text"
@@ -132,6 +134,7 @@
     <div v-if="edit" class="my-4">
       <div class="d-flex flex-row-reverse">
         <v-btn
+          id="save"
           prepend-icon="mdi-check"
           @click="handleSavePopup()"
           color="success"
@@ -143,6 +146,7 @@
           v-if="
             useAuthStore().auth?.admin && user?.id !== useAuthStore().auth?.id
           "
+          id="delete"
           prepend-icon="mdi-delete"
           @click="handleRemovePopup()"
           color="error"
@@ -164,6 +168,7 @@
     </p>
     <v-card-actions>
       <v-btn
+        id="dontsubmit"
         prepend-icon="mdi-close"
         color="error"
         @click="showPopup = false"
@@ -171,7 +176,7 @@
       >
         Annuleer
       </v-btn>
-      <v-btn prepend-icon="mdi-check" color="success" @click="popupSubmit()">
+      <v-btn id= "submit" prepend-icon="mdi-check" color="success" @click="popupSubmit()">
         {{ popupSubmitMsg }}
       </v-btn>
     </v-card-actions>
diff --git a/web/src/views/account/UserCreation.vue b/web/src/views/account/UserCreation.vue
index 84ae62ba0..f2c31cddc 100644
--- a/web/src/views/account/UserCreation.vue
+++ b/web/src/views/account/UserCreation.vue
@@ -12,6 +12,7 @@
           >
             <!-- Text input field for the first name -->
             <v-text-field
+              id="firstname"
               v-model="first_name"
               label="Voornaam"
               type="text"
@@ -27,6 +28,7 @@
           >
             <!-- Text input field for the last name -->
             <v-text-field
+              id="lastname"
               v-model="last_name"
               label="Achternaam"
               type="text"
@@ -37,6 +39,7 @@
         </v-row>
 
         <ContactForm
+          id="personal"
           :class="spacing"
           :phone="String(contact.phone)"
           :email="String(contact.email)"
@@ -50,6 +53,7 @@
       <BorderCard class="mt-4" prepend-icon="mdi-map-marker">
         <template v-slot:title> Adres </template>
         <AddressForm
+          id="address"
           :class="spacing"
           :street="String(address.street)"
           :city="String(address.city)"
@@ -64,6 +68,7 @@
         <template v-slot:title> Wachtwoord </template>
         <v-list density="compact" :class="spacing">
           <v-text-field
+            id="password"
             class="mt-2"
             v-model="password1"
             :prepend-inner-icon="'mdi-lock'"
@@ -78,6 +83,7 @@
 
           <!-- Text input field for the password confirmation-->
           <v-text-field
+            id="repeat"
             class="mt-2"
             v-model="password2"
             :prepend-inner-icon="'mdi-lock'"
@@ -95,12 +101,13 @@
       <!-- Selection box to determine the roles -->
       <BorderCard class="mt-4" prepend-icon="mdi-account-multiple">
         <template v-slot:title> Rollen </template>
-        <RolesForm v-model="roles" />
+        <RolesForm id="roles" v-model="roles" />
       </BorderCard>
 
       <!-- Account creation button -->
       <div class="d-flex flex-row-reverse my-3">
         <v-btn
+          id="create"
           color="success"
           prepend-icon="mdi-check"
           type="submit"
diff --git a/web/src/views/dashboard/Users.vue b/web/src/views/dashboard/Users.vue
index d2b8edf43..c2c543680 100644
--- a/web/src/views/dashboard/Users.vue
+++ b/web/src/views/dashboard/Users.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="d-flex flex-row-reverse">
     <v-btn
+      id="new"
       prepend-icon="mdi-plus"
       color="primary"
       class="mr-3"
@@ -9,7 +10,7 @@
       Nieuwe Gebruiker
     </v-btn>
   </div>
-  <Table :entries="users" :headers="User.headers()" :route="User.route"></Table>
+  <Table id="usertable" :entries="users" :headers="User.headers()" :route="User.route"></Table>
 </template>
 
 <script setup lang="ts">

From 7d5bde96feb4dc78017cc396fcb592ce2e30a444 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 29 Apr 2023 18:00:47 +0200
Subject: [PATCH 06/33] feat: superstudent round tests

---
 web/cypress/e2e/administrator.cy.ts           | 10 ++-
 web/cypress/e2e/superstudent.cy.ts            | 75 +++++++++++++++++--
 web/cypress/e2e/syndicus.cy.ts                |  2 +-
 web/src/components/cards/BuildingInfoCard.vue |  2 +-
 web/src/components/filter/LargeFilter.vue     |  2 +
 web/src/layouts/MainLayout.vue                |  2 +
 web/src/views/dashboard/Buildings.vue         |  2 +
 web/src/views/dashboard/Round.vue             |  2 +
 web/src/views/dashboard/Users.vue             |  2 +-
 web/src/views/round/Round.vue                 |  3 +
 web/src/views/round/RoundFollowup.vue         |  1 +
 web/src/views/round/RoundMaker.vue            |  4 +-
 web/src/views/round/RoundPlanner.vue          |  6 ++
 13 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index f78ea8d0f..ba41636eb 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -8,7 +8,7 @@ describe('admin tests', () => {
     // go to user overview
     cy.get('#users').click()
     // click new user
-    cy.get('#new').click()
+    cy.get('#newuser').click()
     // add user data
     cy.get('#firstname').type('test')
     cy.get('#lastname').type('naam')
@@ -32,7 +32,6 @@ describe('admin tests', () => {
     cy.get('#create').click()
     // check if user in userlist
     cy.get('#usertable').get('#table').contains('td', 'test naam')
-
   })
 
   it('edit a user', () => {
@@ -82,13 +81,16 @@ describe('admin tests', () => {
   })
 
   it('add garbage schedule to a building', () => {
-    cy.visit('/gebouw')
+    cy.get('#buildings').click()
     // select building
+    cy.get('#buildingtable').get('#table').contains('td', 'Building 1').click()
+
   })
 
   it('edit garbage schedule of a building', () => {
-    cy.visit('/gebouw')
+    cy.get('#buildings').click()
     // select building
+    cy.get('#buildingtable').get('#table').contains('td', 'Building 1').click()
   })
 
 
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index d958458b5..fcb1330c6 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,39 +1,102 @@
 describe('superstudent tests', () => {
   beforeEach(() => {
     cy.login('superstudent@trottoir.be', 'super_student')
+    cy.visit('/ronde/overzicht')
   })
 
   // there is a lot of overlap for superstudents and admins,
   // these overlaps will be tested with either a superstudent or an admin. There is no need to test them twice.
 
   it('create round', () => {
-    // go to round overview?
+    // go to round overview
+    cy.get('#rounds').click()
     // press create button
+    cy.get('#newround').click()
     // add buildings
+    cy.get('#building').eq(0).click() // not sure if this actually works yet
+    cy.get('#building').eq(0).click()
     // add name
+    cy.get('#roundname').type("test round")
     // save
+    cy.get('#createround').click()
+    // confirm?
+    // we are rerouted back to the rounds table
+    cy.contains("test round")
   })
 
   it('edit round', () => {
     // go to round overview
-    cy.visit('/ronde')
+    cy.get('#rounds').click()
     // press on the round you wish to change
-    // add buildings
-    // add name
+    cy.get('#roundtable').get('#table').contains('td', 'Round 1').click()
+    // press edit button
+
+    // edit button currently not implemented
+
+    // add/delete buildings
+    // edit name
     // save
+    // confirm?
+    // check if correct buildings and name are present
   })
 
   it('give a round to a student', () => {
-    // go to the dedicated page
+    // go to round overview
+    cy.get('#rounds').click()
     // select round
-    // select student
+    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
+    // select plan schedule
+    cy.get('#schedule').click()
+    // select student and date(s)
+    cy.get('#selectstudent').select('Dirk De Student') // maybe safer with index
+    cy.get('.selectors').then( () => {
+      cy.get('#frequency').select('wekelijks') // maybe safer with index
+      cy.get('#startdate').type('01052023')
+      cy.get('#enddate').type('31052023')
+      cy.get('#starttime').type('1930')
+    })
+    // add
+    cy.get('#addschedule').click()
     // save
+    cy.get('#planschedule').click()
+    // confirm?
+    //check if schedule has been added
+    cy.get('#rounds').click()
+    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
+    cy.get('RoundCard').contains("h3", new Date("2023-05-01").toLocaleDateString()) // I don't know if this will work
   })
 
+  it('switch student for round (for a single date)', () => {
+
+  })
+
+  it('delete round', () => {
+    // go to round overview
+    cy.get('#rounds').click()
+    // press on the round you wish to delete
+    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
+    // press delete button
+    cy.get('#deleteround').click()
+    // confirm?
+    // round should not be present in the table
+    cy.get('#roundtable').get('#table').contains('td', 'test round').should('not.exist')
+  })
+
+
   it('observe students currently doing a round', () => {
+    // make sure there is a student currently doing Round X: maybe add a test that creates this?
+    const round: string = "Round X"
     // go to the overview page
     cy.visit('/ronde/overzicht')
+    // add filters
+    cy.get('#filter').then(() => {
+      cy.get('#showfilters').click()
+      // select filters
+      cy.get('#searchtype').type(round)
+    })
     // click on the student/round to get more details
+    cy.get('RoundCard').first().click()
+    cy.contains(round)
   })
 
 })
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index ec5f36da6..1143efa02 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -1,6 +1,6 @@
 describe('syndicus tests', () => {
   beforeEach(() => {
-    cy.login('syndicusr@trottoir.be', 'syndicus')
+    cy.login('syndicus@trottoir.be', 'syndicus')
   })
 
   it('check building', () => {
diff --git a/web/src/components/cards/BuildingInfoCard.vue b/web/src/components/cards/BuildingInfoCard.vue
index 51978d7b2..88dc4da47 100644
--- a/web/src/components/cards/BuildingInfoCard.vue
+++ b/web/src/components/cards/BuildingInfoCard.vue
@@ -3,7 +3,7 @@
     <template v-slot:prepend>
       <v-icon icon="mdi-office-building"></v-icon>
     </template>
-    <template v-slot:title>{{ name }}</template
+    <template id="buildingname" v-slot:title>{{ name }}</template
     ><template v-slot:subtitle>{{ address }}</template>
   </BorderCard>
 </template>
diff --git a/web/src/components/filter/LargeFilter.vue b/web/src/components/filter/LargeFilter.vue
index bb0829212..2996682c9 100644
--- a/web/src/components/filter/LargeFilter.vue
+++ b/web/src/components/filter/LargeFilter.vue
@@ -6,6 +6,7 @@
     </template>
     <template v-slot:title v-if="search_by_labels.length != 0">
       <v-text-field
+        id="searchtype"
         :label="search_placeholder()"
         v-model="filter_data.query"
         @update:model-value="$emit('onUpdate', filter_data)"
@@ -14,6 +15,7 @@
     </template>
     <template v-slot:append>
       <v-btn
+        id="showfilters"
         prepend-icon="mdi-filter"
         :append-icon="dropdown ? 'mdi-menu-up' : 'mdi-menu-down'"
         @click="dropdown = !dropdown"
diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue
index a6f19004e..ea0215b32 100644
--- a/web/src/layouts/MainLayout.vue
+++ b/web/src/layouts/MainLayout.vue
@@ -134,6 +134,7 @@
               prepend-icon="mdi-office-building-outline"
               title="Gebouwen"
               value="buildings"
+              id="buildings"
             ></v-list-item>
 
             <v-list-item
@@ -141,6 +142,7 @@
               prepend-icon="mdi-map-legend"
               title="Rondes"
               value="rounds"
+              id="rounds"
             ></v-list-item>
           </div>
         </v-list>
diff --git a/web/src/views/dashboard/Buildings.vue b/web/src/views/dashboard/Buildings.vue
index 67c8685f2..7a48bfd69 100644
--- a/web/src/views/dashboard/Buildings.vue
+++ b/web/src/views/dashboard/Buildings.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="d-flex flex-row-reverse">
     <v-btn
+      id="newbuilding"
       prepend-icon="mdi-plus"
       color="primary"
       class="mr-3"
@@ -10,6 +11,7 @@
     </v-btn>
   </div>
   <Table
+    id="#buildingtable"
     :entries="buildings"
     :headers="Building.headers()"
     :route="Building.route"
diff --git a/web/src/views/dashboard/Round.vue b/web/src/views/dashboard/Round.vue
index 92067bae6..92240b36b 100644
--- a/web/src/views/dashboard/Round.vue
+++ b/web/src/views/dashboard/Round.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="d-flex flex-row-reverse">
     <v-btn
+      id="newround"
       prepend-icon="mdi-plus"
       color="primary"
       class="mr-3"
@@ -10,6 +11,7 @@
     </v-btn>
   </div>
   <Table
+    id="roundtable"
     :entries="rounds"
     :headers="RoundTable.headers()"
     :route="RoundTable.route"
diff --git a/web/src/views/dashboard/Users.vue b/web/src/views/dashboard/Users.vue
index c2c543680..844b2383d 100644
--- a/web/src/views/dashboard/Users.vue
+++ b/web/src/views/dashboard/Users.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="d-flex flex-row-reverse">
     <v-btn
-      id="new"
+      id="newuser"
       prepend-icon="mdi-plus"
       color="primary"
       class="mr-3"
diff --git a/web/src/views/round/Round.vue b/web/src/views/round/Round.vue
index 5c7bfe55d..6ce78f7bf 100644
--- a/web/src/views/round/Round.vue
+++ b/web/src/views/round/Round.vue
@@ -5,6 +5,7 @@
         <h1>{{ round?.name }}</h1>
         <div class="flex-grow-1"></div>
         <RoundedButton
+          id="deleteround"
           icon="mdi-delete-outline"
           value="Verwijderen"
           @click="deleteRound()"
@@ -40,6 +41,7 @@
         <h2>Planning</h2>
         <div class="flex-grow-1"></div>
         <RoundedButton
+          id="schedule"
           icon="mdi-calendar"
           value="Inplannen"
           @click="router.push({ name: 'round_plan', params: { id: round_id } })"
@@ -48,6 +50,7 @@
 
       <div class="space-y-8">
         <RoundCard
+          id="schedules"
           v-for="schedule in schedules"
           v-bind:key="schedule.id"
           :schedule="schedule"
diff --git a/web/src/views/round/RoundFollowup.vue b/web/src/views/round/RoundFollowup.vue
index b2abe3634..aa5ccbc7e 100644
--- a/web/src/views/round/RoundFollowup.vue
+++ b/web/src/views/round/RoundFollowup.vue
@@ -1,6 +1,7 @@
 <template>
   <HFillWrapper>
     <LargeFilter
+      id="filter"
       :search_by_labels="query_labels"
       :sort_items="sort_items"
       :filter_items="filter_options"
diff --git a/web/src/views/round/RoundMaker.vue b/web/src/views/round/RoundMaker.vue
index c80bde2d0..2d71c524a 100644
--- a/web/src/views/round/RoundMaker.vue
+++ b/web/src/views/round/RoundMaker.vue
@@ -17,6 +17,7 @@
           ></v-switch
         ></template>
         <v-text-field
+          id="roundname"
           class="ml-3 mr-5"
           label="Naam ronde"
           v-model="newRoundName"
@@ -24,7 +25,7 @@
         />
         <v-card-actions class="d-flex align-center"
           ><v-spacer></v-spacer
-          ><v-btn class="ml-3" prepend-icon="mdi-check" @click="makeRound()"
+          ><v-btn id="createround" class="ml-3" prepend-icon="mdi-check" @click="makeRound()"
             >Ronde aanmaken</v-btn
           ></v-card-actions
         >
@@ -58,6 +59,7 @@
       </border-card>
 
       <building-info-card
+        id="availablebuildings"
         v-for="entry in filterlist()"
         :key="entry.listID"
         :name="entry.building.name"
diff --git a/web/src/views/round/RoundPlanner.vue b/web/src/views/round/RoundPlanner.vue
index a78fd26b3..158285bef 100644
--- a/web/src/views/round/RoundPlanner.vue
+++ b/web/src/views/round/RoundPlanner.vue
@@ -22,6 +22,7 @@
             style="min-width: 100px; max-width: 100%"
             class="flex-grow-1 flex-shrink-0"
             ><v-select
+            id="selectstudent"
               label="Selecteer student"
               :items="students"
               v-model="student"
@@ -49,6 +50,7 @@
           :class="multipleday ? 'grid-cols-4' : 'grid-cols-3'"
         >
           <v-select
+            id="frequency"
             prepend-inner-icon="mdi-replay"
             variant="outlined"
             label="Frequentie"
@@ -58,6 +60,7 @@
           ></v-select>
 
           <v-text-field
+            id="startdate"
             v-model="startDate"
             prepend-inner-icon="mdi-calendar"
             variant="outlined"
@@ -66,6 +69,7 @@
           ></v-text-field>
 
           <v-text-field
+            id="enddate"
             v-model="endDate"
             prepend-inner-icon="mdi-calendar"
             variant="outlined"
@@ -75,6 +79,7 @@
           ></v-text-field>
 
           <v-text-field
+            id="starttime"
             prepend-inner-icon="mdi-clock-time-two-outline"
             label="Starttijd"
             variant="outlined"
@@ -85,6 +90,7 @@
 
         <div style="display: flex; align-items: center">
           <v-btn
+            id="addschedule"
             prepend-icon="mdi-plus"
             @click="updateRounds()"
             :disabled="student === undefined"

From 94438ae9d955c6b4303f95ceda4c199f81479777 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 29 Apr 2023 18:13:36 +0200
Subject: [PATCH 07/33] chore: re-order component tests

---
 web/cypress/component/building.cy.ts | 25 +++++++++++++++
 web/cypress/component/buttons.cy.ts  | 24 ++++++++++++++
 web/cypress/component/test.cy.ts     | 47 ----------------------------
 3 files changed, 49 insertions(+), 47 deletions(-)
 create mode 100644 web/cypress/component/building.cy.ts
 create mode 100644 web/cypress/component/buttons.cy.ts
 delete mode 100644 web/cypress/component/test.cy.ts

diff --git a/web/cypress/component/building.cy.ts b/web/cypress/component/building.cy.ts
new file mode 100644
index 000000000..4573d349f
--- /dev/null
+++ b/web/cypress/component/building.cy.ts
@@ -0,0 +1,25 @@
+import BuildingCard from '@/components/building/BuildingCard.vue'
+import GarbageSchedule from '@/components/building/GarbageSchedule.vue'
+
+describe("building component test", () => {
+  it('buildingcard', () => {
+    cy.mount(BuildingCard, {
+      props: {
+        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
+      },
+    })
+    // can't really click on it, as there is no active router to perform router.push(...)
+  })
+
+  it('garbageschedule', ()=>{
+    cy.mount(GarbageSchedule, {
+      props: {
+        schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
+          id: 7,
+          user: {first_name: "one", last_name: "two"}
+        }]
+      }
+    })
+    // not exactly correct
+  })
+})
diff --git a/web/cypress/component/buttons.cy.ts b/web/cypress/component/buttons.cy.ts
new file mode 100644
index 000000000..9e8f61ba1
--- /dev/null
+++ b/web/cypress/component/buttons.cy.ts
@@ -0,0 +1,24 @@
+import RoundedButton from '@/components/buttons/RoundedButton.vue'
+import AddButton from '@/components/buttons/AddButton.vue'
+
+describe("buttons test", () => {
+  it('roundedbutton', () => {
+    cy.mount(RoundedButton, {
+      props: {
+        icon: 'mdi-domain',
+        value: 'Click me!',
+      },
+    })
+    cy.get('#button').should('contains.text', 'Click me!')
+  })
+
+  it('addbutton', () => {
+    cy.mount(AddButton, {
+      props: {
+        icon: 'mdi-domain',
+        items: []
+      },
+    })
+    cy.get('#menu-activator').click()
+  })
+})
diff --git a/web/cypress/component/test.cy.ts b/web/cypress/component/test.cy.ts
deleted file mode 100644
index 7009222de..000000000
--- a/web/cypress/component/test.cy.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import RoundedButton from '../../src/components/buttons/RoundedButton.vue'
-import AddButton from '../../src/components/buttons/AddButton.vue'
-import BuildingCard from '../../src/components/building/BuildingCard.vue'
-import GarbageSchedule from '../../src/components/building/GarbageSchedule.vue'
-
-describe("test", () => {
-  it('roundedbutton', () => {
-    cy.mount(RoundedButton, {
-      props: {
-        icon: 'mdi-domain',
-        value: 'Click me!',
-      },
-    })
-    cy.get('#button').should('contains.text', 'Click me!')
-  })
-
-  it('addbutton', () => {
-    cy.mount(AddButton, {
-      props: {
-        icon: 'mdi-domain',
-        items: []
-      },
-    })
-    cy.get('#menu-activator').click()
-  })
-
-  it('buildingcard', () => {
-    cy.mount(BuildingCard, {
-      props: {
-        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
-      },
-    })
-    // can't really click on it, as there is no active router to perform router.push(...)
-  })
-
-  it('garbageschedule', ()=>{
-    cy.mount(GarbageSchedule, {
-      props: {
-        schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
-          id: 7,
-          user: {first_name: "one", last_name: "two"}
-        }]
-      }
-    })
-    // not exactly correct
-  })
-})

From 61782c7be4246821da0566e298b79fc33d323c97 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 29 Apr 2023 19:04:21 +0200
Subject: [PATCH 08/33] feat: card test + added some TODO's

---
 web/cypress/component/cards.cy.ts             | 64 +++++++++++++++++++
 web/cypress/e2e/administrator.cy.ts           |  1 +
 web/cypress/e2e/superstudent.cy.ts            |  7 +-
 web/cypress/support/commands.ts               |  1 +
 web/src/components/cards/BuildingInfoCard.vue |  2 +-
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 web/cypress/component/cards.cy.ts

diff --git a/web/cypress/component/cards.cy.ts b/web/cypress/component/cards.cy.ts
new file mode 100644
index 000000000..ada706643
--- /dev/null
+++ b/web/cypress/component/cards.cy.ts
@@ -0,0 +1,64 @@
+import BuildingCard from '@/components/cards/BuildingCard.vue'
+import BuildingInfoCard from '@/components/cards/BuildingInfoCard.vue'
+import BuildingSelectCard from '@/components/cards/BuildingSelectCard.vue'
+import ImageCard from '@/components/cards/ImageCard.vue'
+
+describe("card tests", () => {
+  it('buildingcard test', () => {
+    cy.mount(BuildingCard, {
+      props: {
+        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"},
+        syndicus: {user: {first_name: "test", last_name: "gebruiker"}}},
+        start_date: new Date(),
+        end_date: new Date(),
+      },
+    })
+    cy.contains('testgebouw')
+    cy.contains('test gebruiker')
+    cy.contains('teststraat 5 Gent')
+  })
+
+  it('buildinginfocard test', () => {
+    cy.mount(BuildingInfoCard, {
+      props: {
+        name: "testgebouw",
+        address: "teststraat 1",
+        id: "1",
+      },
+    })
+    cy.contains('testgebouw')
+    cy.contains('teststraat 1')
+  })
+
+  it('buildingselectcard test', () => {
+    cy.mount(BuildingSelectCard, {
+      props: {
+        name: "testgebouw",
+        address: "teststraat 1",
+        buildingId: 1,
+        garbageinfo: true,
+      },
+    })
+    cy.contains('testgebouw')
+    cy.contains('teststraat 1')
+  })
+
+  it('imagecard test', () => {
+    cy.mount(ImageCard, {
+      props: {
+        img: "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0f/Grosser_Panda.JPG/1200px-Grosser_Panda.JPG",
+        title: "test image",
+        titleIcon: "mdi-domain",
+        text: "text",
+        textIcon: "mdi-domain",
+        btnIcon: "mdi-domain",
+        btnText: "button",
+      },
+    })
+    // TODO title and text don't display
+    // cy.contains('text')
+    cy.contains('button')
+  })
+
+
+})
diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index ba41636eb..a58b3b478 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -1,4 +1,5 @@
 describe('admin tests', () => {
+  // TODO check if cy.contains('X') works instead of cy.get(..).get(...).contains('X')
   beforeEach(() => {
     cy.login('administrator@trottoir.be', 'administrator')
     cy.visit('/ronde/overzicht')
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index fcb1330c6..44866d474 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,4 +1,7 @@
 describe('superstudent tests', () => {
+  // TODO check if cy.contains('X') works instead of cy.get(..).get(...).contains('X')
+  // TODO check if select(...) works better with index
+  // TODO get('CustomComponent') will probably fail => find solution
   beforeEach(() => {
     cy.login('superstudent@trottoir.be', 'super_student')
     cy.visit('/ronde/overzicht')
@@ -29,6 +32,7 @@ describe('superstudent tests', () => {
     cy.get('#rounds').click()
     // press on the round you wish to change
     cy.get('#roundtable').get('#table').contains('td', 'Round 1').click()
+    // maybe even cy.contains('td', 'Round 1').click() will work
     // press edit button
 
     // edit button currently not implemented
@@ -63,7 +67,8 @@ describe('superstudent tests', () => {
     //check if schedule has been added
     cy.get('#rounds').click()
     cy.get('#roundtable').get('#table').contains('td', 'test round').click()
-    cy.get('RoundCard').contains("h3", new Date("2023-05-01").toLocaleDateString()) // I don't know if this will work
+    cy.get('RoundCard').contains("h3", new Date("2023-05-01").toLocaleDateString())
+    // I don't know if this will work, maybe just cy.contains("h3", new Date("2023-05-01").toLocaleDateString())
   })
 
   it('switch student for round (for a single date)', () => {
diff --git a/web/cypress/support/commands.ts b/web/cypress/support/commands.ts
index 609449353..c9d56dc4a 100644
--- a/web/cypress/support/commands.ts
+++ b/web/cypress/support/commands.ts
@@ -53,6 +53,7 @@ Cypress.Commands.add('login' as any, (email: string, password:string) => {
     cy.get('#email').type(email)
     cy.get('#password').type(password)
     cy.get('#login').click()
+    // TODO remove next line from comments when routing is fixed, also change it in the e2e tests
     // cy.get('#logout').should('be.visible')
   },
     {
diff --git a/web/src/components/cards/BuildingInfoCard.vue b/web/src/components/cards/BuildingInfoCard.vue
index 88dc4da47..51978d7b2 100644
--- a/web/src/components/cards/BuildingInfoCard.vue
+++ b/web/src/components/cards/BuildingInfoCard.vue
@@ -3,7 +3,7 @@
     <template v-slot:prepend>
       <v-icon icon="mdi-office-building"></v-icon>
     </template>
-    <template id="buildingname" v-slot:title>{{ name }}</template
+    <template v-slot:title>{{ name }}</template
     ><template v-slot:subtitle>{{ address }}</template>
   </BorderCard>
 </template>

From 10d88dfa7fb04771d9d0ae54db5be3f0f90d9ac9 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 30 Apr 2023 23:03:18 +0200
Subject: [PATCH 09/33] feat: component tests cards, filter, forms

---
 web/cypress/component/building.cy.ts      |   4 +-
 web/cypress/component/buttons.cy.ts       |   4 +-
 web/cypress/component/cards.cy.ts         |  99 +++++++++++++-
 web/cypress/component/filter.cy.ts        |  29 +++++
 web/cypress/component/forms.cy.ts         | 151 ++++++++++++++++++++++
 web/src/components/cards/BuildingCard.vue |  12 +-
 web/src/components/cards/RoundCard.vue    |   6 +-
 web/src/components/filter/LargeFilter.vue |   4 +-
 8 files changed, 290 insertions(+), 19 deletions(-)
 create mode 100644 web/cypress/component/filter.cy.ts
 create mode 100644 web/cypress/component/forms.cy.ts

diff --git a/web/cypress/component/building.cy.ts b/web/cypress/component/building.cy.ts
index 4573d349f..d4aba8e63 100644
--- a/web/cypress/component/building.cy.ts
+++ b/web/cypress/component/building.cy.ts
@@ -2,7 +2,7 @@ import BuildingCard from '@/components/building/BuildingCard.vue'
 import GarbageSchedule from '@/components/building/GarbageSchedule.vue'
 
 describe("building component test", () => {
-  it('buildingcard', () => {
+  it('buildingcard test', () => {
     cy.mount(BuildingCard, {
       props: {
         building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
@@ -11,7 +11,7 @@ describe("building component test", () => {
     // can't really click on it, as there is no active router to perform router.push(...)
   })
 
-  it('garbageschedule', ()=>{
+  it('garbageschedule test', ()=>{
     cy.mount(GarbageSchedule, {
       props: {
         schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
diff --git a/web/cypress/component/buttons.cy.ts b/web/cypress/component/buttons.cy.ts
index 9e8f61ba1..fe50aebc9 100644
--- a/web/cypress/component/buttons.cy.ts
+++ b/web/cypress/component/buttons.cy.ts
@@ -2,7 +2,7 @@ import RoundedButton from '@/components/buttons/RoundedButton.vue'
 import AddButton from '@/components/buttons/AddButton.vue'
 
 describe("buttons test", () => {
-  it('roundedbutton', () => {
+  it('roundedbutton test', () => {
     cy.mount(RoundedButton, {
       props: {
         icon: 'mdi-domain',
@@ -12,7 +12,7 @@ describe("buttons test", () => {
     cy.get('#button').should('contains.text', 'Click me!')
   })
 
-  it('addbutton', () => {
+  it('addbutton test', () => {
     cy.mount(AddButton, {
       props: {
         icon: 'mdi-domain',
diff --git a/web/cypress/component/cards.cy.ts b/web/cypress/component/cards.cy.ts
index ada706643..037885e78 100644
--- a/web/cypress/component/cards.cy.ts
+++ b/web/cypress/component/cards.cy.ts
@@ -2,6 +2,8 @@ import BuildingCard from '@/components/cards/BuildingCard.vue'
 import BuildingInfoCard from '@/components/cards/BuildingInfoCard.vue'
 import BuildingSelectCard from '@/components/cards/BuildingSelectCard.vue'
 import ImageCard from '@/components/cards/ImageCard.vue'
+import RoundCard from '@/components/cards/RoundCard.vue'
+import RoundSelectCard from '@/components/cards/RoundSelectCard.vue'
 
 describe("card tests", () => {
   it('buildingcard test', () => {
@@ -43,7 +45,7 @@ describe("card tests", () => {
     cy.contains('teststraat 1')
   })
 
-  it('imagecard test', () => {
+  it('imagecard test with image', () => {
     cy.mount(ImageCard, {
       props: {
         img: "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0f/Grosser_Panda.JPG/1200px-Grosser_Panda.JPG",
@@ -55,10 +57,101 @@ describe("card tests", () => {
         btnText: "button",
       },
     })
-    // TODO title and text don't display
-    // cy.contains('text')
+    cy.contains('test image').should('not.exist')
+    cy.contains('text').should('not.exist')
     cy.contains('button')
   })
 
+  it('imagecard test without image', () => {
+    cy.mount(ImageCard, {
+      props: {
+        title: "test image",
+        titleIcon: "mdi-domain",
+        text: "text",
+        textIcon: "mdi-domain",
+        btnIcon: "mdi-domain",
+        btnText: "button",
+      },
+    })
+    cy.contains('text')
+    cy.contains('button')
+  })
+
+  it('roundcard with zero progress', () => {
+    const datum: Date = new Date()
+    cy.mount(RoundCard, {
+      props: {
+        round_name: "test round",
+        round_start: "startdate or time",
+        round_end: "enddate or time",
+        student_name: "test student",
+        date: datum,
+        total_buildings: 5,
+        building_index: 0,
+        round_comments: true,
+      },
+    })
+    cy.contains('test round')
+    cy.get('#start')
+    cy.get('#end')
+    cy.contains('test student')
+    cy.contains(datum.toLocaleDateString())
+    cy.contains('5')
+    cy.contains('Niet begonnen')
+  })
+
+  it('roundcard with some progress', () => {
+    cy.mount(RoundCard, {
+      props: {
+        round_name: "test round",
+        student_name: "test student",
+        date: new Date(),
+        total_buildings: 5,
+        building_index: 4,
+        round_comments: false,
+      },
+    })
+    cy.contains('test round')
+    cy.get('#start').should('not.exist')
+    cy.get('#end').should('not.exist')
+    cy.contains('test student')
+    cy.contains('5')
+    cy.contains('Bezig 4/5')
+  })
+
+  it('roundcard with full progress', () => {
+    cy.mount(RoundCard, {
+      props: {
+        round_name: "test round",
+        round_start: "startdate or time",
+        round_end: "enddate or time",
+        student_name: "test student",
+        date: new Date(),
+        total_buildings: 5,
+        building_index: 5,
+        round_comments: false,
+      },
+    })
+    cy.contains('test round')
+    cy.get('#start')
+    cy.get('#end')
+    cy.contains('test student')
+    cy.contains('5')
+    cy.contains('Klaar')
+  })
 
+  it('roundselectcard test', () => {
+    const datum: Date = new Date()
+    cy.mount(RoundSelectCard, {
+      props: {
+        name: 'test round',
+        date: datum,
+        time: "tijd",
+        id: "1",
+      },
+    })
+    cy.contains('test round')
+    cy.contains('tijd')
+    cy.contains(datum.toLocaleDateString())
+  })
 })
diff --git a/web/cypress/component/filter.cy.ts b/web/cypress/component/filter.cy.ts
new file mode 100644
index 000000000..454cdaf9f
--- /dev/null
+++ b/web/cypress/component/filter.cy.ts
@@ -0,0 +1,29 @@
+import Filter from '@/components/filter/LargeFilter.vue'
+
+describe("filter tests", () => {
+  it('largefilter test', () => {
+    cy.mount(Filter, {
+      props: {
+        search_by_labels: ["test1", "test2"],
+        filter_items: ["status1", "status2"],
+        selected_filters: [],
+        sort_items: ["date", "alphabetical"],
+        start_date: new Date(),
+        enable_start_date: true,
+        end_date: new Date(),
+        enable_end_date: true,
+      },
+    })
+    cy.contains("Zoek per test1")
+    cy.contains("Zoek per test2").should('not.exist')
+    cy.get("#showfilters").click()
+    cy.contains("Eerste dag").parent().type('2023-01-04') // has to be YYYY-MM-DD format
+    cy.contains('Zoekcategorie').parent().click()
+    cy.contains("test2").click()
+    cy.contains("Zoek per test2")
+    cy.contains("Zoek per test1").should('not.exist')
+    cy.contains('status1').click()
+    cy.contains('alphabetical').click()
+    cy.contains('Dalend').click()
+  })
+})
diff --git a/web/cypress/component/forms.cy.ts b/web/cypress/component/forms.cy.ts
new file mode 100644
index 000000000..219305c93
--- /dev/null
+++ b/web/cypress/component/forms.cy.ts
@@ -0,0 +1,151 @@
+import AdressForm from '@/components/forms/AddressForm.vue'
+import ContactForm from '@/components/forms/ContactForm.vue'
+import RolesForm from '@/components/forms/RolesForm.vue'
+
+
+describe("form tests", () => {
+  describe('addressform tests', () => {
+    it('addressform correct input test', () => {
+      cy.mount(AdressForm, {
+        props:{
+          // default props
+          readonly: false,
+          street: "",
+          number: "0",
+          city: "",
+          zip_code: "0",
+        }
+      })
+      cy.get('#street').type("Teststraat")
+      cy.get('#city').type('Gent')
+      cy.get('#streetnr').type('{backspace}17')
+      cy.get('#zipcode').type('{backspace}9000')
+      cy.get('#street').should('have.value', 'Teststraat')
+      cy.get('#streetnr').should('have.value', '17')
+      cy.get('#city').should('have.value', 'Gent')
+      cy.get('#zipcode').should('have.value', '9000')
+    })
+
+    it('addressform incorrect input test', () => {
+      cy.mount(AdressForm, {
+        // default props
+      })
+      cy.get('#streetnr').type('hallo') // you can only enter numbers
+      cy.get('#streetnr').should('have.value', '0')
+      cy.get('#zipcode').type('hallo') // you can only enter numbers
+      cy.get('#zipcode').should('have.value', '0')
+      cy.get('#zipcode').type('9000') // without backspace, the zip code will be 09000, which is an incorrect zipcode
+      cy.contains('Ongeldige postcode')
+    })
+
+    it('addressform readonly test', () => {
+      cy.mount(AdressForm, {
+        props:{
+          readonly: true,
+        }
+      })
+      cy.get('#street').should('have.attr', 'readonly', 'readonly')
+      cy.get('#city').should('have.attr', 'readonly', 'readonly')
+      cy.get('#streetnr').should('have.attr', 'readonly', 'readonly')
+      cy.get('#zipcode').should('have.attr', 'readonly', 'readonly')
+    })
+
+    it('addressform empty test', () => {
+      cy.mount(AdressForm, {
+        // default props
+      })
+      cy.get('#street').type('x{backspace}')
+      cy.get('#city').type('x{backspace}')
+      cy.get('#streetnr').clear()
+      cy.get('#zipcode').clear()
+      cy.contains('Geef een straat op.')
+      cy.contains('Geef een stad op.')
+      cy.contains('Geef een huisnummer.')
+      cy.contains('Geef een postcode.')
+    })
+  })
+
+  describe('conctactform test', () => {
+    it('contactform correct input test', () => {
+      cy.mount(ContactForm, {
+        props: {
+          // default props
+          readonly: false,
+          phone: "",
+          email: "",
+        },
+      })
+      cy.get('#phone').type('0123456789')
+      cy.get('#email').type('test@test.com')
+      cy.get('#phone').should('have.value', '0123456789')
+      cy.get('#email').should('have.value', 'test@test.com')
+    })
+
+    it('contactform incorrect input test', () => {
+      cy.mount(ContactForm, {
+        // default props
+      })
+      // cy.get('#phone').type('hallo') // you can only enter numbers
+      // cy.get('#phone').should('be.empty') // this not yet implemented now
+      cy.get('#phone').type("012345") // phone number too short
+      cy.contains('Telefoonnummer moet minimaal 9 tekens lang zijn.')
+      cy.get('#email').type('thisisnotanemail') // email has to have the correct template
+      cy.contains('Ongeldig e-mail adres.')
+    })
+
+    it('contactform empty test', () => {
+      cy.mount(ContactForm, {
+        // default props
+      })
+      cy.get('#phone').type('x{backspace}')
+      cy.contains('Geef een telefoonnummer op.')
+      cy.get('#email').type('x{backspace}')
+      cy.contains('Geef een e-mail adres op.')
+    })
+
+    it('contactform readonly test', () => {
+      cy.mount(ContactForm, {
+        props:{
+          readonly: true,
+        }
+      })
+      cy.get('#phone').should('have.attr', 'readonly', 'readonly')
+      cy.get('#email').should('have.attr', 'readonly', 'readonly')
+    })
+  })
+
+  describe.only('roleform test', () => {
+    it('roleform input test', () => {
+      cy.mount(RolesForm, {
+        props: {
+          modelValue: [],
+          readonly: false,
+        },
+      })
+      cy.get('#student').check()
+      cy.get('#superstudent').check()
+      cy.get('#administrator').check()
+      cy.get('#student').should('be.checked')
+      cy.get('#superstudent').should('be.checked')
+      cy.get('#administrator').should('be.checked')
+      cy.get('#student').uncheck()
+      cy.get('#superstudent').uncheck()
+      cy.get('#administrator').uncheck()
+      cy.get('#student').should('not.be.checked')
+      cy.get('#superstudent').should('not.be.checked')
+      cy.get('#administrator').should('not.be.checked')
+    })
+
+    it('rolesform readonly test', () => {
+      cy.mount(RolesForm, {
+        props:{
+          readonly: true,
+        }
+      })
+      cy.get('#student').should('have.attr', 'disabled', 'disabled')
+      cy.get('#superstudent').should('have.attr', 'disabled', 'disabled')
+      cy.get('#administrator').should('have.attr', 'disabled', 'disabled')
+    })
+  })
+
+})
diff --git a/web/src/components/cards/BuildingCard.vue b/web/src/components/cards/BuildingCard.vue
index 3f67e28b0..23a30e83c 100644
--- a/web/src/components/cards/BuildingCard.vue
+++ b/web/src/components/cards/BuildingCard.vue
@@ -46,7 +46,7 @@
               v-if="!can_expand"
             >
               <v-icon icon="mdi-calendar-clock"></v-icon>
-              <p class="ml-2">{{ start_date.toLocaleDateString("nl") }}</p>
+              <p class="ml-2">{{ start_date.toLocaleDateString() }}</p>
             </v-chip>
             <!-- Date expansion button-->
             <v-btn
@@ -75,9 +75,7 @@
             <v-icon color="blue" icon="mdi-calendar-clock"></v-icon>
             <p class="ml-2">
               {{
-                new Date(progress.arrival ?? new Date()).toLocaleDateString(
-                  "nl",
-                )
+                new Date(progress.arrival ?? new Date()).toLocaleDateString()
               }}
             </p>
             <v-icon end color="black" v-if="progress.report">
@@ -126,8 +124,8 @@ const comments = ref<Boolean>(false);
 let progresses: Ref<Result<ProgressQuery>[]> = ref([]);
 
 const can_expand: Ref<boolean> = ref(
-  props.start_date.toLocaleDateString("nl") !==
-    props.end_date.toLocaleDateString("nl"),
+  props.start_date.toLocaleDateString() !==
+    props.end_date.toLocaleDateString(),
 );
 
 tryOrAlertAsync(async () => {
@@ -147,7 +145,7 @@ function route(date: Date | null) {
       params: {
         id: props.building.id,
         // TODO change to different route with:
-        //  date: new Date(date).toLocaleDateString("nl"),
+        //  date: new Date(date).toLocaleDateString(),
       },
     });
   }
diff --git a/web/src/components/cards/RoundCard.vue b/web/src/components/cards/RoundCard.vue
index 801d314cd..1877d8804 100644
--- a/web/src/components/cards/RoundCard.vue
+++ b/web/src/components/cards/RoundCard.vue
@@ -62,14 +62,14 @@
     <v-chip label color="primary" class="ml-3">
       <v-icon icon="mdi-calendar" class="pr-1" />
       {{
-        date.getDate() + "-" + date.getMonth() + 1 + "-" + date.getFullYear()
+        date.toLocaleDateString()
       }}
     </v-chip>
     <v-chip v-if="round_start" label color="primary" class="ml-3">
-      <v-icon icon="mdi-clock"></v-icon> {{ round_start }}
+      <v-icon id ="start" icon="mdi-clock"></v-icon> {{ round_start }}
     </v-chip>
     <v-chip v-if="round_end" label color="primary" class="ml-3">
-      <v-icon icon="mdi-clock-check"></v-icon> {{ round_end }}
+      <v-icon id="end" icon="mdi-clock-check"></v-icon> {{ round_end }}
     </v-chip>
   </BorderCard>
 </template>
diff --git a/web/src/components/filter/LargeFilter.vue b/web/src/components/filter/LargeFilter.vue
index 2996682c9..07783931e 100644
--- a/web/src/components/filter/LargeFilter.vue
+++ b/web/src/components/filter/LargeFilter.vue
@@ -170,9 +170,9 @@ const e_day = ref<string>(props.end_date.toISOString().substring(0, 10));
 
 // The filter data is emitted with the 'onUpdate' tag
 const filter_data = ref<FilterData>({
-  // The search querry in the main search bar
+  // The search query in the main search bar
   query: "",
-  // The selcted value to seach by
+  // The selected value to search by
   search_label: props.search_by_labels[0],
   // The currently selected sort option
   sort_by: props.sort_items[0],

From a093c1dabdb04c6080a79d9041140bea99ca03e3 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Mon, 1 May 2023 18:47:12 +0200
Subject: [PATCH 10/33] feat: component tests images and popups

---
 web/cypress/component/images.cy.ts            | 54 +++++++++++++++++++
 web/cypress/component/popups.cy.ts            | 32 +++++++++++
 web/cypress/component/round.cy.ts             | 24 +++++++++
 web/src/components/images/AddImage.vue        |  2 +
 web/src/components/images/PhotoMaker.vue      |  5 +-
 .../popups/StartRoundPopupContent.vue         |  4 +-
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 web/cypress/component/images.cy.ts
 create mode 100644 web/cypress/component/popups.cy.ts
 create mode 100644 web/cypress/component/round.cy.ts

diff --git a/web/cypress/component/images.cy.ts b/web/cypress/component/images.cy.ts
new file mode 100644
index 000000000..1dc4540a8
--- /dev/null
+++ b/web/cypress/component/images.cy.ts
@@ -0,0 +1,54 @@
+import AddImage from '@/components/images/AddImage.vue'
+import MultiAddImage from '@/components/images/MultiAddImage.vue'
+import PhotoMaker from '@/components/images/PhotoMaker.vue'
+
+describe("images tests", () => {
+  it('addimage id!=0 test', () => {
+    cy.mount(AddImage, {
+      props:{
+        id: 1
+      }
+    })
+    cy.contains('Commentaar')
+    cy.get('#comment').should('have.value', '')
+    cy.get('#comment').type('New Comment')
+    cy.get('#comment').should('have.value', 'New Comment')
+    cy.contains('Verwijder afbeelding').should('be.visible')
+    cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
+  })
+  it('addimage id==0 test', () => {
+    cy.mount(AddImage, {
+      props:{
+        id: 0
+      }
+    })
+    cy.contains('Commentaar')
+    cy.contains('Verwijder afbeelding').should('not.be.visible')
+    // Verwijder afbeelding should appear on the screen when adding new image
+    // cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
+    // y.contains('Verwijder afbeelding').should('be.visible')
+  })
+
+  it('multiaddimage test', () => {
+    cy.mount(MultiAddImage, {})
+    cy.contains('afbeelding toevoegen').click()
+    // check if an extra image field was added
+    cy.get('button:contains("Verwijder afbeelding")').should('have.length', 2);
+  })
+
+  it.only('photomaker test', () => {
+    cy.mount(PhotoMaker, {})
+    cy.contains("Maak foto")
+    cy.contains("Selecteer afbeelding")
+    cy.contains("Commentaar")
+    cy.contains("Foto label")
+    cy.get('#comment').should('have.value', '')
+    cy.get('#comment').type('New Comment')
+    cy.get('#comment').should('have.value', 'New Comment')
+    cy.get('#label').should('have.value', '')
+    cy.get('#label').type('New Label')
+    cy.get('#label').should('have.value', 'New Label')
+    cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
+  })
+
+})
diff --git a/web/cypress/component/popups.cy.ts b/web/cypress/component/popups.cy.ts
new file mode 100644
index 000000000..82658e131
--- /dev/null
+++ b/web/cypress/component/popups.cy.ts
@@ -0,0 +1,32 @@
+import CardPopup from '@/components/popups/CardPopup.vue'
+import Loader from '@/components/popups/Loader.vue'
+import StartRoundPopup from '@/components/popups/StartRoundPopupContent.vue'
+
+describe("popup tests", () => {
+  it.only('cardpopup test', () => {
+    cy.mount(CardPopup, {
+      props: ["modelValue"]
+    })
+    // TODO the mount doesn't give an error, but it's just a blank screen
+  })
+
+  it('loader popup test', () => {
+    cy.mount(Loader, {
+    })
+    // this is just a spinnning circle, so there is not really anything to test
+  })
+
+  it('start round popup test', () => {
+    cy.mount(StartRoundPopup, {
+      props: {
+        oncancel: () => {},
+        onsubmit: () => {},
+      }
+    })
+    cy.contains('Start ronde')
+    cy.contains('Je staat op het punt een ronde te starten. Het huidige tijdstip zal opgeslagen worden als start ' +
+      'tijdstip. Ben je zeker dat je de ronde wilt starten?')
+    cy.get('#start').contains('Start ronde')
+    cy.get('#cancel').contains( 'Annuleer')
+  })
+})
diff --git a/web/cypress/component/round.cy.ts b/web/cypress/component/round.cy.ts
new file mode 100644
index 000000000..39e3127d3
--- /dev/null
+++ b/web/cypress/component/round.cy.ts
@@ -0,0 +1,24 @@
+import Progress from '@/components/round/Progress.vue'
+
+
+describe("round tests", () => {
+  it.only('progress test', () => {
+    cy.mount(Progress, {
+      props: {
+        progress:
+        {id:1, report:"test", arrival: new Date(), departure: new Date(), building_id: 2,
+                   building: {
+                     id: 2,name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+                     address: {
+                       id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+                     }},
+                   schedule_id: 5, schedule: {}, images: ["a", "b"]
+                 },
+        building: {id: 2,name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+          address: {
+            id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+          }},
+        }
+    })
+  })
+})
diff --git a/web/src/components/images/AddImage.vue b/web/src/components/images/AddImage.vue
index ceb2965b6..1e79acdf2 100644
--- a/web/src/components/images/AddImage.vue
+++ b/web/src/components/images/AddImage.vue
@@ -11,6 +11,7 @@
       <v-toolbar color="rgba(0, 0, 0, 0)" class="mt-2 pt-2">
         <template v-slot:append>
           <v-file-input
+            id="input"
             single
             v-model="image"
             accept="image/*"
@@ -24,6 +25,7 @@
       </v-toolbar>
     </v-img>
     <v-textarea
+      id="comment"
       label="Commentaar"
       rows="3"
       v-model="comments"
diff --git a/web/src/components/images/PhotoMaker.vue b/web/src/components/images/PhotoMaker.vue
index 0b9d6f20d..04e475da7 100644
--- a/web/src/components/images/PhotoMaker.vue
+++ b/web/src/components/images/PhotoMaker.vue
@@ -14,6 +14,7 @@
         </div>
 
         <v-file-input
+          id="select"
           single
           v-model="photo.image"
           label="Selecteer afbeelding"
@@ -23,12 +24,14 @@
           @update:model-value="$emit('onUpdate', photo)"
         ></v-file-input>
         <v-textarea
+          id="comment"
           @update:model-value="$emit('onUpdate', photo)"
           label="Commentaar"
           rows="3"
           v-model="photo.comments"
         ></v-textarea>
         <v-text-field
+          id="label"
           @update:model-value="$emit('onUpdate', photo)"
           label="Foto label"
           v-model="photo.label"
@@ -51,7 +54,7 @@ const photo = ref<Photo>({
 const imageUrl = ref("");
 
 /*TODO: fix typing here, commented this for deadline 1
-  Should be added in <v-file-input> 
+  Should be added in <v-file-input>
     @change="previewImage"
 
 const previewImage = (event) => {
diff --git a/web/src/components/popups/StartRoundPopupContent.vue b/web/src/components/popups/StartRoundPopupContent.vue
index e7688b904..3cb2a7d81 100644
--- a/web/src/components/popups/StartRoundPopupContent.vue
+++ b/web/src/components/popups/StartRoundPopupContent.vue
@@ -9,8 +9,8 @@
       starten?
     </p>
     <div class="d-flex flex-row-reverse ma-3">
-      <v-btn color="success" @click="onsubmit"> Start ronde </v-btn>
-      <v-btn @click="oncancel" color="error" class="mr-3"> Annuleer </v-btn>
+      <v-btn id="start" color="success" @click="onsubmit"> Start ronde </v-btn>
+      <v-btn id="cancel" @click="oncancel" color="error" class="mr-3"> Annuleer </v-btn>
     </div>
   </v-card>
 </template>

From c9ad473bf854f3408009be2436ceb99aed44937e Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Mon, 1 May 2023 22:22:22 +0200
Subject: [PATCH 11/33] feat: component tests round + general

---
 web/cypress/component/general.cy.ts   |  33 +++++++
 web/cypress/component/images.cy.ts    |   8 +-
 web/cypress/component/round.cy.ts     | 136 ++++++++++++++++++++++----
 web/src/components/PhotoButton.vue    |   1 +
 web/src/components/round/Progress.vue |   3 +
 5 files changed, 161 insertions(+), 20 deletions(-)
 create mode 100644 web/cypress/component/general.cy.ts

diff --git a/web/cypress/component/general.cy.ts b/web/cypress/component/general.cy.ts
new file mode 100644
index 000000000..27034cffa
--- /dev/null
+++ b/web/cypress/component/general.cy.ts
@@ -0,0 +1,33 @@
+import Avatar from '@/components/Avatar.vue'
+import Badge from '@/components/Badge.vue'
+import PhotoButton from '@/components/PhotoButton.vue'
+
+
+describe("component tests", () => {
+  it('avatar test', () => {
+    cy.mount(Avatar, {
+      props: {
+        name: "test gebruiker",
+        size: "small",
+      },
+    })
+    cy.contains('tg')
+  })
+
+  it('badge test', () => {
+    cy.mount(Badge, {
+      props: {
+        value: 10,
+      },
+    })
+    cy.contains('10')
+  })
+
+  it('photobutton test', () => {
+    cy.mount(PhotoButton, {})
+    cy.contains("File input")
+    cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
+    cy.contains("drtroittoir_logo.png")
+  })
+
+})
diff --git a/web/cypress/component/images.cy.ts b/web/cypress/component/images.cy.ts
index 1dc4540a8..7aa94aeda 100644
--- a/web/cypress/component/images.cy.ts
+++ b/web/cypress/component/images.cy.ts
@@ -15,6 +15,7 @@ describe("images tests", () => {
     cy.get('#comment').should('have.value', 'New Comment')
     cy.contains('Verwijder afbeelding').should('be.visible')
     cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
+    cy.contains("drtroittoir_logo.png")
   })
   it('addimage id==0 test', () => {
     cy.mount(AddImage, {
@@ -24,9 +25,9 @@ describe("images tests", () => {
     })
     cy.contains('Commentaar')
     cy.contains('Verwijder afbeelding').should('not.be.visible')
-    // Verwijder afbeelding should appear on the screen when adding new image
+    // "Verwijder afbeelding" should appear on the screen when adding new image
     // cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
-    // y.contains('Verwijder afbeelding').should('be.visible')
+    // cy.contains('Verwijder afbeelding').should('be.visible')
   })
 
   it('multiaddimage test', () => {
@@ -36,7 +37,7 @@ describe("images tests", () => {
     cy.get('button:contains("Verwijder afbeelding")').should('have.length', 2);
   })
 
-  it.only('photomaker test', () => {
+  it('photomaker test', () => {
     cy.mount(PhotoMaker, {})
     cy.contains("Maak foto")
     cy.contains("Selecteer afbeelding")
@@ -49,6 +50,7 @@ describe("images tests", () => {
     cy.get('#label').type('New Label')
     cy.get('#label').should('have.value', 'New Label')
     cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
+    cy.contains("drtroittoir_logo.png")
   })
 
 })
diff --git a/web/cypress/component/round.cy.ts b/web/cypress/component/round.cy.ts
index 39e3127d3..b153f894b 100644
--- a/web/cypress/component/round.cy.ts
+++ b/web/cypress/component/round.cy.ts
@@ -1,24 +1,126 @@
 import Progress from '@/components/round/Progress.vue'
-
+import RoundCard from '@/components/round/RoundCard.vue'
 
 describe("round tests", () => {
-  it.only('progress test', () => {
-    cy.mount(Progress, {
-      props: {
-        progress:
-        {id:1, report:"test", arrival: new Date(), departure: new Date(), building_id: 2,
-                   building: {
-                     id: 2,name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
-                     address: {
-                       id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
-                     }},
-                   schedule_id: 5, schedule: {}, images: ["a", "b"]
-                 },
-        building: {id: 2,name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
-          address: {
-            id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
-          }},
+  describe('progress tests', () => {
+    it('progress test with images', () => {
+      cy.mount(Progress, {
+        props: {
+          progress:
+            {
+              id: 1, report: "test", arrival: new Date(), departure: new Date(), building_id: 2,
+              building: {
+                id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+                address: {
+                  id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+                }
+              },
+              schedule_id: 5, schedule: {},
+              images: [{
+                id: 1,
+                type: "arrival",
+                description: "test arrival"
+              }, {
+                id: 2,
+                type: "departure",
+                description: "test departure"
+              }]
+            },
+          building: {
+            id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+            address: {
+              id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+            }
+          },
+        }
+      })
+      cy.contains('testbuilding')
+      cy.contains('teststraat 1')
+      cy.contains('9000 Gent')
+      cy.contains('Notities')
+      cy.contains('test')
+      cy.contains('Bewerken')
+      cy.contains('Afbeeldingen')
+      cy.contains('Toevoegen')
+      cy.contains('arrival')
+      cy.contains('test arrival')
+      cy.contains('departure')
+      cy.contains('test departure')
+      cy.get('#edit').click()
+      cy.get('#notes').clear().type("NOTE")
+      cy.get('#save').click()
+      // savebutton uses apicall to update the database, so this can't be tested with just a component test
+      // same for the add image button
+    })
+    it('progress test no images', () => {
+      cy.mount(Progress, {
+        props: {
+          progress:
+            {
+              id: 1, report: "test", arrival: new Date(), departure: new Date(), building_id: 2,
+              building: {
+                id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+                address: {
+                  id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+                }
+              },
+              schedule_id: 5, schedule: {},
+              images: []
+            },
+          building: {
+            id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+            address: {
+              id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+            }
+          },
+        }
+      })
+      cy.contains('Geen foto\'s toegevoegd.')
+    })
+  })
+  describe.only('roundcard tests', () => {
+    it('roundcard completed', () => {
+      cy.mount(RoundCard, {
+        props: {
+          schedule: {
+            id: 1, day: new Date(), user_id: 2,
+            user:{first_name: "test", last_name: "gebruiker"},
+            round_id: 3, progress: []
+          },
+          status: "completed",
+        }
+      })
+      cy.contains((new Date()).toLocaleDateString())
+      cy.contains("test gebruiker")
+      cy.contains("Opmerkingen") // this is hardcoded with a random chance, so will sometimes fail
+      cy.contains('10') // this is still a hardcoded number for now
+    })
+
+      it('roundcard active', () => {
+      cy.mount(RoundCard, {
+        props: {
+          schedule: {
+            id: 1, day: new Date(), user_id: 2,
+            user:{first_name: "test", last_name: "gebruiker"},
+            round_id: 3, progress: []
+          },
+          status: "active",
+        }
+      })
+      cy.contains('Actief')
+    })
+
+    it('roundcard scheduled', () => {
+      cy.mount(RoundCard, {
+        props: {
+          schedule: {
+            id: 1, day: new Date(), user_id: 2,
+            user:{first_name: "test", last_name: "gebruiker"},
+            round_id: 3, progress: []
+          },
+          status: "scheduled",
         }
+      })
     })
   })
 })
diff --git a/web/src/components/PhotoButton.vue b/web/src/components/PhotoButton.vue
index 5ff48088b..9a5a5169e 100644
--- a/web/src/components/PhotoButton.vue
+++ b/web/src/components/PhotoButton.vue
@@ -1,5 +1,6 @@
 <template>
   <v-file-input
+    id="input"
     label="File input"
     outlined
     dense
diff --git a/web/src/components/round/Progress.vue b/web/src/components/round/Progress.vue
index 5b8df4c70..af21b2604 100644
--- a/web/src/components/round/Progress.vue
+++ b/web/src/components/round/Progress.vue
@@ -54,12 +54,14 @@
       <p v-if="!editMode">{{ progress?.report }}</p>
       <!-- eslint-disable-next-line vue/no-mutating-props -->
       <v-text-field
+        id="notes"
         type="text"
         v-else
         v-model="progress.report"
         style="margin-bottom: -20px"
       ></v-text-field>
       <RoundedButton
+        id="save"
         v-if="editMode"
         icon="mdi-check"
         value="Opslaan"
@@ -67,6 +69,7 @@
         @click="() => report()"
       ></RoundedButton>
       <RoundedButton
+        id="edit"
         v-else-if="progress?.report !== ''"
         icon="mdi-pencil"
         value="Bewerken"

From d60b30364e3fed75d04d6da140716d2cd4c00a99 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Wed, 3 May 2023 23:37:40 +0200
Subject: [PATCH 12/33] feat: table sort test + finalising component tests

---
 web/cypress/component/building.cy.ts          | 24 +++---
 web/cypress/component/buttons.cy.ts           |  1 +
 web/cypress/component/cards.cy.ts             | 19 ++++-
 web/cypress/component/filter.cy.ts            |  4 +
 web/cypress/component/forms.cy.ts             |  2 +-
 web/cypress/component/images.cy.ts            |  7 ++
 web/cypress/component/popups.cy.ts            |  2 +-
 web/cypress/component/round.cy.ts             |  3 +
 web/cypress/component/table.cy.ts             | 83 ++++++++++++++-----
 .../components/cards/BuildingSelectCard.vue   |  2 +-
 web/src/components/cards/RoundCard.vue        |  1 +
 web/src/components/cards/RoundSelectCard.vue  |  2 +-
 web/src/components/filter/LargeFilter.vue     |  2 +-
 web/src/components/images/AddImage.vue        |  1 +
 web/src/components/table/Table.vue            |  1 +
 15 files changed, 116 insertions(+), 38 deletions(-)

diff --git a/web/cypress/component/building.cy.ts b/web/cypress/component/building.cy.ts
index d4aba8e63..d65a467fb 100644
--- a/web/cypress/component/building.cy.ts
+++ b/web/cypress/component/building.cy.ts
@@ -5,21 +5,23 @@ describe("building component test", () => {
   it('buildingcard test', () => {
     cy.mount(BuildingCard, {
       props: {
-        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
+        building: {id: 6, name: "testgebouw", address: {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
       },
     })
+    cy.contains("testgebouw")
+    cy.contains("teststraat 5")
+    cy.contains("9000 Gent")
     // can't really click on it, as there is no active router to perform router.push(...)
   })
 
-  it('garbageschedule test', ()=>{
-    cy.mount(GarbageSchedule, {
-      props: {
-        schedule: [{id: 6, user: {first_name: "test", last_name: "user"}}, {
-          id: 7,
-          user: {first_name: "one", last_name: "two"}
-        }]
-      }
-    })
-    // not exactly correct
+  it('garbageschedule test', () => {
+    cy.mount(GarbageSchedule, {})
+    cy.contains('Kalender')
+    cy.contains("Taken")
+    cy.contains('Studentbezoeken')
+    cy.get('#calendar')
+    // calendar is found but is not actually visible
+    // why is there a random f?
+    // can't really test since the data comes from queries, not props
   })
 })
diff --git a/web/cypress/component/buttons.cy.ts b/web/cypress/component/buttons.cy.ts
index fe50aebc9..b720a91c3 100644
--- a/web/cypress/component/buttons.cy.ts
+++ b/web/cypress/component/buttons.cy.ts
@@ -19,6 +19,7 @@ describe("buttons test", () => {
         items: []
       },
     })
+    // TODO add buttons in items list
     cy.get('#menu-activator').click()
   })
 })
diff --git a/web/cypress/component/cards.cy.ts b/web/cypress/component/cards.cy.ts
index 037885e78..6b48c80bc 100644
--- a/web/cypress/component/cards.cy.ts
+++ b/web/cypress/component/cards.cy.ts
@@ -18,6 +18,7 @@ describe("card tests", () => {
     cy.contains('testgebouw')
     cy.contains('test gebruiker')
     cy.contains('teststraat 5 Gent')
+    cy.contains(((new Date())).toLocaleDateString())
   })
 
   it('buildinginfocard test', () => {
@@ -32,7 +33,7 @@ describe("card tests", () => {
     cy.contains('teststraat 1')
   })
 
-  it('buildingselectcard test', () => {
+  it('buildingselectcard show garbage test', () => {
     cy.mount(BuildingSelectCard, {
       props: {
         name: "testgebouw",
@@ -43,6 +44,19 @@ describe("card tests", () => {
     })
     cy.contains('testgebouw')
     cy.contains('teststraat 1')
+    cy.get('#garbage').should('be.visible')
+  })
+
+  it("buildingselectcard don't show garbage test", () => {
+    cy.mount(BuildingSelectCard, {
+      props: {
+        name: "testgebouw",
+        address: "teststraat 1",
+        buildingId: 1,
+        garbageinfo: false,
+      },
+    })
+    cy.get('#garbage').should('not.be.visible')
   })
 
   it('imagecard test with image', () => {
@@ -140,7 +154,7 @@ describe("card tests", () => {
     cy.contains('Klaar')
   })
 
-  it('roundselectcard test', () => {
+  it.only('roundselectcard test', () => {
     const datum: Date = new Date()
     cy.mount(RoundSelectCard, {
       props: {
@@ -153,5 +167,6 @@ describe("card tests", () => {
     cy.contains('test round')
     cy.contains('tijd')
     cy.contains(datum.toLocaleDateString())
+    cy.get('#remove').should('be.visible')
   })
 })
diff --git a/web/cypress/component/filter.cy.ts b/web/cypress/component/filter.cy.ts
index 454cdaf9f..4576888b9 100644
--- a/web/cypress/component/filter.cy.ts
+++ b/web/cypress/component/filter.cy.ts
@@ -16,7 +16,9 @@ describe("filter tests", () => {
     })
     cy.contains("Zoek per test1")
     cy.contains("Zoek per test2").should('not.exist')
+    cy.get('#dropdown').should('not.be.visible')
     cy.get("#showfilters").click()
+    cy.get('#dropdown').should('be.visible')
     cy.contains("Eerste dag").parent().type('2023-01-04') // has to be YYYY-MM-DD format
     cy.contains('Zoekcategorie').parent().click()
     cy.contains("test2").click()
@@ -25,5 +27,7 @@ describe("filter tests", () => {
     cy.contains('status1').click()
     cy.contains('alphabetical').click()
     cy.contains('Dalend').click()
+    cy.get("#showfilters").click()
+    cy.get('#dropdown').should('not.be.visible')
   })
 })
diff --git a/web/cypress/component/forms.cy.ts b/web/cypress/component/forms.cy.ts
index 219305c93..0d68d43bc 100644
--- a/web/cypress/component/forms.cy.ts
+++ b/web/cypress/component/forms.cy.ts
@@ -114,7 +114,7 @@ describe("form tests", () => {
     })
   })
 
-  describe.only('roleform test', () => {
+  describe('roleform test', () => {
     it('roleform input test', () => {
       cy.mount(RolesForm, {
         props: {
diff --git a/web/cypress/component/images.cy.ts b/web/cypress/component/images.cy.ts
index 7aa94aeda..8ee13ced3 100644
--- a/web/cypress/component/images.cy.ts
+++ b/web/cypress/component/images.cy.ts
@@ -32,9 +32,16 @@ describe("images tests", () => {
 
   it('multiaddimage test', () => {
     cy.mount(MultiAddImage, {})
+    // add image
     cy.contains('afbeelding toevoegen').click()
     // check if an extra image field was added
     cy.get('button:contains("Verwijder afbeelding")').should('have.length', 2);
+    // delete image
+    cy.get('#delete').click()
+    cy.get('button:contains("Verwijder afbeelding")').should('have.length', 1);
+    // can't delete the last image
+    cy.get('#delete').click()
+    cy.get('button:contains("Verwijder afbeelding")').should('have.length', 1);
   })
 
   it('photomaker test', () => {
diff --git a/web/cypress/component/popups.cy.ts b/web/cypress/component/popups.cy.ts
index 82658e131..95eb03980 100644
--- a/web/cypress/component/popups.cy.ts
+++ b/web/cypress/component/popups.cy.ts
@@ -3,7 +3,7 @@ import Loader from '@/components/popups/Loader.vue'
 import StartRoundPopup from '@/components/popups/StartRoundPopupContent.vue'
 
 describe("popup tests", () => {
-  it.only('cardpopup test', () => {
+  it('cardpopup test', () => {
     cy.mount(CardPopup, {
       props: ["modelValue"]
     })
diff --git a/web/cypress/component/round.cy.ts b/web/cypress/component/round.cy.ts
index b153f894b..a00f38daf 100644
--- a/web/cypress/component/round.cy.ts
+++ b/web/cypress/component/round.cy.ts
@@ -121,6 +121,9 @@ describe("round tests", () => {
           status: "scheduled",
         }
       })
+      cy.contains('Actief').should('not.exist')
+      cy.contains('Opmerkingen').should('not.exist')
+      cy.contains('10').should('not.exist')
     })
   })
 })
diff --git a/web/cypress/component/table.cy.ts b/web/cypress/component/table.cy.ts
index c8da14ba7..9bab771de 100644
--- a/web/cypress/component/table.cy.ts
+++ b/web/cypress/component/table.cy.ts
@@ -3,9 +3,25 @@ import {Header} from "../../src/components/table/Header";
 import {RowType} from "../../src/components/table/RowType";
 import {BuildingQuery, Result} from "@selab-2/groep-1-query";
 
+
+
 describe("custom table test", () => {
-  it('', () => {
-    // TODO test sorting
+  it('table entry test', () => {
+    const header1: Header<Result<BuildingQuery>> = new Header<Result<BuildingQuery>>({
+      id: 0,
+      name: "Gebouw",
+      get: (e) => e.name,
+      type: RowType.TEXT,
+      sortable: false,
+    })
+    const header2: Header<Result<BuildingQuery>> = new Header<Result<BuildingQuery>>({
+      id: 1,
+      name: "Adres",
+      get: (e) =>
+        e.address.street + " " + e.address.number,
+      type: RowType.TEXT,
+      sortable: false,
+    })
     cy.mount(Table, {
       props: {
         entries: [
@@ -14,24 +30,7 @@ describe("custom table test", () => {
           {id: 1, name: "andergebouw", address:
                 {street: "anderestraat", number: 7, zip_code: 9000, city: "Gent"}},
         ],
-        headers: [{
-            id: 0,
-            name: "Gebouw",
-            fit: false,
-            get: (e) => e.name,
-            type: RowType.TEXT,
-            sortable: false,
-          },
-          {
-            id: 1,
-            name: "Adres",
-            fit: false,
-            get: (e) =>
-              e.address.street + " " + e.address.number,
-            type: RowType.TEXT,
-            sortable: false,
-          }
-        ],
+        headers: [header1, header2],
       },
     })
     cy.get('#table').then( () => {
@@ -45,4 +44,48 @@ describe("custom table test", () => {
       cy.contains('td', 'Gent').should('not.exist')
     })
   })
+
+  it('table sort test', () => {
+    const header1: Header<Result<BuildingQuery>> = new Header<Result<BuildingQuery>>({
+      id: 0,
+      name: "Gebouw",
+      get: (e) => e.name,
+      type: RowType.TEXT,
+      sortable: true,
+      order: "desc",
+    })
+    const header2: Header<Result<BuildingQuery>> = new Header<Result<BuildingQuery>>({
+      id: 1,
+      name: "Adres",
+      get: (e) =>
+        e.address.street + " " + e.address.number,
+      type: RowType.TEXT,
+      sortable: true,
+      order: "desc",
+    })
+    cy.mount(Table, {
+      props: {
+        entries: [
+          {
+            id: 6, name: "testgebouw", address:
+              {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}
+          },
+          {
+            id: 1, name: "andergebouw", address:
+              {street: "anderestraat", number: 7, zip_code: 9000, city: "Gent"}
+          },
+        ],
+        headers: [header1, header2],
+      },
+    })
+    cy.get('td').first().contains( 'testgebouw')
+    cy.get('td').eq(1).contains('teststraat 5')
+    cy.get('button').first().click()
+    cy.get('td').first().contains('andergebouw')
+    cy.get('td').eq(1).contains('anderestraat 7')
+    cy.get('button').eq(1).click()
+    cy.get('td').eq(1).contains('anderestraat 7')
+    cy.get('button').eq(1).click()
+    cy.get('td').eq(1).contains('teststraat 5')
+  })
 })
diff --git a/web/src/components/cards/BuildingSelectCard.vue b/web/src/components/cards/BuildingSelectCard.vue
index 6ecc9e736..f5482463d 100644
--- a/web/src/components/cards/BuildingSelectCard.vue
+++ b/web/src/components/cards/BuildingSelectCard.vue
@@ -26,7 +26,7 @@
       />
     </template>
     <v-expand-transition>
-      <v-table v-show="garbageinfo" class="mx-2 my-2" density="compact">
+      <v-table id="garbage" v-show="garbageinfo" class="mx-2 my-2" density="compact">
         <thead>
           <tr>
             <th
diff --git a/web/src/components/cards/RoundCard.vue b/web/src/components/cards/RoundCard.vue
index 1877d8804..ea457db98 100644
--- a/web/src/components/cards/RoundCard.vue
+++ b/web/src/components/cards/RoundCard.vue
@@ -2,6 +2,7 @@
   <!-- TODO: Container around the card to show the edges a bit more, should be removed in the future -->
   <BorderCard class="mb-3 mx-1 pb-2">
     <v-progress-linear
+      id="progress"
       absolute
       :model-value="progress()"
       :color="
diff --git a/web/src/components/cards/RoundSelectCard.vue b/web/src/components/cards/RoundSelectCard.vue
index c0b34ce79..6b3e7d3b8 100644
--- a/web/src/components/cards/RoundSelectCard.vue
+++ b/web/src/components/cards/RoundSelectCard.vue
@@ -13,7 +13,7 @@
       class="bg-grey-lighten-2"
     ></RoundedButton>
 
-    <v-icon @click="$emit('remove')" color="error" icon="mdi-close" />
+    <v-icon id="remove" @click="$emit('remove')" color="error" icon="mdi-close" />
   </BorderCard>
 </template>
 
diff --git a/web/src/components/filter/LargeFilter.vue b/web/src/components/filter/LargeFilter.vue
index 07783931e..ce3adab2a 100644
--- a/web/src/components/filter/LargeFilter.vue
+++ b/web/src/components/filter/LargeFilter.vue
@@ -25,7 +25,7 @@
       </v-btn>
     </template>
     <v-expand-transition>
-      <div v-show="dropdown">
+      <div id="dropdown" v-show="dropdown">
         <DividerLayout class="mb-3" />
         <v-row class="mx-0">
           <v-col>
diff --git a/web/src/components/images/AddImage.vue b/web/src/components/images/AddImage.vue
index 1e79acdf2..32528a158 100644
--- a/web/src/components/images/AddImage.vue
+++ b/web/src/components/images/AddImage.vue
@@ -34,6 +34,7 @@
 
     <v-card-actions>
       <v-btn
+        id="delete"
         @click="$emit('delete', id)"
         v-show="id != 0"
         color="error"
diff --git a/web/src/components/table/Table.vue b/web/src/components/table/Table.vue
index dace34542..2908a8470 100644
--- a/web/src/components/table/Table.vue
+++ b/web/src/components/table/Table.vue
@@ -12,6 +12,7 @@
               {{ header.name }}
             </p>
             <v-btn
+              id="sort"
               v-if="header.sortable"
               variant="plain"
               :icon="

From 663d02a59df2e45df63ff94b05fe9330739ca10f Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Fri, 5 May 2023 23:20:01 +0200
Subject: [PATCH 13/33] chore: addbutton test and little tweaks component
 testing

---
 web/cypress/component/buttons.cy.ts | 11 +++++++++--
 web/cypress/component/forms.cy.ts   |  6 +++---
 web/cypress/component/popups.cy.ts  |  8 +++++---
 web/cypress/component/round.cy.ts   |  2 +-
 web/cypress/component/table.cy.ts   |  4 ++--
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/web/cypress/component/buttons.cy.ts b/web/cypress/component/buttons.cy.ts
index b720a91c3..7c137c999 100644
--- a/web/cypress/component/buttons.cy.ts
+++ b/web/cypress/component/buttons.cy.ts
@@ -1,5 +1,6 @@
 import RoundedButton from '@/components/buttons/RoundedButton.vue'
 import AddButton from '@/components/buttons/AddButton.vue'
+import Button from '@/components/models/Button.vue';
 
 describe("buttons test", () => {
   it('roundedbutton test', () => {
@@ -16,10 +17,16 @@ describe("buttons test", () => {
     cy.mount(AddButton, {
       props: {
         icon: 'mdi-domain',
-        items: []
+        items: [<Button>{title: "test1"}, <Button>{title: "test2"}]
       },
     })
-    // TODO add buttons in items list
+    cy.contains("test1").should('not.exist')
+    cy.contains("test2").should('not.exist')
     cy.get('#menu-activator').click()
+    cy.contains("test1").should('be.visible')
+    cy.contains("test2").should('be.visible')
+    cy.get('#menu-activator').click()
+    cy.contains("test1").should('not.be.visible')
+    cy.contains("test2").should('not.be.visible')
   })
 })
diff --git a/web/cypress/component/forms.cy.ts b/web/cypress/component/forms.cy.ts
index 0d68d43bc..9c638cf3a 100644
--- a/web/cypress/component/forms.cy.ts
+++ b/web/cypress/component/forms.cy.ts
@@ -8,7 +8,7 @@ describe("form tests", () => {
     it('addressform correct input test', () => {
       cy.mount(AdressForm, {
         props:{
-          // default props
+          // these are the default props
           readonly: false,
           street: "",
           number: "0",
@@ -69,7 +69,7 @@ describe("form tests", () => {
     it('contactform correct input test', () => {
       cy.mount(ContactForm, {
         props: {
-          // default props
+          // thse are the default props
           readonly: false,
           phone: "",
           email: "",
@@ -85,7 +85,7 @@ describe("form tests", () => {
       cy.mount(ContactForm, {
         // default props
       })
-      // cy.get('#phone').type('hallo') // you can only enter numbers
+      // cy.get('#phone').type('hallo') // you should only be able to enter numbers,
       // cy.get('#phone').should('be.empty') // this not yet implemented now
       cy.get('#phone').type("012345") // phone number too short
       cy.contains('Telefoonnummer moet minimaal 9 tekens lang zijn.')
diff --git a/web/cypress/component/popups.cy.ts b/web/cypress/component/popups.cy.ts
index 95eb03980..20576f04a 100644
--- a/web/cypress/component/popups.cy.ts
+++ b/web/cypress/component/popups.cy.ts
@@ -5,15 +5,17 @@ import StartRoundPopup from '@/components/popups/StartRoundPopupContent.vue'
 describe("popup tests", () => {
   it('cardpopup test', () => {
     cy.mount(CardPopup, {
-      props: ["modelValue"]
+      props: {
+        modelValue: true
+      }
     })
-    // TODO the mount doesn't give an error, but it's just a blank screen
+    // this is a blank canvas to create a popup, where modelValue indicates if the popup is active/visible or not
   })
 
   it('loader popup test', () => {
     cy.mount(Loader, {
     })
-    // this is just a spinnning circle, so there is not really anything to test
+    // this is just a spinnning circle, so there is not really anything to test other than see if it works
   })
 
   it('start round popup test', () => {
diff --git a/web/cypress/component/round.cy.ts b/web/cypress/component/round.cy.ts
index a00f38daf..48c57f08a 100644
--- a/web/cypress/component/round.cy.ts
+++ b/web/cypress/component/round.cy.ts
@@ -49,7 +49,7 @@ describe("round tests", () => {
       cy.get('#edit').click()
       cy.get('#notes').clear().type("NOTE")
       cy.get('#save').click()
-      // savebutton uses apicall to update the database, so this can't be tested with just a component test
+      // savebutton uses api call to update the database, so this can't be tested with just a component test
       // same for the add image button
     })
     it('progress test no images', () => {
diff --git a/web/cypress/component/table.cy.ts b/web/cypress/component/table.cy.ts
index 9bab771de..6a16e735d 100644
--- a/web/cypress/component/table.cy.ts
+++ b/web/cypress/component/table.cy.ts
@@ -34,8 +34,8 @@ describe("custom table test", () => {
       },
     })
     cy.get('#table').then( () => {
-      // cy.contains('th, Gebouw')
-      // cy.contains('th, Adres')   // table heads aren't just plain text, so this doesn't work
+      cy.contains('th', 'Gebouw')
+      cy.contains('th', 'Adres')
       cy.contains('td', 'testgebouw')
       cy.contains('td', 'andergebouw')
       cy.contains('td', 'teststraat 5')

From bc5f30f95c99914b7658148fd9c24805a56d6331 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 6 May 2023 23:58:16 +0200
Subject: [PATCH 14/33] chore: correct formatting + extra comments

---
 web/cypress/component/building.cy.ts          |  20 +-
 web/cypress/component/buttons.cy.ts           |   3 +
 web/cypress/component/cards.cy.ts             |  95 ++++++----
 web/cypress/component/filter.cy.ts            |  10 +-
 web/cypress/component/forms.cy.ts             |  20 +-
 web/cypress/component/general.cy.ts           |   8 +-
 web/cypress/component/images.cy.ts            |  27 +--
 web/cypress/component/popups.cy.ts            |   9 +-
 web/cypress/component/round.cy.ts             | 171 +++++++++++++-----
 web/cypress/component/table.cy.ts             |  75 ++++++--
 web/src/components/cards/BuildingCard.vue     |   3 +-
 .../components/cards/BuildingSelectCard.vue   |   7 +-
 web/src/components/cards/RoundCard.vue        |   6 +-
 web/src/components/cards/RoundSelectCard.vue  |   7 +-
 .../popups/StartRoundPopupContent.vue         |   4 +-
 web/src/views/account/AccountSettings.vue     |   7 +-
 web/src/views/dashboard/Users.vue             |   7 +-
 web/src/views/round/RoundMaker.vue            |   6 +-
 web/src/views/round/RoundPlanner.vue          |   2 +-
 19 files changed, 336 insertions(+), 151 deletions(-)

diff --git a/web/cypress/component/building.cy.ts b/web/cypress/component/building.cy.ts
index d65a467fb..526de9937 100644
--- a/web/cypress/component/building.cy.ts
+++ b/web/cypress/component/building.cy.ts
@@ -8,20 +8,10 @@ describe("building component test", () => {
         building: {id: 6, name: "testgebouw", address: {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}}
       },
     })
-    cy.contains("testgebouw")
-    cy.contains("teststraat 5")
-    cy.contains("9000 Gent")
-    // can't really click on it, as there is no active router to perform router.push(...)
-  })
-
-  it('garbageschedule test', () => {
-    cy.mount(GarbageSchedule, {})
-    cy.contains('Kalender')
-    cy.contains("Taken")
-    cy.contains('Studentbezoeken')
-    cy.get('#calendar')
-    // calendar is found but is not actually visible
-    // why is there a random f?
-    // can't really test since the data comes from queries, not props
+    // all info present
+    cy.contains("testgebouw").should('be.visible')
+    cy.contains("teststraat 5").should('be.visible')
+    cy.contains("9000 Gent").should('be.visible')
+    // can't really click on the card, as there is no active router to perform router.push(...)
   })
 })
diff --git a/web/cypress/component/buttons.cy.ts b/web/cypress/component/buttons.cy.ts
index 7c137c999..63aeae4d4 100644
--- a/web/cypress/component/buttons.cy.ts
+++ b/web/cypress/component/buttons.cy.ts
@@ -20,12 +20,15 @@ describe("buttons test", () => {
         items: [<Button>{title: "test1"}, <Button>{title: "test2"}]
       },
     })
+    // the buttons from the item list shouldn't be visible now, in fact not even exist yet
     cy.contains("test1").should('not.exist')
     cy.contains("test2").should('not.exist')
     cy.get('#menu-activator').click()
+    // now these buttons are visible
     cy.contains("test1").should('be.visible')
     cy.contains("test2").should('be.visible')
     cy.get('#menu-activator').click()
+    // now these buttons are not visible anymore, but they do still exist
     cy.contains("test1").should('not.be.visible')
     cy.contains("test2").should('not.be.visible')
   })
diff --git a/web/cypress/component/cards.cy.ts b/web/cypress/component/cards.cy.ts
index 6b48c80bc..5306ac1ba 100644
--- a/web/cypress/component/cards.cy.ts
+++ b/web/cypress/component/cards.cy.ts
@@ -9,16 +9,31 @@ describe("card tests", () => {
   it('buildingcard test', () => {
     cy.mount(BuildingCard, {
       props: {
-        building: {id: 6, name: "testgebouw", address:{street: "teststraat", number: 5, zip_code: 9000, city: "Gent"},
-        syndicus: {user: {first_name: "test", last_name: "gebruiker"}}},
+        building: {
+          id: 6,
+          name: "testgebouw",
+          address: {
+            street: "teststraat",
+            number: 5,
+            zip_code: 9000,
+            city: "Gent"
+          },
+        syndicus: {
+            user: {
+              first_name: "test",
+              last_name: "gebruiker"
+            }
+          }
+        },
         start_date: new Date(),
         end_date: new Date(),
       },
     })
-    cy.contains('testgebouw')
-    cy.contains('test gebruiker')
-    cy.contains('teststraat 5 Gent')
-    cy.contains(((new Date())).toLocaleDateString())
+    // all info present
+    cy.contains('testgebouw').should('be.visible')
+    cy.contains('test gebruiker').should('be.visible')
+    cy.contains('teststraat 5 Gent').should('be.visible')
+    cy.contains(((new Date())).toLocaleDateString()).should('be.visible')
   })
 
   it('buildinginfocard test', () => {
@@ -29,8 +44,9 @@ describe("card tests", () => {
         id: "1",
       },
     })
-    cy.contains('testgebouw')
-    cy.contains('teststraat 1')
+    // all info present
+    cy.contains('testgebouw').should('be.visible')
+    cy.contains('teststraat 1').should('be.visible')
   })
 
   it('buildingselectcard show garbage test', () => {
@@ -42,8 +58,9 @@ describe("card tests", () => {
         garbageinfo: true,
       },
     })
-    cy.contains('testgebouw')
-    cy.contains('teststraat 1')
+    // all info present
+    cy.contains('testgebouw').should('be.visible')
+    cy.contains('teststraat 1').should('be.visible')
     cy.get('#garbage').should('be.visible')
   })
 
@@ -56,6 +73,9 @@ describe("card tests", () => {
         garbageinfo: false,
       },
     })
+    // all info present, but no garbage
+    cy.contains('testgebouw').should('be.visible')
+    cy.contains('teststraat 1').should('be.visible')
     cy.get('#garbage').should('not.be.visible')
   })
 
@@ -71,9 +91,10 @@ describe("card tests", () => {
         btnText: "button",
       },
     })
+    // all info present, since there is an image, the title and text should not be visible/exist
     cy.contains('test image').should('not.exist')
     cy.contains('text').should('not.exist')
-    cy.contains('button')
+    cy.contains('button').should('be.visible')
   })
 
   it('imagecard test without image', () => {
@@ -87,8 +108,10 @@ describe("card tests", () => {
         btnText: "button",
       },
     })
-    cy.contains('text')
-    cy.contains('button')
+    // all info present, since there is an image, the title and text should be visible/exist
+    cy.contains('test image').should('be.visible')
+    cy.contains('text').should('be.visible')
+    cy.contains('button').should('be.visible')
   })
 
   it('roundcard with zero progress', () => {
@@ -105,13 +128,14 @@ describe("card tests", () => {
         round_comments: true,
       },
     })
-    cy.contains('test round')
-    cy.get('#start')
-    cy.get('#end')
-    cy.contains('test student')
-    cy.contains(datum.toLocaleDateString())
-    cy.contains('5')
-    cy.contains('Niet begonnen')
+    // all info present
+    cy.contains('test round').should('be.visible')
+    cy.get('#start').should('be.visible')
+    cy.get('#end').should('be.visible')
+    cy.contains('test student').should('be.visible')
+    cy.contains(datum.toLocaleDateString()).should('be.visible')
+    cy.contains('5').should('be.visible')
+    cy.contains('Niet begonnen').should('be.visible')
   })
 
   it('roundcard with some progress', () => {
@@ -125,12 +149,13 @@ describe("card tests", () => {
         round_comments: false,
       },
     })
-    cy.contains('test round')
+    // all info present
+    cy.contains('test round').should('be.visible')
     cy.get('#start').should('not.exist')
     cy.get('#end').should('not.exist')
-    cy.contains('test student')
-    cy.contains('5')
-    cy.contains('Bezig 4/5')
+    cy.contains('test student').should('be.visible')
+    cy.contains('5').should('be.visible')
+    cy.contains('Bezig 4/5').should('be.visible')
   })
 
   it('roundcard with full progress', () => {
@@ -146,15 +171,16 @@ describe("card tests", () => {
         round_comments: false,
       },
     })
-    cy.contains('test round')
-    cy.get('#start')
-    cy.get('#end')
-    cy.contains('test student')
-    cy.contains('5')
-    cy.contains('Klaar')
+    // all info present
+    cy.contains('test round').should('be.visible')
+    cy.get('#start').should('be.visible')
+    cy.get('#end').should('be.visible')
+    cy.contains('test student').should('be.visible')
+    cy.contains('5').should('be.visible')
+    cy.contains('Klaar').should('be.visible')
   })
 
-  it.only('roundselectcard test', () => {
+  it('roundselectcard test', () => {
     const datum: Date = new Date()
     cy.mount(RoundSelectCard, {
       props: {
@@ -164,9 +190,10 @@ describe("card tests", () => {
         id: "1",
       },
     })
-    cy.contains('test round')
-    cy.contains('tijd')
-    cy.contains(datum.toLocaleDateString())
+    // all info present
+    cy.contains('test round').should('be.visible')
+    cy.contains('tijd').should('be.visible')
+    cy.contains(datum.toLocaleDateString()).should('be.visible')
     cy.get('#remove').should('be.visible')
   })
 })
diff --git a/web/cypress/component/filter.cy.ts b/web/cypress/component/filter.cy.ts
index 4576888b9..d3879a1b3 100644
--- a/web/cypress/component/filter.cy.ts
+++ b/web/cypress/component/filter.cy.ts
@@ -14,19 +14,25 @@ describe("filter tests", () => {
         enable_end_date: true,
       },
     })
-    cy.contains("Zoek per test1")
+    // searchbar should say "zoek per test1"
+    cy.contains("Zoek per test1").should('be.visible')
     cy.contains("Zoek per test2").should('not.exist')
+    // the filters are not yet visible
     cy.get('#dropdown').should('not.be.visible')
     cy.get("#showfilters").click()
+    // now the filters are visible
     cy.get('#dropdown').should('be.visible')
+    // add filters
     cy.contains("Eerste dag").parent().type('2023-01-04') // has to be YYYY-MM-DD format
     cy.contains('Zoekcategorie').parent().click()
     cy.contains("test2").click()
-    cy.contains("Zoek per test2")
+    // now the searchbar should say "zoek per test2"
+    cy.contains("Zoek per test2").should('be.visible')
     cy.contains("Zoek per test1").should('not.exist')
     cy.contains('status1').click()
     cy.contains('alphabetical').click()
     cy.contains('Dalend').click()
+    // hide filters again
     cy.get("#showfilters").click()
     cy.get('#dropdown').should('not.be.visible')
   })
diff --git a/web/cypress/component/forms.cy.ts b/web/cypress/component/forms.cy.ts
index 9c638cf3a..080a177d3 100644
--- a/web/cypress/component/forms.cy.ts
+++ b/web/cypress/component/forms.cy.ts
@@ -16,10 +16,12 @@ describe("form tests", () => {
           zip_code: "0",
         }
       })
+      // fill in the fields with correct input
       cy.get('#street').type("Teststraat")
       cy.get('#city').type('Gent')
       cy.get('#streetnr').type('{backspace}17')
       cy.get('#zipcode').type('{backspace}9000')
+      // we have to do {backspace} because the field first contains a 0, else we would have 017 en 09000
       cy.get('#street').should('have.value', 'Teststraat')
       cy.get('#streetnr').should('have.value', '17')
       cy.get('#city').should('have.value', 'Gent')
@@ -30,6 +32,7 @@ describe("form tests", () => {
       cy.mount(AdressForm, {
         // default props
       })
+      // fill in the fields with incorrect input
       cy.get('#streetnr').type('hallo') // you can only enter numbers
       cy.get('#streetnr').should('have.value', '0')
       cy.get('#zipcode').type('hallo') // you can only enter numbers
@@ -44,6 +47,7 @@ describe("form tests", () => {
           readonly: true,
         }
       })
+      // everything should now be readonly
       cy.get('#street').should('have.attr', 'readonly', 'readonly')
       cy.get('#city').should('have.attr', 'readonly', 'readonly')
       cy.get('#streetnr').should('have.attr', 'readonly', 'readonly')
@@ -54,14 +58,15 @@ describe("form tests", () => {
       cy.mount(AdressForm, {
         // default props
       })
+      // empty fields should contain a warning
       cy.get('#street').type('x{backspace}')
       cy.get('#city').type('x{backspace}')
       cy.get('#streetnr').clear()
       cy.get('#zipcode').clear()
-      cy.contains('Geef een straat op.')
-      cy.contains('Geef een stad op.')
-      cy.contains('Geef een huisnummer.')
-      cy.contains('Geef een postcode.')
+      cy.contains('Geef een straat op.').should('be.visible')
+      cy.contains('Geef een stad op.').should('be.visible')
+      cy.contains('Geef een huisnummer.').should('be.visible')
+      cy.contains('Geef een postcode.').should('be.visible')
     })
   })
 
@@ -75,6 +80,7 @@ describe("form tests", () => {
           email: "",
         },
       })
+      // fill in the field with correct input
       cy.get('#phone').type('0123456789')
       cy.get('#email').type('test@test.com')
       cy.get('#phone').should('have.value', '0123456789')
@@ -85,6 +91,8 @@ describe("form tests", () => {
       cy.mount(ContactForm, {
         // default props
       })
+      // fill in the field with incorrect input
+      // TODO uncomment once you can only add numbers in phone field
       // cy.get('#phone').type('hallo') // you should only be able to enter numbers,
       // cy.get('#phone').should('be.empty') // this not yet implemented now
       cy.get('#phone').type("012345") // phone number too short
@@ -97,6 +105,7 @@ describe("form tests", () => {
       cy.mount(ContactForm, {
         // default props
       })
+      // empty fields should contain a warning
       cy.get('#phone').type('x{backspace}')
       cy.contains('Geef een telefoonnummer op.')
       cy.get('#email').type('x{backspace}')
@@ -109,6 +118,7 @@ describe("form tests", () => {
           readonly: true,
         }
       })
+      // the fields should be readonly
       cy.get('#phone').should('have.attr', 'readonly', 'readonly')
       cy.get('#email').should('have.attr', 'readonly', 'readonly')
     })
@@ -122,6 +132,7 @@ describe("form tests", () => {
           readonly: false,
         },
       })
+      // checkboxes can be checked and unchecked
       cy.get('#student').check()
       cy.get('#superstudent').check()
       cy.get('#administrator').check()
@@ -142,6 +153,7 @@ describe("form tests", () => {
           readonly: true,
         }
       })
+      // checkboxes are now readonly
       cy.get('#student').should('have.attr', 'disabled', 'disabled')
       cy.get('#superstudent').should('have.attr', 'disabled', 'disabled')
       cy.get('#administrator').should('have.attr', 'disabled', 'disabled')
diff --git a/web/cypress/component/general.cy.ts b/web/cypress/component/general.cy.ts
index 27034cffa..ffea34b67 100644
--- a/web/cypress/component/general.cy.ts
+++ b/web/cypress/component/general.cy.ts
@@ -11,7 +11,7 @@ describe("component tests", () => {
         size: "small",
       },
     })
-    cy.contains('tg')
+    cy.contains('tg').should('be.visible')
   })
 
   it('badge test', () => {
@@ -20,14 +20,14 @@ describe("component tests", () => {
         value: 10,
       },
     })
-    cy.contains('10')
+    cy.contains('10').should('be.visible')
   })
 
   it('photobutton test', () => {
     cy.mount(PhotoButton, {})
-    cy.contains("File input")
+    cy.contains("File input").should('be.visible')
     cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
-    cy.contains("drtroittoir_logo.png")
+    cy.contains("drtroittoir_logo.png").should('be.visible')
   })
 
 })
diff --git a/web/cypress/component/images.cy.ts b/web/cypress/component/images.cy.ts
index 8ee13ced3..ed5f5afc7 100644
--- a/web/cypress/component/images.cy.ts
+++ b/web/cypress/component/images.cy.ts
@@ -9,13 +9,14 @@ describe("images tests", () => {
         id: 1
       }
     })
-    cy.contains('Commentaar')
+    // all info present, you can enter comments, select a file and there is a delete button
+    cy.contains('Commentaar').should('be.visible')
     cy.get('#comment').should('have.value', '')
     cy.get('#comment').type('New Comment')
     cy.get('#comment').should('have.value', 'New Comment')
     cy.contains('Verwijder afbeelding').should('be.visible')
     cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
-    cy.contains("drtroittoir_logo.png")
+    cy.contains("drtroittoir_logo.png").should('be.visible')
   })
   it('addimage id==0 test', () => {
     cy.mount(AddImage, {
@@ -23,11 +24,14 @@ describe("images tests", () => {
         id: 0
       }
     })
-    cy.contains('Commentaar')
+    // all info present, you can enter comments and select a file, but there is no delete button
+    cy.contains('Commentaar').should('be.visible')
+    cy.get('#comment').should('have.value', '')
+    cy.get('#comment').type('New Comment')
+    cy.get('#comment').should('have.value', 'New Comment')
     cy.contains('Verwijder afbeelding').should('not.be.visible')
-    // "Verwijder afbeelding" should appear on the screen when adding new image
-    // cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
-    // cy.contains('Verwijder afbeelding').should('be.visible')
+    cy.get("#input").selectFile('src/assets/images/drtroittoir_logo.png')
+    cy.contains("drtroittoir_logo.png").should('be.visible')
   })
 
   it('multiaddimage test', () => {
@@ -46,10 +50,11 @@ describe("images tests", () => {
 
   it('photomaker test', () => {
     cy.mount(PhotoMaker, {})
-    cy.contains("Maak foto")
-    cy.contains("Selecteer afbeelding")
-    cy.contains("Commentaar")
-    cy.contains("Foto label")
+    // all info present, you can add comments and labels and select a file
+    cy.contains("Maak foto").should('be.visible')
+    cy.contains("Selecteer afbeelding").should('be.visible')
+    cy.contains("Commentaar").should('be.visible')
+    cy.contains("Foto label").should('be.visible')
     cy.get('#comment').should('have.value', '')
     cy.get('#comment').type('New Comment')
     cy.get('#comment').should('have.value', 'New Comment')
@@ -57,7 +62,7 @@ describe("images tests", () => {
     cy.get('#label').type('New Label')
     cy.get('#label').should('have.value', 'New Label')
     cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
-    cy.contains("drtroittoir_logo.png")
+    cy.contains("drtroittoir_logo.png").should('be.visible')
   })
 
 })
diff --git a/web/cypress/component/popups.cy.ts b/web/cypress/component/popups.cy.ts
index 20576f04a..2ce0f7735 100644
--- a/web/cypress/component/popups.cy.ts
+++ b/web/cypress/component/popups.cy.ts
@@ -25,10 +25,11 @@ describe("popup tests", () => {
         onsubmit: () => {},
       }
     })
-    cy.contains('Start ronde')
+    // all info present
+    cy.contains('Start ronde').should('be.visible')
     cy.contains('Je staat op het punt een ronde te starten. Het huidige tijdstip zal opgeslagen worden als start ' +
-      'tijdstip. Ben je zeker dat je de ronde wilt starten?')
-    cy.get('#start').contains('Start ronde')
-    cy.get('#cancel').contains( 'Annuleer')
+      'tijdstip. Ben je zeker dat je de ronde wilt starten?').should('be.visible')
+    cy.get('#start').contains('Start ronde').should('be.visible')
+    cy.get('#cancel').contains( 'Annuleer').should('be.visible')
   })
 })
diff --git a/web/cypress/component/round.cy.ts b/web/cypress/component/round.cy.ts
index 48c57f08a..f8a4517b6 100644
--- a/web/cypress/component/round.cy.ts
+++ b/web/cypress/component/round.cy.ts
@@ -8,44 +8,68 @@ describe("round tests", () => {
         props: {
           progress:
             {
-              id: 1, report: "test", arrival: new Date(), departure: new Date(), building_id: 2,
+              id: 1,
+              report: "test",
+              arrival: new Date(),
+              departure: new Date(),
+              building_id: 2,
               building: {
-                id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+                id: 2,
+                name: "testbuilding",
+                syndicus_id: 3,
+                syndicus: {},
+                address_id: 4,
                 address: {
-                  id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+                  id: 4,
+                  street: 'teststraat',
+                  number: 1, city: "Gent",
+                  zip_code: 9000,
                 }
               },
-              schedule_id: 5, schedule: {},
-              images: [{
+              schedule_id: 5,
+              schedule: {},
+              images: [
+                {
                 id: 1,
                 type: "arrival",
                 description: "test arrival"
-              }, {
+                },
+                {
                 id: 2,
                 type: "departure",
                 description: "test departure"
-              }]
+                }
+              ]
             },
           building: {
-            id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+            id: 2,
+            name: "testbuilding",
+            syndicus_id: 3,
+            syndicus: {},
+            address_id: 4,
             address: {
-              id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+              id: 4,
+              street: 'teststraat',
+              number: 1,
+              city: "Gent",
+              zip_code: 9000,
             }
           },
         }
       })
-      cy.contains('testbuilding')
-      cy.contains('teststraat 1')
-      cy.contains('9000 Gent')
-      cy.contains('Notities')
-      cy.contains('test')
-      cy.contains('Bewerken')
-      cy.contains('Afbeeldingen')
-      cy.contains('Toevoegen')
-      cy.contains('arrival')
-      cy.contains('test arrival')
-      cy.contains('departure')
-      cy.contains('test departure')
+      // all info present, all pictures present and you can edit a note
+      cy.contains('testbuilding').should('be.visible')
+      cy.contains('teststraat 1').should('be.visible')
+      cy.contains('9000 Gent').should('be.visible')
+      cy.contains('Notities').should('be.visible')
+      cy.contains('test').should('be.visible')
+      cy.contains('Bewerken').should('be.visible')
+      cy.contains('Afbeeldingen').should('be.visible')
+      cy.contains('Toevoegen').should('be.visible')
+      cy.contains('arrival').should('be.visible')
+      cy.contains('test arrival').should('be.visible')
+      cy.contains('departure').should('be.visible')
+      cy.contains('test departure').should('be.visible')
       cy.get('#edit').click()
       cy.get('#notes').clear().type("NOTE")
       cy.get('#save').click()
@@ -57,71 +81,130 @@ describe("round tests", () => {
         props: {
           progress:
             {
-              id: 1, report: "test", arrival: new Date(), departure: new Date(), building_id: 2,
+              id: 1,
+              report: "test",
+              arrival: new Date(),
+              departure: new Date(),
+              building_id: 2,
               building: {
-                id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+                id: 2,
+                name: "testbuilding",
+                syndicus_id: 3,
+                syndicus: {},
+                address_id: 4,
                 address: {
-                  id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+                  id: 4,
+                  street: 'teststraat',
+                  number: 1,
+                  city: "Gent",
+                  zip_code: 9000,
                 }
               },
-              schedule_id: 5, schedule: {},
+              schedule_id: 5,
+              schedule: {},
               images: []
             },
           building: {
-            id: 2, name: "testbuilding", syndicus_id: 3, syndicus: {}, address_id: 4,
+            id: 2,
+            name: "testbuilding",
+            syndicus_id: 3,
+            syndicus: {},
+            address_id: 4,
             address: {
-              id: 4, street: 'teststraat', number: 1, city: "Gent", zip_code: 9000,
+              id: 4,
+              street: 'teststraat',
+              number: 1,
+              city: "Gent",
+              zip_code: 9000,
             }
           },
         }
       })
-      cy.contains('Geen foto\'s toegevoegd.')
+      // all info present, no pictures and you can edit a note
+      cy.contains('testbuilding').should('be.visible')
+      cy.contains('teststraat 1').should('be.visible')
+      cy.contains('9000 Gent').should('be.visible')
+      cy.contains('Notities').should('be.visible')
+      cy.contains('test').should('be.visible')
+      cy.contains('Bewerken').should('be.visible')
+      cy.contains('Afbeeldingen').should('be.visible')
+      cy.contains('Geen foto\'s toegevoegd.').should('be.visible')
+      cy.contains('Toevoegen').should('be.visible')
+      cy.get('#edit').click()
+      cy.get('#notes').clear().type("NOTE")
+      cy.get('#save').click()
     })
   })
-  describe.only('roundcard tests', () => {
+  describe('roundcard tests', () => {
     it('roundcard completed', () => {
       cy.mount(RoundCard, {
         props: {
           schedule: {
-            id: 1, day: new Date(), user_id: 2,
-            user:{first_name: "test", last_name: "gebruiker"},
-            round_id: 3, progress: []
+            id: 1,
+            day: new Date(),
+            user_id: 2,
+            user: {
+              first_name: "test",
+              last_name: "gebruiker"
+            },
+            round_id: 3,
+            progress: [],
           },
           status: "completed",
         }
       })
-      cy.contains((new Date()).toLocaleDateString())
-      cy.contains("test gebruiker")
-      cy.contains("Opmerkingen") // this is hardcoded with a random chance, so will sometimes fail
-      cy.contains('10') // this is still a hardcoded number for now
+      // all info present
+      cy.contains((new Date()).toLocaleDateString()).should('be.visible')
+      cy.contains("test gebruiker").should('be.visible')
+      // TODO change these lines once nothing is hardcoded anymore
+      cy.contains("Opmerkingen").should('be.visible') // this is hardcoded with a random chance, so will sometimes fail
+      cy.contains('10').should('be.visible') // this is still a hardcoded number for now
     })
 
-      it('roundcard active', () => {
+    it('roundcard active', () => {
       cy.mount(RoundCard, {
         props: {
           schedule: {
-            id: 1, day: new Date(), user_id: 2,
-            user:{first_name: "test", last_name: "gebruiker"},
-            round_id: 3, progress: []
+            id: 1,
+            day: new Date(),
+            user_id: 2,
+            user: {
+              first_name: "test",
+              last_name: "gebruiker"
+            },
+            round_id: 3,
+            progress: [],
           },
           status: "active",
         }
       })
-      cy.contains('Actief')
+      // all info present
+      cy.contains('Actief').should('be.visible')
+      cy.contains((new Date()).toLocaleDateString()).should('be.visible')
+      cy.contains("test gebruiker").should('be.visible')
     })
 
     it('roundcard scheduled', () => {
       cy.mount(RoundCard, {
         props: {
           schedule: {
-            id: 1, day: new Date(), user_id: 2,
-            user:{first_name: "test", last_name: "gebruiker"},
-            round_id: 3, progress: []
+            id: 1,
+            day: new Date(),
+            user_id: 2,
+            user: {
+              first_name: "test",
+              last_name: "gebruiker"
+            },
+            round_id: 3,
+            progress: [],
           },
           status: "scheduled",
         }
       })
+      // all info present
       cy.contains('Actief').should('not.exist')
+      cy.contains((new Date()).toLocaleDateString()).should('be.visible')
+      // TODO change these lines once nothing is hardcoded anymore
       cy.contains('Opmerkingen').should('not.exist')
       cy.contains('10').should('not.exist')
     })
diff --git a/web/cypress/component/table.cy.ts b/web/cypress/component/table.cy.ts
index 6a16e735d..baadd42ae 100644
--- a/web/cypress/component/table.cy.ts
+++ b/web/cypress/component/table.cy.ts
@@ -25,21 +25,37 @@ describe("custom table test", () => {
     cy.mount(Table, {
       props: {
         entries: [
-          {id: 6, name: "testgebouw", address:
-                {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}},
-          {id: 1, name: "andergebouw", address:
-                {street: "anderestraat", number: 7, zip_code: 9000, city: "Gent"}},
+          {
+            id: 6,
+            name: "testgebouw",
+            address: {
+              street: "teststraat",
+              number: 5,
+              zip_code: 9000,
+              city: "Gent",
+            }
+          },
+          {
+            id: 1,
+            name: "andergebouw",
+            address: {
+              street: "anderestraat",
+              number: 7,
+              zip_code: 9000,
+              city: "Gent"
+            }
+          },
         ],
         headers: [header1, header2],
       },
     })
     cy.get('#table').then( () => {
-      cy.contains('th', 'Gebouw')
-      cy.contains('th', 'Adres')
-      cy.contains('td', 'testgebouw')
-      cy.contains('td', 'andergebouw')
-      cy.contains('td', 'teststraat 5')
-      cy.contains('td', 'anderestraat 7')
+      cy.contains('th', 'Gebouw').should('be.visible')
+      cy.contains('th', 'Adres').should('be.visible')
+      cy.contains('td', 'testgebouw').should('be.visible')
+      cy.contains('td', 'andergebouw').should('be.visible')
+      cy.contains('td', 'teststraat 5').should('be.visible')
+      cy.contains('td', 'anderestraat 7').should('be.visible')
       // for this test, there is no City header, so cities shouldn't be displayed in the table
       cy.contains('td', 'Gent').should('not.exist')
     })
@@ -67,25 +83,44 @@ describe("custom table test", () => {
       props: {
         entries: [
           {
-            id: 6, name: "testgebouw", address:
-              {street: "teststraat", number: 5, zip_code: 9000, city: "Gent"}
+            id: 6,
+            name: "testgebouw",
+            address: {
+              street: "teststraat",
+              number: 5,
+              zip_code: 9000,
+              city: "Gent"
+            }
           },
           {
-            id: 1, name: "andergebouw", address:
-              {street: "anderestraat", number: 7, zip_code: 9000, city: "Gent"}
+            id: 1,
+            name: "andergebouw",
+            address: {
+              street: "anderestraat",
+              number: 7,
+              zip_code: 9000,
+              city: "Gent"
+            }
           },
         ],
         headers: [header1, header2],
       },
     })
-    cy.get('td').first().contains( 'testgebouw')
-    cy.get('td').eq(1).contains('teststraat 5')
+    // the first row is now the row of testgebouw
+    cy.get('td').first().contains( 'testgebouw').should('be.visible')
+    cy.get('td').eq(1).contains('teststraat 5').should('be.visible')
+    // sort by building ascending
     cy.get('button').first().click()
-    cy.get('td').first().contains('andergebouw')
-    cy.get('td').eq(1).contains('anderestraat 7')
+    // once the data is reordered, the first row should contain andergebouw
+    cy.get('td').first().contains('andergebouw').should('be.visible')
+    cy.get('td').eq(1).contains('anderestraat 7').should('be.visible')
+    // sort by address ascending
     cy.get('button').eq(1).click()
-    cy.get('td').eq(1).contains('anderestraat 7')
+    // since the addresses are already in order, nothing should change
+    cy.get('td').eq(1).contains('anderestraat 7').should('be.visible')
+    // sort by address descending
     cy.get('button').eq(1).click()
-    cy.get('td').eq(1).contains('teststraat 5')
+    // this should have changed the order
+    cy.get('td').eq(1).contains('teststraat 5').should('be.visible')
   })
 })
diff --git a/web/src/components/cards/BuildingCard.vue b/web/src/components/cards/BuildingCard.vue
index 23a30e83c..696567d1e 100644
--- a/web/src/components/cards/BuildingCard.vue
+++ b/web/src/components/cards/BuildingCard.vue
@@ -124,8 +124,7 @@ const comments = ref<Boolean>(false);
 let progresses: Ref<Result<ProgressQuery>[]> = ref([]);
 
 const can_expand: Ref<boolean> = ref(
-  props.start_date.toLocaleDateString() !==
-    props.end_date.toLocaleDateString(),
+  props.start_date.toLocaleDateString() !== props.end_date.toLocaleDateString(),
 );
 
 tryOrAlertAsync(async () => {
diff --git a/web/src/components/cards/BuildingSelectCard.vue b/web/src/components/cards/BuildingSelectCard.vue
index f5482463d..b1dc4d707 100644
--- a/web/src/components/cards/BuildingSelectCard.vue
+++ b/web/src/components/cards/BuildingSelectCard.vue
@@ -26,7 +26,12 @@
       />
     </template>
     <v-expand-transition>
-      <v-table id="garbage" v-show="garbageinfo" class="mx-2 my-2" density="compact">
+      <v-table
+        id="garbage"
+        v-show="garbageinfo"
+        class="mx-2 my-2"
+        density="compact"
+      >
         <thead>
           <tr>
             <th
diff --git a/web/src/components/cards/RoundCard.vue b/web/src/components/cards/RoundCard.vue
index ea457db98..0d64a32c7 100644
--- a/web/src/components/cards/RoundCard.vue
+++ b/web/src/components/cards/RoundCard.vue
@@ -62,12 +62,10 @@
     </v-chip>
     <v-chip label color="primary" class="ml-3">
       <v-icon icon="mdi-calendar" class="pr-1" />
-      {{
-        date.toLocaleDateString()
-      }}
+      {{ date.toLocaleDateString() }}
     </v-chip>
     <v-chip v-if="round_start" label color="primary" class="ml-3">
-      <v-icon id ="start" icon="mdi-clock"></v-icon> {{ round_start }}
+      <v-icon id="start" icon="mdi-clock"></v-icon> {{ round_start }}
     </v-chip>
     <v-chip v-if="round_end" label color="primary" class="ml-3">
       <v-icon id="end" icon="mdi-clock-check"></v-icon> {{ round_end }}
diff --git a/web/src/components/cards/RoundSelectCard.vue b/web/src/components/cards/RoundSelectCard.vue
index 6b3e7d3b8..6d8a4e68f 100644
--- a/web/src/components/cards/RoundSelectCard.vue
+++ b/web/src/components/cards/RoundSelectCard.vue
@@ -13,7 +13,12 @@
       class="bg-grey-lighten-2"
     ></RoundedButton>
 
-    <v-icon id="remove" @click="$emit('remove')" color="error" icon="mdi-close" />
+    <v-icon
+      id="remove"
+      @click="$emit('remove')"
+      color="error"
+      icon="mdi-close"
+    />
   </BorderCard>
 </template>
 
diff --git a/web/src/components/popups/StartRoundPopupContent.vue b/web/src/components/popups/StartRoundPopupContent.vue
index 3cb2a7d81..dc50cb660 100644
--- a/web/src/components/popups/StartRoundPopupContent.vue
+++ b/web/src/components/popups/StartRoundPopupContent.vue
@@ -10,7 +10,9 @@
     </p>
     <div class="d-flex flex-row-reverse ma-3">
       <v-btn id="start" color="success" @click="onsubmit"> Start ronde </v-btn>
-      <v-btn id="cancel" @click="oncancel" color="error" class="mr-3"> Annuleer </v-btn>
+      <v-btn id="cancel" @click="oncancel" color="error" class="mr-3">
+        Annuleer
+      </v-btn>
     </div>
   </v-card>
 </template>
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index f3fa7b93e..132102cce 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -176,7 +176,12 @@
       >
         Annuleer
       </v-btn>
-      <v-btn id= "submit" prepend-icon="mdi-check" color="success" @click="popupSubmit()">
+      <v-btn
+        id="submit"
+        prepend-icon="mdi-check"
+        color="success"
+        @click="popupSubmit()"
+      >
         {{ popupSubmitMsg }}
       </v-btn>
     </v-card-actions>
diff --git a/web/src/views/dashboard/Users.vue b/web/src/views/dashboard/Users.vue
index 844b2383d..07b97ec3a 100644
--- a/web/src/views/dashboard/Users.vue
+++ b/web/src/views/dashboard/Users.vue
@@ -10,7 +10,12 @@
       Nieuwe Gebruiker
     </v-btn>
   </div>
-  <Table id="usertable" :entries="users" :headers="User.headers()" :route="User.route"></Table>
+  <Table
+    id="usertable"
+    :entries="users"
+    :headers="User.headers()"
+    :route="User.route"
+  ></Table>
 </template>
 
 <script setup lang="ts">
diff --git a/web/src/views/round/RoundMaker.vue b/web/src/views/round/RoundMaker.vue
index 2d71c524a..70ce16bd5 100644
--- a/web/src/views/round/RoundMaker.vue
+++ b/web/src/views/round/RoundMaker.vue
@@ -25,7 +25,11 @@
         />
         <v-card-actions class="d-flex align-center"
           ><v-spacer></v-spacer
-          ><v-btn id="createround" class="ml-3" prepend-icon="mdi-check" @click="makeRound()"
+          ><v-btn
+            id="createround"
+            class="ml-3"
+            prepend-icon="mdi-check"
+            @click="makeRound()"
             >Ronde aanmaken</v-btn
           ></v-card-actions
         >
diff --git a/web/src/views/round/RoundPlanner.vue b/web/src/views/round/RoundPlanner.vue
index 158285bef..19b33091e 100644
--- a/web/src/views/round/RoundPlanner.vue
+++ b/web/src/views/round/RoundPlanner.vue
@@ -22,7 +22,7 @@
             style="min-width: 100px; max-width: 100%"
             class="flex-grow-1 flex-shrink-0"
             ><v-select
-            id="selectstudent"
+              id="selectstudent"
               label="Selecteer student"
               :items="students"
               v-model="student"

From ed9bf7a797af54e3524f8335aa67726d9343e0a4 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Mon, 8 May 2023 21:22:51 +0200
Subject: [PATCH 15/33] chore: new branch for e2e tests

---
 web/cypress.config.ts                 |  2 +-
 web/cypress/e2e/administrator.cy.ts   | 27 +++++++++++++++------------
 web/cypress/e2e/login.cy.ts           | 13 +++++++++++++
 web/src/views/account/LoginScreen.vue |  2 +-
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/web/cypress.config.ts b/web/cypress.config.ts
index a5cb9a4e3..6c427a59d 100644
--- a/web/cypress.config.ts
+++ b/web/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     supportFile: "cypress/support/e2e.ts",
-    baseUrl: "http://sel2-1.ugent.be/",
+    baseUrl: "https://sel2-1.ugent.be/",
     setupNodeEvents(on, config) {
       // implement node event listeners here
       require('@cypress/code-coverage/task')(on, config)
diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index a58b3b478..4761b627d 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -32,14 +32,14 @@ describe('admin tests', () => {
     })
     cy.get('#create').click()
     // check if user in userlist
-    cy.get('#usertable').get('#table').contains('td', 'test naam')
+    cy.contains('td', 'test naam')
   })
 
   it('edit a user', () => {
     // go to user overview
     cy.get('#users').click()
     // click user
-    cy.get('#usertable').get('#table').contains('td', 'test naam').click()
+    cy.contains('test naam').click()
     // press edit button
     cy.get('#edit').click()
     // alter user data
@@ -58,14 +58,14 @@ describe('admin tests', () => {
     cy.get('#submit').click()
     // check if user is updated in the table
     // cy.get('#users').click()
-    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker')
+    cy.contains('nieuwe gebruiker')
   })
 
   it('delete a user', () => {
     // go to user overview
     cy.get('#users').click()
     // click user
-    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker').click()
+    cy.contains('nieuwe gebruiker').click()
     // press edit button
     cy.get('#edit').click()
     // press delete
@@ -74,7 +74,7 @@ describe('admin tests', () => {
     cy.get('#submit').click()
     // user should not be present in the table
     // cy.get('#users').click()
-    cy.get('#usertable').get('#table').contains('td', 'nieuwe gebruiker').should('not.exist')
+    cy.contains('nieuwe gebruiker').should('not.exist')
   })
 
   it('check the profitability statistics', () => {
@@ -84,18 +84,21 @@ describe('admin tests', () => {
   it('add garbage schedule to a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.get('#buildingtable').get('#table').contains('td', 'Building 1').click()
-
+    cy.contains('td', 'Building 1').click()
+    // add garbage
   })
 
   it('edit garbage schedule of a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.get('#buildingtable').get('#table').contains('td', 'Building 1').click()
+    cy.contains('Building 1').click()
+    //edit garbage
   })
 
-
-
-
-
+  it('delete garbage schedule to a building', () => {
+    cy.get('#buildings').click()
+    // select building
+    cy.contains('td', 'Building 1').click()
+    // delete garbage
+  })
 })
diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index ed61bb7cb..5e5bac882 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -19,11 +19,24 @@ describe('login tests', () => {
     cy.get('#email').type('administrator@trotwaar.be')
     cy.get('#password').type('password')
     cy.get('#login').click()
+    // we should have stayed on the login screen
     cy.get('#login')
   })
 
   // TODO: user doesn't yet have a login
   it('ask login data', () => {
+    cy.get('#contact').click()
+    cy.contains('Indien je nog geen account hebt en graag lid wilt worden van DR.Trottoir neem dan contact op met ons via example@drtrottoir.be')
+      .should('be.visible')
+    // example@drtrottoi is still a hardcoded email, this will be changed
+  })
+
+  it('log out', () =>{
+    // there is a check in the login function to see if it passed
+    cy.login('administrator@trottoir.be', 'password')
+    cy.get('#logout').click()
+    // we should be back at the log in
+    cy.get('#login')
   })
 
 })
diff --git a/web/src/views/account/LoginScreen.vue b/web/src/views/account/LoginScreen.vue
index 805471ac4..6b0a54f00 100644
--- a/web/src/views/account/LoginScreen.vue
+++ b/web/src/views/account/LoginScreen.vue
@@ -35,7 +35,7 @@
         <!-- Help text for people who don't have an account yet -->
         <p class="me-auto">
           Nog geen account?
-          <span @click="snackbar = true" class="clickable-text">
+          <span id="contact" @click="snackbar = true" class="clickable-text">
             Contacteer ons.
           </span>
         </p>

From c976f165c9a1c233de094020d48e724a304ed9af Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Wed, 10 May 2023 12:33:32 +0200
Subject: [PATCH 16/33] chore: update to dev

---
 api/package-lock.json           | 38 ++++++++++++++++-----------------
 api/package.json                |  2 ++
 web/cypress.config.ts           |  3 ++-
 web/cypress/support/commands.ts |  3 +--
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/api/package-lock.json b/api/package-lock.json
index 67cf2b835..b3ed667a2 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
+        "@prisma/client": "^4.14.0",
         "@selab-2/groep-1-orm": "1.0.17",
         "@types/date-arithmetic": "^4.1.1",
         "@types/multer": "^1.4.7",
@@ -49,6 +50,7 @@
         "eslint-config-prettier": "^8.6.0",
         "jest": "^29.5.0",
         "prettier": "^2.8.4",
+        "prisma": "^4.14.0",
         "supertest": "^6.3.3",
         "ts-jest": "^29.0.5",
         "typescript": "^5.0.4"
@@ -1249,12 +1251,12 @@
       }
     },
     "node_modules/@prisma/client": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.13.0.tgz",
-      "integrity": "sha512-YaiiICcRB2hatxsbnfB66uWXjcRw3jsZdlAVxmx0cFcTc/Ad/sKdHCcWSnqyDX47vAewkjRFwiLwrOUjswVvmA==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.14.0.tgz",
+      "integrity": "sha512-MK/XaA2sFdfaOa7I9MjNKz6dxeIEdeZlnpNRoF2w3JuRLlFJLkpp6cD3yaqw2nUUhbrn3Iqe3ZpVV+VuGGil7Q==",
       "hasInstallScript": true,
       "dependencies": {
-        "@prisma/engines-version": "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a"
+        "@prisma/engines-version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c"
       },
       "engines": {
         "node": ">=14.17"
@@ -1269,17 +1271,16 @@
       }
     },
     "node_modules/@prisma/engines": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.11.0.tgz",
-      "integrity": "sha512-0AEBi2HXGV02cf6ASsBPhfsVIbVSDC9nbQed4iiY5eHttW9ZtMxHThuKZE1pnESbr8HRdgmFSa/Kn4OSNYuibg==",
-      "hasInstallScript": true,
-      "optional": true,
-      "peer": true
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.14.0.tgz",
+      "integrity": "sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==",
+      "devOptional": true,
+      "hasInstallScript": true
     },
     "node_modules/@prisma/engines-version": {
-      "version": "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a.tgz",
-      "integrity": "sha512-fsQlbkhPJf08JOzKoyoD9atdUijuGBekwoOPZC3YOygXEml1MTtgXVpnUNchQlRSY82OQ6pSGQ9PxUe4arcSLQ=="
+      "version": "4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.14.0-67.d9a4c5988f480fa576d43970d5a23641aa77bc9c.tgz",
+      "integrity": "sha512-3jum8/YSudeSN0zGW5qkpz+wAN2V/NYCQ+BPjvHYDfWatLWlQkqy99toX0GysDeaUoBIJg1vaz2yKqiA3CFcQw=="
     },
     "node_modules/@selab-2/groep-1-orm": {
       "version": "1.0.17",
@@ -5423,14 +5424,13 @@
       }
     },
     "node_modules/prisma": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.11.0.tgz",
-      "integrity": "sha512-4zZmBXssPUEiX+GeL0MUq/Yyie4ltiKmGu7jCJFnYMamNrrulTBc+D+QwAQSJ01tyzeGHlD13kOnqPwRipnlNw==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.14.0.tgz",
+      "integrity": "sha512-+5dMl1uxMQb4RepndY6AwR9xi1cDcaGFICu+ws6/Nmgt93mFPNj8tYxSfTdmfg+rkNrUId9rk/Ac2vTgLe/oXA==",
+      "devOptional": true,
       "hasInstallScript": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "@prisma/engines": "4.11.0"
+        "@prisma/engines": "4.14.0"
       },
       "bin": {
         "prisma": "build/index.js",
diff --git a/api/package.json b/api/package.json
index c59b941d4..5620ad814 100644
--- a/api/package.json
+++ b/api/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@selab-2/groep-1-orm": "1.0.17",
+    "@prisma/client": "^4.14.0",
     "@types/date-arithmetic": "^4.1.1",
     "@types/multer": "^1.4.7",
     "@types/passport": "^1.0.12",
@@ -54,6 +55,7 @@
     "eslint-config-prettier": "^8.6.0",
     "jest": "^29.5.0",
     "prettier": "^2.8.4",
+    "prisma": "^4.14.0",
     "supertest": "^6.3.3",
     "ts-jest": "^29.0.5",
     "typescript": "^5.0.4"
diff --git a/web/cypress.config.ts b/web/cypress.config.ts
index 6c427a59d..3220999e8 100644
--- a/web/cypress.config.ts
+++ b/web/cypress.config.ts
@@ -3,7 +3,8 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     supportFile: "cypress/support/e2e.ts",
-    baseUrl: "https://sel2-1.ugent.be/",
+    // baseUrl: "https://sel2-1.ugent.be/",
+    baseUrl: "http://localhost:3000/",
     setupNodeEvents(on, config) {
       // implement node event listeners here
       require('@cypress/code-coverage/task')(on, config)
diff --git a/web/cypress/support/commands.ts b/web/cypress/support/commands.ts
index c9d56dc4a..6fcd198c5 100644
--- a/web/cypress/support/commands.ts
+++ b/web/cypress/support/commands.ts
@@ -53,8 +53,7 @@ Cypress.Commands.add('login' as any, (email: string, password:string) => {
     cy.get('#email').type(email)
     cy.get('#password').type(password)
     cy.get('#login').click()
-    // TODO remove next line from comments when routing is fixed, also change it in the e2e tests
-    // cy.get('#logout').should('be.visible')
+    cy.get('#logout').should('be.visible')
   },
     {
       cacheAcrossSpecs: true

From d2b60d333204e84df2699cd8918e94edd0427a36 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Wed, 10 May 2023 13:36:53 +0200
Subject: [PATCH 17/33] chore: updated login tests

---
 web/cypress/e2e/login.cy.ts           | 32 ++++++++++++++++-----------
 web/src/views/account/LoginScreen.vue |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index 5e5bac882..55b3c1a00 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -4,10 +4,23 @@ describe('login tests', () => {
   })
 
   it('log in succesfull', () =>{
-    cy.login('administrator@trottoir.be', 'password')
+    cy.login('administrator@trottoir.be', 'administrator')
+  })
+
+  it('log out', () =>{
+    // in these test, saved sessions should be cleared
+    // otherwise it always restores the first login
+    Cypress.session.clearAllSavedSessions()
+    // there is a check in the login function to see if it passed
+    cy.login('administrator@trottoir.be', 'administrator')
+    cy.visit('/account')
+    cy.get('#logout').click()
+    // we should be back at the log in
+    cy.get('#login')
   })
 
   it('log in failed: incorrect password', () =>{
+    Cypress.session.clearAllSavedSessions()
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('incorrectpassword')
     cy.get('#login').click()
@@ -16,8 +29,9 @@ describe('login tests', () => {
   })
 
   it('log in failed: incorrect email', () =>{
+    Cypress.session.clearAllSavedSessions()
     cy.get('#email').type('administrator@trotwaar.be')
-    cy.get('#password').type('password')
+    cy.get('#password').type('administrator')
     cy.get('#login').click()
     // we should have stayed on the login screen
     cy.get('#login')
@@ -25,18 +39,10 @@ describe('login tests', () => {
 
   // TODO: user doesn't yet have a login
   it('ask login data', () => {
+    Cypress.session.clearAllSavedSessions()
     cy.get('#contact').click()
-    cy.contains('Indien je nog geen account hebt en graag lid wilt worden van DR.Trottoir neem dan contact op met ons via example@drtrottoir.be')
-      .should('be.visible')
-    // example@drtrottoi is still a hardcoded email, this will be changed
-  })
-
-  it('log out', () =>{
-    // there is a check in the login function to see if it passed
-    cy.login('administrator@trottoir.be', 'password')
-    cy.get('#logout').click()
-    // we should be back at the log in
-    cy.get('#login')
+    cy.get('#popup').should('be.visible')
+    // example@drtrottoi in the popup is still a hardcoded email, this will be changed
   })
 
 })
diff --git a/web/src/views/account/LoginScreen.vue b/web/src/views/account/LoginScreen.vue
index 343e1486c..f95d787ff 100644
--- a/web/src/views/account/LoginScreen.vue
+++ b/web/src/views/account/LoginScreen.vue
@@ -54,7 +54,7 @@
 
   <!-- Popup message containing detailed info about account creation. Will pop up when clicked on the text in the bottom div -->
   <v-snackbar v-model="snackbar" timeout="-1" color="white">
-    <v-card prepend-icon="mdi-help" variant="flat">
+    <v-card id="popup" prepend-icon="mdi-help" variant="flat">
       <template v-slot:title> Help </template>
       <p class="mx-3">
         Indien je nog geen account hebt en graag lid wilt worden van DR.

From 192b490e5a07f91b3cac6bdd5753d15d4f50dd0e Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Wed, 10 May 2023 16:34:32 +0200
Subject: [PATCH 18/33] chore: updated e2e tests

---
 web/cypress/e2e/administrator.cy.ts           | 34 +++++++--
 web/cypress/e2e/student.cy.ts                 |  9 +--
 web/cypress/e2e/superstudent.cy.ts            | 75 ++++++++++++++-----
 web/cypress/e2e/syndicus.cy.ts                | 18 ++---
 web/src/components/cards/BuildingInfoCard.vue |  2 +-
 web/src/components/cards/RoundCard.vue        |  2 +-
 web/src/components/forms/AddressForm.vue      |  1 +
 web/src/components/round/RoundCard.vue        |  5 +-
 web/src/layouts/MainLayout.vue                |  1 +
 web/src/views/account/AccountSettings.vue     |  6 +-
 web/src/views/round/Round.vue                 |  1 -
 web/src/views/round/RoundMaker.vue            |  3 +-
 12 files changed, 106 insertions(+), 51 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 4761b627d..e3364e6eb 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -1,5 +1,4 @@
 describe('admin tests', () => {
-  // TODO check if cy.contains('X') works instead of cy.get(..).get(...).contains('X')
   beforeEach(() => {
     cy.login('administrator@trottoir.be', 'administrator')
     cy.visit('/ronde/overzicht')
@@ -32,7 +31,7 @@ describe('admin tests', () => {
     })
     cy.get('#create').click()
     // check if user in userlist
-    cy.contains('td', 'test naam')
+    cy.contains('test naam')
   })
 
   it('edit a user', () => {
@@ -84,7 +83,7 @@ describe('admin tests', () => {
   it('add garbage schedule to a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.contains('td', 'Building 1').click()
+    cy.contains('Building 1').click()
     // add garbage
   })
 
@@ -95,10 +94,35 @@ describe('admin tests', () => {
     //edit garbage
   })
 
-  it('delete garbage schedule to a building', () => {
+  it('delete garbage schedule of a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.contains('td', 'Building 1').click()
+    cy.contains('Building 1').click()
     // delete garbage
   })
+
+  it('add building', () => {
+    cy.get('#buildings').click()
+    // press create button
+    cy.get('#newbuilding').click()
+    // add building data
+    // save
+  })
+
+  it('edit building', () => {
+    // press building from buildings overview
+    cy.get('#building').first().click()
+    // press edit button
+    // alter building data
+    // save
+  })
+
+  it('add garbageschedule building', () => {
+    // press building from buildings overview (right now a bit unclear as to how to do this, with the v-for element)
+    cy.get('#building').first().click()
+    // press add-garbage button
+    // add data
+    // save
+  })
+
 })
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 1448eba6f..6b512c253 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -17,10 +17,8 @@ describe('student tests', () => {
 
 
   it('edit account, but cancel changes', () => {
-    // own db still rough, so based on selab2-1.ugent.be,
-    // there are still some bugs
     cy.get('#account').click()
-    cy.get('#edit').click()
+    cy.get('#editcancel').click()
     cy.get('#personal').then(() => {
       cy.get('#phone').clear()
       // cancel button should not be clickable when a field does not meet the requirements,
@@ -34,9 +32,10 @@ describe('student tests', () => {
       cy.get('#city').type('blabla')
       cy.get('#zipcode').type('1')
     })
-    cy.get('#cancel').click()
+    cy.get('#editcancel').click()
     cy.get('#personal').get('#phone').should('not.contain.text', '0111111111')
-    // cancel keeps the changes, but doesn't push to db, so on reload the changes are gone
+    // cancel keeps the changes, but doesn't push to db, so on reload the changes are gone,
+    // and cypress apparently autoreloads the page
     // obviously the changes should be gone once cancel is pushed, and not just on reload after cancel
   })
 
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 44866d474..f9ed28ee3 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,7 +1,5 @@
 describe('superstudent tests', () => {
-  // TODO check if cy.contains('X') works instead of cy.get(..).get(...).contains('X')
   // TODO check if select(...) works better with index
-  // TODO get('CustomComponent') will probably fail => find solution
   beforeEach(() => {
     cy.login('superstudent@trottoir.be', 'super_student')
     cy.visit('/ronde/overzicht')
@@ -10,7 +8,7 @@ describe('superstudent tests', () => {
   // there is a lot of overlap for superstudents and admins,
   // these overlaps will be tested with either a superstudent or an admin. There is no need to test them twice.
 
-  it('create round', () => {
+  it('create round, no name', () => {
     // go to round overview
     cy.get('#rounds').click()
     // press create button
@@ -18,21 +16,56 @@ describe('superstudent tests', () => {
     // add buildings
     cy.get('#building').eq(0).click() // not sure if this actually works yet
     cy.get('#building').eq(0).click()
+    // save
+    //cy.get('#createround').click()
+    // confirm?
+    // this shouldn't create a new round
+    // check for popup on screen?
+    //cy.contains("test round")
+  })
+
+  it('create round, no buildings', () => {
+    // go to round overview
+    cy.get('#rounds').click()
+    // press create button
+    cy.get('#newround').click()
     // add name
     cy.get('#roundname').type("test round")
     // save
-    cy.get('#createround').click()
+    //cy.get('#createround').click()
     // confirm?
-    // we are rerouted back to the rounds table
-    cy.contains("test round")
+    // this shouldn't create a new round
+    // check for popup on screen?
+    //cy.contains("test round")
+  })
+
+  it('create round succes', () => {
+    // go to round overview
+    cy.get('#rounds').click()
+    // press create button
+    cy.get('#newround').click()
+    // add buildings
+    cy.get('#building').first().click()
+    cy.get('#building').first().click()
+    // add name
+    cy.get('#roundname').type("test round")
+    // save
+    //cy.get('#createround').click()
+    // confirm?
+    // we are rerouted to the round detail of the new round
+    //cy.contains("test round")
+    // check if it also appears in the list
+    //cy.get('#rounds').click()
+    //cy.contains("test round")
   })
 
   it('edit round', () => {
+    // also add tests where try to edit round with incorrect data?
+
     // go to round overview
     cy.get('#rounds').click()
     // press on the round you wish to change
-    cy.get('#roundtable').get('#table').contains('td', 'Round 1').click()
-    // maybe even cy.contains('td', 'Round 1').click() will work
+    cy.contains('Round 1').click()
     // press edit button
 
     // edit button currently not implemented
@@ -48,15 +81,15 @@ describe('superstudent tests', () => {
     // go to round overview
     cy.get('#rounds').click()
     // select round
-    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
+    cy.contains('test round').click()
     // select plan schedule
     cy.get('#schedule').click()
     // select student and date(s)
     cy.get('#selectstudent').select('Dirk De Student') // maybe safer with index
     cy.get('.selectors').then( () => {
       cy.get('#frequency').select('wekelijks') // maybe safer with index
-      cy.get('#startdate').type('01052023')
-      cy.get('#enddate').type('31052023')
+      cy.get('#startdate').type('01062023')
+      cy.get('#enddate').type('31062023')
       cy.get('#starttime').type('1930')
     })
     // add
@@ -66,9 +99,12 @@ describe('superstudent tests', () => {
     // confirm?
     //check if schedule has been added
     cy.get('#rounds').click()
-    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
-    cy.get('RoundCard').contains("h3", new Date("2023-05-01").toLocaleDateString())
-    // I don't know if this will work, maybe just cy.contains("h3", new Date("2023-05-01").toLocaleDateString())
+    cy.contains('test round').click()
+    // this will work if the last added schedule is the first one in the list
+    cy.get('#buildingcard').eq(0).then(() => {
+      cy.get('#date').contains(new Date("2023-06-01").toLocaleDateString())
+      cy.get('#student').contains("Dirk De Student")
+    })
   })
 
   it('switch student for round (for a single date)', () => {
@@ -79,18 +115,19 @@ describe('superstudent tests', () => {
     // go to round overview
     cy.get('#rounds').click()
     // press on the round you wish to delete
-    cy.get('#roundtable').get('#table').contains('td', 'test round').click()
+    cy.contains('test round').click()
     // press delete button
     cy.get('#deleteround').click()
     // confirm?
     // round should not be present in the table
-    cy.get('#roundtable').get('#table').contains('td', 'test round').should('not.exist')
+    cy.contains('test round').should('not.exist')
   })
 
 
   it('observe students currently doing a round', () => {
     // make sure there is a student currently doing Round X: maybe add a test that creates this?
-    const round: string = "Round X"
+    // give round to student -> student starts round
+    const round: string = "Ronde 3"
     // go to the overview page
     cy.visit('/ronde/overzicht')
     // add filters
@@ -100,8 +137,10 @@ describe('superstudent tests', () => {
       cy.get('#searchtype').type(round)
     })
     // click on the student/round to get more details
-    cy.get('RoundCard').first().click()
+    cy.get('#roundcard').first().click()
     cy.contains(round)
+    // full name wasn't visible in the round selection, but it is once you clicked on the round
+    cy.contains("Dirk De Student")
   })
 
 })
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index 1143efa02..35ccedb6c 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -1,23 +1,15 @@
 describe('syndicus tests', () => {
   beforeEach(() => {
     cy.login('syndicus@trottoir.be', 'syndicus')
+
   })
 
   it('check building', () => {
     // syndicus checks for comments left on one of their buildings
-  })
-
-  it('add building', () => {
-    // press create button
-    // add building data
-    // save
-  })
-
-  it('edit building', () => {
-    // press building from buildings overview (right now a bit unclear as to how to do this, with the v-for element)
-    // press edit button
-    // alter building data
-    // save
+    cy.visit('/account/settings/4')
+    cy.get('#building').first().click()
+    cy.contains('Building 1')
+    // can't change the date of Taken
   })
 
 })
diff --git a/web/src/components/cards/BuildingInfoCard.vue b/web/src/components/cards/BuildingInfoCard.vue
index 51978d7b2..1fc34acaa 100644
--- a/web/src/components/cards/BuildingInfoCard.vue
+++ b/web/src/components/cards/BuildingInfoCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <BorderCard @click="$emit('clicked')" class="my-2">
+  <BorderCard id="building" @click="$emit('clicked')" class="my-2">
     <template v-slot:prepend>
       <v-icon icon="mdi-office-building"></v-icon>
     </template>
diff --git a/web/src/components/cards/RoundCard.vue b/web/src/components/cards/RoundCard.vue
index 0d64a32c7..7ef8eb632 100644
--- a/web/src/components/cards/RoundCard.vue
+++ b/web/src/components/cards/RoundCard.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- TODO: Container around the card to show the edges a bit more, should be removed in the future -->
-  <BorderCard class="mb-3 mx-1 pb-2">
+  <BorderCard id="roundcard" class="mb-3 mx-1 pb-2">
     <v-progress-linear
       id="progress"
       absolute
diff --git a/web/src/components/forms/AddressForm.vue b/web/src/components/forms/AddressForm.vue
index 1e77e70fe..a46a12fef 100644
--- a/web/src/components/forms/AddressForm.vue
+++ b/web/src/components/forms/AddressForm.vue
@@ -69,6 +69,7 @@
       >
         <!-- Text input field for the zip code -->
         <ZipCodeInputField
+          id="zipcode"
           :readonly="readonly"
           v-model="address.zip_code"
           @update:model-value="$emit('onUpdate', address)"
diff --git a/web/src/components/round/RoundCard.vue b/web/src/components/round/RoundCard.vue
index cadab5e0b..58c517ea7 100644
--- a/web/src/components/round/RoundCard.vue
+++ b/web/src/components/round/RoundCard.vue
@@ -1,6 +1,7 @@
 <template>
   <CardLayout
     v-if="schedule"
+    id="buildingcard"
     class="building-card"
     @click="
       router.push({
@@ -10,8 +11,8 @@
     "
   >
     <div>
-      <h3>{{ new Date(schedule.day).toLocaleDateString() }}</h3>
-      <p>{{ schedule.user.first_name }} {{ schedule.user.last_name }}</p>
+      <h3 id="date">{{ new Date(schedule.day).toLocaleDateString() }}</h3>
+      <p id="student">{{ schedule.user.first_name }} {{ schedule.user.last_name }}</p>
     </div>
     <div class="flex-grow-1"></div>
     <RoundedButton
diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue
index d265f3710..a358f0e7f 100644
--- a/web/src/layouts/MainLayout.vue
+++ b/web/src/layouts/MainLayout.vue
@@ -109,6 +109,7 @@
                 }"
               >
                 <v-list-item
+                  id="building"
                   prepend-icon="mdi-file-cabinet"
                   :title="building.name"
                   value="gebouwen"
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index 568b891a6..1ee5d2e19 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -130,7 +130,7 @@
     <!-- Section with the adress -->
     <BorderCard class="mt-4" prepend-icon="mdi-map-marker">
       <template v-slot:title> Adres </template>
-      <AddressFrom
+      <AddressForm
         id="address"
         :class="edit ? 'mx-4' : 'mx-10'"
         :readonly="!edit"
@@ -139,7 +139,7 @@
         :number="String(user?.address.number)"
         :zip_code="String(user?.address.zip_code)"
         @onUpdate="(newAddress: Address) => handleAddressUpdate(newAddress)"
-      ></AddressFrom>
+      ></AddressForm>
     </BorderCard>
 
     <!-- Section to pick the roles -->
@@ -239,7 +239,7 @@
 import HFillWrapper from "@/layouts/HFillWrapper.vue";
 import BorderCard from "@/layouts/CardLayout.vue";
 import ContactForm from "@/components/forms/ContactForm.vue";
-import AddressFrom from "@/components/forms/AddressForm.vue";
+import AddressForm from "@/components/forms/AddressForm.vue";
 import Avatar from "@/components/Avatar.vue";
 import { Ref, ref } from "vue";
 import { useAuthStore } from "@/stores/auth";
diff --git a/web/src/views/round/Round.vue b/web/src/views/round/Round.vue
index 6ce78f7bf..c5d7ac4bf 100644
--- a/web/src/views/round/Round.vue
+++ b/web/src/views/round/Round.vue
@@ -50,7 +50,6 @@
 
       <div class="space-y-8">
         <RoundCard
-          id="schedules"
           v-for="schedule in schedules"
           v-bind:key="schedule.id"
           :schedule="schedule"
diff --git a/web/src/views/round/RoundMaker.vue b/web/src/views/round/RoundMaker.vue
index 70ce16bd5..35b73004e 100644
--- a/web/src/views/round/RoundMaker.vue
+++ b/web/src/views/round/RoundMaker.vue
@@ -7,7 +7,7 @@
       ><border-card
         class="mb-4"
         title="Ronde aanmaken"
-        subtitle="De ronde zal in de volgorde van onderstaande lijst opgeslaan worden"
+        subtitle="De ronde zal in de volgorde van onderstaande lijst opgeslagen worden"
       >
         <template v-slot:append
           ><v-switch
@@ -63,7 +63,6 @@
       </border-card>
 
       <building-info-card
-        id="availablebuildings"
         v-for="entry in filterlist()"
         :key="entry.listID"
         :name="entry.building.name"

From 29f7a50f1cccdbf1a6c622b7d39e02d55c27537f Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 13 May 2023 21:37:57 +0200
Subject: [PATCH 19/33] feat: added student roun and admin building tests

---
 web/cypress.config.ts                         |  2 +-
 web/cypress/e2e/administrator.cy.ts           | 84 +++++++++++++++----
 web/cypress/e2e/student.cy.ts                 | 44 ++++++++--
 web/cypress/e2e/superstudent.cy.ts            | 26 +++---
 web/src/components/round/RoundDetailCard.vue  |  2 +
 web/src/views/building/BuildingMaker.vue      |  7 ++
 web/src/views/building/BuildingScreen.vue     |  2 +
 web/src/views/building/GarbageMaker.vue       | 12 ++-
 web/src/views/round/RoundDetail.vue           |  1 +
 .../student/SchedulingScreenStudents.vue      |  1 +
 10 files changed, 138 insertions(+), 43 deletions(-)

diff --git a/web/cypress.config.ts b/web/cypress.config.ts
index 3220999e8..394ad0d80 100644
--- a/web/cypress.config.ts
+++ b/web/cypress.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from "cypress";
 export default defineConfig({
   e2e: {
     supportFile: "cypress/support/e2e.ts",
-    // baseUrl: "https://sel2-1.ugent.be/",
+    //baseUrl: "https://sel2-1.ugent.be/",
     baseUrl: "http://localhost:3000/",
     setupNodeEvents(on, config) {
       // implement node event listeners here
diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index e3364e6eb..40947738d 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -30,8 +30,10 @@ describe('admin tests', () => {
       cy.get('#administrator').check()
     })
     cy.get('#create').click()
+    cy.get('#submit').click()
     // check if user in userlist
     cy.contains('test naam')
+    // click on user and check if all fields are ok? or is this more for backend testing?
   })
 
   it('edit a user', () => {
@@ -40,7 +42,7 @@ describe('admin tests', () => {
     // click user
     cy.contains('test naam').click()
     // press edit button
-    cy.get('#edit').click()
+    cy.get('#editcancel').click()
     // alter user data
     // most of this has been tested in the student tests,
     // however only admins can change name, roles or password of a user
@@ -80,49 +82,95 @@ describe('admin tests', () => {
     // not yet implemented
   })
 
+  it('add building', () => {
+    cy.get('#buildings').click()
+    // press create button
+    cy.get('#newbuilding').click()
+    // add building data
+    cy.get('#name').type('test building')
+    cy.get('#ivagoid').type('1234')
+    // syndicus still hardcoded
+    // cy.get('#syndicus').select()
+    cy.get('#longitude').type("12")
+    cy.get('#latitude').type("34")
+    cy.get('#addressform').then(() => {
+      cy.get('#street').type("teststraat")
+      cy.get('#streetnr').type("1")
+      cy.get('#city').type("test")
+      cy.get('#zipcode').type("1111")
+    })
+    cy.get('#submit').click()
+    // save
+    // we should be on the info page of the building
+    cy.contains('test building')
+    cy.contains('Taken')
+  })
+
   it('add garbage schedule to a building', () => {
     cy.get('#buildings').click()
     // select building
     cy.contains('Building 1').click()
     // add garbage
+    cy.get('#addgarbage').click()
+    cy.get('#garbage').select('REST')
+    cy.get('#action').select('buiten zetten')
+    cy.get('frequency').select('wekelijks')
+    // TODO: add an actual date
+    cy.get('startdate').type('')
+    cy.get('#enddate').type('')
+    cy.get('time').type('2000')
+    cy.get('#addtoschedule').click()
+    cy.get('#schedule').click()
+    // check if schedule is added
   })
 
   it('edit garbage schedule of a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.contains('Building 1').click()
+    cy.contains('test building').click()
     //edit garbage
   })
 
   it('delete garbage schedule of a building', () => {
     cy.get('#buildings').click()
     // select building
-    cy.contains('Building 1').click()
+    cy.contains('test building').click()
     // delete garbage
   })
 
-  it('add building', () => {
-    cy.get('#buildings').click()
-    // press create button
-    cy.get('#newbuilding').click()
-    // add building data
-    // save
-  })
-
   it('edit building', () => {
+    cy.get('#buildings').click()
     // press building from buildings overview
-    cy.get('#building').first().click()
+    cy.contains('test building').click()
     // press edit button
+    cy.contains('#edit').click()
     // alter building data
+    // TODO: actually change some of this data
+    cy.get('#name').type('test building')
+    cy.get('#ivagoid').type('1234')
+    // syndicus still hardcoded
+    // cy.get('#syndicus').select()
+    cy.get('#longitude').type("12")
+    cy.get('#latitude').type("34")
+    cy.get('#addressform').then(() => {
+      cy.get('#street').type("teststraat")
+      cy.get('#streetnr').type("1")
+      cy.get('#city').type("test")
+      cy.get('#zipcode').type("1111")
+    })
+    cy.get('#submit').click()
+    // save
+    // we should be on the info page of the building
+    cy.contains('test building')
+    cy.contains('Taken')
     // save
   })
 
-  it('add garbageschedule building', () => {
-    // press building from buildings overview (right now a bit unclear as to how to do this, with the v-for element)
-    cy.get('#building').first().click()
-    // press add-garbage button
-    // add data
-    // save
+  it('delete building', () => {
+    cy.contains('test building').click()
+    cy.get('#edit').click()
+    // delete
+    // confirm?
   })
 
 })
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 6b512c253..33ebc9b23 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -8,11 +8,18 @@ describe('student tests', () => {
   it('student performs a round', () => {
     // we should already be at "/planning"
     // student selects round which he/her wants to start
+    // you can start by clicking start on the round card, or by clicking on the card and then hit start
+    cy.get('#round').first().click()
     // student goes to first building,
-    // performs garbage tasks, takes pictures and or leaves a comment
-    // student indicates building as done
+    cy.get('#building').first().then(()=>{
+      cy.get('#start').click()
+      // TODO
+      // expand the card to add pictures and leave a comment
+      // student indicates building as done
+      cy.get("end").click()
+    })
     // repeat for all buildings
-    // student ends the round
+    // student ends the round: automaticly ends when last building is marked as done
   })
 
 
@@ -21,22 +28,43 @@ describe('student tests', () => {
     cy.get('#editcancel').click()
     cy.get('#personal').then(() => {
       cy.get('#phone').clear()
-      // cancel button should not be clickable when a field does not meet the requirements,
-      // this is still possible now
       cy.get('#phone').type('0111111111')
       cy.get('#email').type('{backspace}') // depends on position of cursor
     })
     cy.get('#address').then(() => {
+      cy.get('#street').clear()
       cy.get('#street').type('t')
       cy.get('#streetnr').type('{backspace}')
       cy.get('#city').type('blabla')
       cy.get('#zipcode').type('1')
     })
     cy.get('#editcancel').click()
+    // check if changes are undone
     cy.get('#personal').get('#phone').should('not.contain.text', '0111111111')
-    // cancel keeps the changes, but doesn't push to db, so on reload the changes are gone,
-    // and cypress apparently autoreloads the page
-    // obviously the changes should be gone once cancel is pushed, and not just on reload after cancel
+    cy.get('#address').get('#street').should('not.containt.text', 't')
   })
 
+  it('edit account, save changes', () => {
+    cy.get('#account').click()
+    cy.get('#editcancel').click()
+    cy.get('#personal').then(() => {
+      cy.get('#phone').clear()
+      cy.get('#phone').type('0111111111')
+      cy.get('#email').type('{backspace}') // depends on position of cursor
+    })
+    cy.get('#address').then(() => {
+      cy.get('#street').clear()
+      cy.get('#street').type('t')
+      cy.get('#streetnr').type('{backspace}')
+      cy.get('#city').type('blabla')
+      cy.get('#zipcode').type('1')
+    })
+    // cancel button should not be clickable when a field does not meet the requirements,
+    // this is still possible now
+    cy.get('#save').click()
+    cy.get('#submit').click()
+    // check if changes are saved
+    cy.get('#personal').get('#phone').should('contain.text', '0111111111')
+    cy.get('#address').get('#street').should('containt.text', 't')
+  })
 })
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index f9ed28ee3..0584ac1e0 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -14,14 +14,13 @@ describe('superstudent tests', () => {
     // press create button
     cy.get('#newround').click()
     // add buildings
-    cy.get('#building').eq(0).click() // not sure if this actually works yet
-    cy.get('#building').eq(0).click()
+    cy.get('#building').first().click()
+    cy.get('#building').first().click()
     // save
-    //cy.get('#createround').click()
+    cy.get('#createround').click()
     // confirm?
-    // this shouldn't create a new round
+    // this gives QueryError2
     // check for popup on screen?
-    //cy.contains("test round")
   })
 
   it('create round, no buildings', () => {
@@ -32,11 +31,10 @@ describe('superstudent tests', () => {
     // add name
     cy.get('#roundname').type("test round")
     // save
-    //cy.get('#createround').click()
+    cy.get('#createround').click()
     // confirm?
-    // this shouldn't create a new round
+    // this gives QueryError2
     // check for popup on screen?
-    //cy.contains("test round")
   })
 
   it('create round succes', () => {
@@ -50,13 +48,14 @@ describe('superstudent tests', () => {
     // add name
     cy.get('#roundname').type("test round")
     // save
-    //cy.get('#createround').click()
+    cy.get('#createround').click()
     // confirm?
     // we are rerouted to the round detail of the new round
-    //cy.contains("test round")
+    cy.contains("test round")
+    cy.contains("Planning")
     // check if it also appears in the list
-    //cy.get('#rounds').click()
-    //cy.contains("test round")
+    cy.get('#rounds').click()
+    cy.contains("test round")
   })
 
   it('edit round', () => {
@@ -101,7 +100,7 @@ describe('superstudent tests', () => {
     cy.get('#rounds').click()
     cy.contains('test round').click()
     // this will work if the last added schedule is the first one in the list
-    cy.get('#buildingcard').eq(0).then(() => {
+    cy.get('#buildingcard').first().then(() => {
       cy.get('#date').contains(new Date("2023-06-01").toLocaleDateString())
       cy.get('#student').contains("Dirk De Student")
     })
@@ -141,6 +140,7 @@ describe('superstudent tests', () => {
     cy.contains(round)
     // full name wasn't visible in the round selection, but it is once you clicked on the round
     cy.contains("Dirk De Student")
+    // gebouw cards uitklappen om opmerkingen/afbeeldingen te zien
   })
 
 })
diff --git a/web/src/components/round/RoundDetailCard.vue b/web/src/components/round/RoundDetailCard.vue
index f3f1ca07a..a4f4a022b 100644
--- a/web/src/components/round/RoundDetailCard.vue
+++ b/web/src/components/round/RoundDetailCard.vue
@@ -41,6 +41,7 @@
             "
           />
           <RoundedButton
+            id="start"
             class="mr-1"
             v-else-if="isStudent"
             value="start"
@@ -59,6 +60,7 @@
             "
           />
           <RoundedButton
+            id="end"
             class="mr-1"
             v-else-if="progress.arrival && isStudent"
             value="eindig"
diff --git a/web/src/views/building/BuildingMaker.vue b/web/src/views/building/BuildingMaker.vue
index 2bbf1e6eb..264ec4279 100644
--- a/web/src/views/building/BuildingMaker.vue
+++ b/web/src/views/building/BuildingMaker.vue
@@ -4,17 +4,20 @@
     <BorderCard prepend-icon="mdi-home" class="mb-3 px-4" title="Gebouw info">
       <v-text-field
         required
+        id="name"
         type="text"
         v-model="building.name"
         label="Building Name"
       ></v-text-field>
       <v-text-field
         required
+        id="ivagoid"
         type="text"
         v-model="building.ivagoId"
         label="Ivago id"
       ></v-text-field>
       <v-select
+        id="syndicus"
         label="Syndicus"
         :items="['Jeff', 'Elon', 'Tim', 'Bill', 'Warren', 'Steve']"
         v-model="building.syndicus"
@@ -51,6 +54,7 @@
           <v-col>
             <v-text-field
               required
+              id="longitude"
               type="number"
               v-model="address2.longitude"
               label="Longitude"
@@ -59,6 +63,7 @@
           <v-col>
             <v-text-field
               required
+              id="latitude"
               type="number"
               v-model="address2.latitude"
               label="Latitude"
@@ -67,6 +72,7 @@
         </v-row>
         <!-- addres forum gebruiken -->
         <AddressForm
+          id="addressform"
           @onUpdate="(newAddress) => (address2 = newAddress)"
         ></AddressForm>
       </div>
@@ -82,6 +88,7 @@
     </BorderCard>
     <div class="d-flex flex-row-reverse mt-3">
       <v-btn
+        id="submit"
         @click="submit"
         to="/gebouw/0"
         type="submit"
diff --git a/web/src/views/building/BuildingScreen.vue b/web/src/views/building/BuildingScreen.vue
index bdd1326c0..8b8dd2d33 100644
--- a/web/src/views/building/BuildingScreen.vue
+++ b/web/src/views/building/BuildingScreen.vue
@@ -12,6 +12,7 @@
           <h1 class="building-name">{{ building.name }}</h1>
           <RoundedButton
             v-if="!useAuthStore().auth?.student"
+            id="edit"
             @clicked="() => router.push({ name: 'building_new' })"
             icon="mdi-pencil"
             class="mt-2"
@@ -98,6 +99,7 @@
               <input type="date" v-model="taskEndDate" @change="getTasks()" />
             </div>
             <RoundedButton
+              id="addgarbage"
               icon="mdi-plus"
               class="mx-1 mt-1"
               value="Toevoegen"
diff --git a/web/src/views/building/GarbageMaker.vue b/web/src/views/building/GarbageMaker.vue
index 0f470cb4e..8037d9b3b 100644
--- a/web/src/views/building/GarbageMaker.vue
+++ b/web/src/views/building/GarbageMaker.vue
@@ -15,12 +15,14 @@
 
       <div class="flex">
         <v-select
+          id="garbage"
           v-model="garbageType"
           :items="garbageTypes"
           label="Garbage Type"
         ></v-select>
-        <v-select v-model="action" :items="actions" label="Actie"></v-select>
+        <v-select id="action" v-model="action" :items="actions" label="Actie"></v-select>
         <v-select
+          id="frequency"
           v-model="frequency"
           :items="frequenties"
           label="Frequentie"
@@ -29,21 +31,24 @@
 
       <div class="flex">
         <v-text-field
+          id="startdate"
           v-model="startDate"
           label="Start Datum"
           type="date"
         ></v-text-field>
         <v-text-field
+          id="enddate"
           v-model="endDate"
           v-if="frequency !== 'enkel'"
           label="Einde Datum"
           type="date"
         ></v-text-field>
-        <v-text-field v-model="time" label="Tijd" type="time"></v-text-field>
+        <v-text-field id="time" v-model="time" label="Tijd" type="time"></v-text-field>
       </div>
 
       <div class="flex">
         <v-btn
+          id="schedule"
           prepend-icon="mdi-check"
           variant="tonal"
           @click="submit"
@@ -51,6 +56,7 @@
           >Inplannen</v-btn
         >
         <v-btn
+          id="addtoschedule"
           prepend-icon="mdi-plus-circle"
           @click="add"
           variant="tonal"
@@ -63,7 +69,7 @@
           "
           >Toevoegen</v-btn
         >
-        <v-btn prepend-icon="mdi-delete" variant="tonal" @click="clearAll"
+        <v-btn id="clearall" prepend-icon="mdi-delete" variant="tonal" @click="clearAll"
           >Alles verwijderen</v-btn
         >
       </div>
diff --git a/web/src/views/round/RoundDetail.vue b/web/src/views/round/RoundDetail.vue
index 7a92b8fb6..5fa24e819 100644
--- a/web/src/views/round/RoundDetail.vue
+++ b/web/src/views/round/RoundDetail.vue
@@ -84,6 +84,7 @@
             width="100%"
           >
             <RoundDetailCard
+              id="building"
               :class="mobile ? 'shiftUnderTimeLine' : ''"
               :key="JSON.stringify(entry.progress)"
               :entry="entry"
diff --git a/web/src/views/student/SchedulingScreenStudents.vue b/web/src/views/student/SchedulingScreenStudents.vue
index 93811f53a..bc86b6d4f 100644
--- a/web/src/views/student/SchedulingScreenStudents.vue
+++ b/web/src/views/student/SchedulingScreenStudents.vue
@@ -21,6 +21,7 @@
       <BorderCard
         v-for="item in day.list"
         :key="item.schedule.id"
+        id="round"
         class="mb-3 mx-1"
         :title="item.schedule.round.name"
         @click="

From 27476f2ffd0515c214efacb2709febf2424692fa Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 14 May 2023 13:53:59 +0200
Subject: [PATCH 20/33] feat: administrator building tests

---
 web/cypress/e2e/administrator.cy.ts | 34 +++++++++++++++++++----------
 web/cypress/e2e/superstudent.cy.ts  |  2 ++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 40947738d..aaebc285b 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -94,7 +94,7 @@ describe('admin tests', () => {
     cy.get('#longitude').type("12")
     cy.get('#latitude').type("34")
     cy.get('#addressform').then(() => {
-      cy.get('#street').type("teststraat")
+      cy.get('#street').type("teststreet")
       cy.get('#streetnr').type("1")
       cy.get('#city').type("test")
       cy.get('#zipcode').type("1111")
@@ -104,6 +104,10 @@ describe('admin tests', () => {
     // we should be on the info page of the building
     cy.contains('test building')
     cy.contains('Taken')
+    cy.contains('Bezoeken')
+    // cy.contains('1234') ivago id not shown
+    // cy.contains('name of syndicus')
+    // maybe click on the 'kaarten' button to see if address was added correctly
   })
 
   it('add garbage schedule to a building', () => {
@@ -122,6 +126,9 @@ describe('admin tests', () => {
     cy.get('#addtoschedule').click()
     cy.get('#schedule').click()
     // check if schedule is added
+    cy.get('#buildings').click()
+    cy.contains('Building 1').click()
+    // onder Taken bij het gebouw, of nee toch niet, dus waar kan je dit zien? wss zo bij het aanmaken van een ronde
   })
 
   it('edit garbage schedule of a building', () => {
@@ -145,30 +152,33 @@ describe('admin tests', () => {
     // press edit button
     cy.contains('#edit').click()
     // alter building data
-    // TODO: actually change some of this data
-    cy.get('#name').type('test building')
-    cy.get('#ivagoid').type('1234')
+    cy.get('#name').clear().type('test gebouw')
+    cy.get('#ivagoid').clear().type('4321')
     // syndicus still hardcoded
     // cy.get('#syndicus').select()
-    cy.get('#longitude').type("12")
-    cy.get('#latitude').type("34")
+    cy.get('#longitude').clear().type("21")
+    cy.get('#latitude').clear().type("43")
     cy.get('#addressform').then(() => {
-      cy.get('#street').type("teststraat")
-      cy.get('#streetnr').type("1")
-      cy.get('#city').type("test")
-      cy.get('#zipcode').type("1111")
+      cy.get('#street').clear().type("teststraat")
+      cy.get('#streetnr').clear().type("10")
+      cy.get('#city').clear().type("city")
+      cy.get('#zipcode').clear().type("1000")
     })
     cy.get('#submit').click()
     // save
     // we should be on the info page of the building
-    cy.contains('test building')
+    cy.contains('test gebouw')
     cy.contains('Taken')
-    // save
+    cy.contains('Bezoeken')
+    // cy.contains('4321') ivago id not shown
+    // cy.contains('name of syndicus')
+    // maybe click on the 'kaarten' button to see if address was added correctly
   })
 
   it('delete building', () => {
     cy.contains('test building').click()
     cy.get('#edit').click()
+    // deletion not yet implemented
     // delete
     // confirm?
   })
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 0584ac1e0..9c0d5665b 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -52,6 +52,8 @@ describe('superstudent tests', () => {
     // confirm?
     // we are rerouted to the round detail of the new round
     cy.contains("test round")
+    cy.contains('Gebouwen')
+    // cy.contains('naam gebouw 1')
     cy.contains("Planning")
     // check if it also appears in the list
     cy.get('#rounds').click()

From a16194792869957c95ef332d7b4638b9e38b2bac Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Fri, 19 May 2023 23:05:14 +0200
Subject: [PATCH 21/33] feat: student test

---
 web/cypress/e2e/administrator.cy.ts          | 18 +++++++-
 web/cypress/e2e/login.cy.ts                  |  3 --
 web/cypress/e2e/student.cy.ts                | 43 ++++++++++++++++----
 web/src/components/images/PhotoMaker.vue     |  3 +-
 web/src/components/round/RoundDetailCard.vue |  6 +++
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index aaebc285b..60dc388a3 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -45,7 +45,7 @@ describe('admin tests', () => {
     cy.get('#editcancel').click()
     // alter user data
     // most of this has been tested in the student tests,
-    // however only admins can change name, roles or password of a user
+    // however only admins can change name or roles of a user
     cy.get("#firstname").clear().type("nieuwe")
     cy.get("#lastname").clear().type("gebruiker")
     cy.get('#roles').then(() => {
@@ -78,6 +78,10 @@ describe('admin tests', () => {
     cy.contains('nieuwe gebruiker').should('not.exist')
   })
 
+  it('restore deleted user', () => {
+
+  })
+
   it('check the profitability statistics', () => {
     // not yet implemented
   })
@@ -183,4 +187,16 @@ describe('admin tests', () => {
     // confirm?
   })
 
+  it('add new template', () => {
+
+  })
+
+  it('edit template', () => {
+
+  })
+
+  it('delete templete', () => {
+
+  })
+
 })
diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index 55b3c1a00..ca7f09664 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -13,7 +13,6 @@ describe('login tests', () => {
     Cypress.session.clearAllSavedSessions()
     // there is a check in the login function to see if it passed
     cy.login('administrator@trottoir.be', 'administrator')
-    cy.visit('/account')
     cy.get('#logout').click()
     // we should be back at the log in
     cy.get('#login')
@@ -37,12 +36,10 @@ describe('login tests', () => {
     cy.get('#login')
   })
 
-  // TODO: user doesn't yet have a login
   it('ask login data', () => {
     Cypress.session.clearAllSavedSessions()
     cy.get('#contact').click()
     cy.get('#popup').should('be.visible')
-    // example@drtrottoi in the popup is still a hardcoded email, this will be changed
   })
 
 })
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 33ebc9b23..96be6fc17 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -7,7 +7,7 @@ describe('student tests', () => {
 
   it('student performs a round', () => {
     // we should already be at "/planning"
-    // student selects round which he/her wants to start
+    // student selects round which he/she wants to start
     // you can start by clicking start on the round card, or by clicking on the card and then hit start
     cy.get('#round').first().click()
     // student goes to first building,
@@ -15,8 +15,31 @@ describe('student tests', () => {
       cy.get('#start').click()
       // TODO
       // expand the card to add pictures and leave a comment
+      cy.get('#expand').click()
+      // add a comment
+      cy.get('#addcomment').click()
+      cy.get('#writecomment').type('This is a commen')
+      cy.get('#savecomment').click()
+      // oh no, we made a spelling error. Luckily we can edit our comment!
+      cy.get('#editcomment').click()
+      cy.get('#writecomment').type('t.')
+      cy.get('#savecomment').click()
+      // add images
+      // add arrival image
+      cy.get('#addimage').click()
+      cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
+      //the standard type is arrival, so doesn't need change here
+      cy.get('#comment').type('Arrival picture.')
+      cy.get('#save').click()
+      // add departure image
+      cy.get('#addimage').click()
+      cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
+      cy.get('#type').parent().click()
+      cy.contains('DEPARTURE').click()
+      cy.get('#comment').type('Departure picture.')
+      cy.get('#save').click()
       // student indicates building as done
-      cy.get("end").click()
+      cy.get("eindig").click()
     })
     // repeat for all buildings
     // student ends the round: automaticly ends when last building is marked as done
@@ -33,15 +56,19 @@ describe('student tests', () => {
     })
     cy.get('#address').then(() => {
       cy.get('#street').clear()
-      cy.get('#street').type('t')
+      cy.get('#street').type('street')
       cy.get('#streetnr').type('{backspace}')
       cy.get('#city').type('blabla')
       cy.get('#zipcode').type('1')
     })
+    cy.get('#save').click()
+    // there is now a popup to confirm or cancel
+    cy.get('#cancel').click()
+    // back on the edit screen
     cy.get('#editcancel').click()
     // check if changes are undone
     cy.get('#personal').get('#phone').should('not.contain.text', '0111111111')
-    cy.get('#address').get('#street').should('not.containt.text', 't')
+    cy.get('#address').get('#street').should('not.containt.text', 'street')
   })
 
   it('edit account, save changes', () => {
@@ -54,17 +81,17 @@ describe('student tests', () => {
     })
     cy.get('#address').then(() => {
       cy.get('#street').clear()
-      cy.get('#street').type('t')
+      cy.get('#street').type('street')
       cy.get('#streetnr').type('{backspace}')
       cy.get('#city').type('blabla')
       cy.get('#zipcode').type('1')
     })
-    // cancel button should not be clickable when a field does not meet the requirements,
-    // this is still possible now
+    cy.get('#password').type('ni3uwW@chtwoord') // password has to meet the requirements
+    cy.get('#repeat').type('ni3uwW@chtwoord')
     cy.get('#save').click()
     cy.get('#submit').click()
     // check if changes are saved
     cy.get('#personal').get('#phone').should('contain.text', '0111111111')
-    cy.get('#address').get('#street').should('containt.text', 't')
+    cy.get('#address').get('#street').should('containt.text', 'street')
   })
 })
diff --git a/web/src/components/images/PhotoMaker.vue b/web/src/components/images/PhotoMaker.vue
index b9b96b0d8..821fa0110 100644
--- a/web/src/components/images/PhotoMaker.vue
+++ b/web/src/components/images/PhotoMaker.vue
@@ -41,6 +41,7 @@
       <div class="d-flex mb-4">
         <v-spacer></v-spacer
         ><v-btn
+          id="save"
           @click="$emit('confirm', photo, isPhoto)"
           color="primary"
           prepend-icon="mdi-check"
@@ -71,7 +72,7 @@ const props = defineProps({
 
 const photo = ref<Photo>({
   image: [],
-  comments: "geen commentaar",
+  comments: "",
   type: "ARRIVAL",
 });
 
diff --git a/web/src/components/round/RoundDetailCard.vue b/web/src/components/round/RoundDetailCard.vue
index 7cb222c19..81f9576bf 100644
--- a/web/src/components/round/RoundDetailCard.vue
+++ b/web/src/components/round/RoundDetailCard.vue
@@ -111,6 +111,7 @@
       </div>
       <v-icon icon="mdi-chevron-right" />
       <v-btn
+        id="expand"
         @click.stop="expanded = !expanded"
         :icon="expanded ? 'mdi-menu-up' : 'mdi-menu-down'"
         class="dropdown-button"
@@ -125,12 +126,14 @@
         <p v-if="!editMode">{{ progress?.report }}</p>
         <!-- eslint-disable-next-line vue/no-mutating-props -->
         <v-text-field
+          id="writecomment"
           type="text"
           v-else
           v-model="progress.report"
           style="margin-bottom: -20px"
         />
         <RoundedButton
+          id="savecomment"
           v-if="editMode"
           icon="mdi-check"
           value="Opslaan"
@@ -138,6 +141,7 @@
           @click="() => report()"
         />
         <RoundedButton
+          id="editcomment"
           v-else-if="progress?.report !== '' && canEdit"
           icon="mdi-pencil"
           value="Bewerken"
@@ -147,6 +151,7 @@
         <div v-else-if="progress?.report === ''">
           <p style="opacity: 75%">Geen opmerkingen toegevoegd.</p>
           <RoundedButton
+            id="addcomment"
             v-if="canEdit"
             icon="mdi-plus"
             value="Toevoegen"
@@ -177,6 +182,7 @@
           </div>
           <p v-else style="opacity: 75%">Geen foto's toegevoegd.</p>
           <RoundedButton
+            id="addimage"
             v-if="canEdit"
             icon="mdi-plus"
             value="Toevoegen"

From 8884fb1b65dd89d767293b369d9c678d5d6b9c57 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 20 May 2023 21:05:34 +0200
Subject: [PATCH 22/33] test: admin

---
 web/cypress/e2e/administrator.cy.ts           |  57 +++-
 web/cypress/e2e/login.cy.ts                   |  25 +-
 web/cypress/support/commands.ts               |   1 -
 web/package-lock.json                         | 307 +++++++++---------
 web/package.json                              |   2 +-
 web/src/components/cards/RemovedCard.vue      |   1 +
 web/src/components/filter/DashBoardSearch.vue |   1 +
 web/src/layouts/MainLayout.vue                |   1 +
 web/src/views/account/AccountSettings.vue     |   6 +-
 web/src/views/contact/TemplateBuilder.vue     |   6 +-
 web/src/views/dashboard/Template.vue          |   1 +
 11 files changed, 223 insertions(+), 185 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 60dc388a3..6d24f142e 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -1,7 +1,11 @@
 describe('admin tests', () => {
   beforeEach(() => {
-    cy.login('administrator@trottoir.be', 'administrator')
-    cy.visit('/ronde/overzicht')
+    //cy.login('administrator@trottoir.be', 'administrator')
+    cy.visit('/')
+    cy.get('#email').type('administrator@trottoir.be')
+    cy.get('#password').type('administrator')
+    cy.get('#login').click()
+    //cy.visit('/ronde/overzicht')
   })
 
   it('add new user', () => {
@@ -18,22 +22,26 @@ describe('admin tests', () => {
     })
     cy.get('#address').then(() => {
       cy.get('#street').type('teststraat')
-      cy.get('#streetnr').type('1')
+      cy.get('#streetnr').type('{backspace}1')
       cy.get('#city').type('Teststad')
-      cy.get('#zipcode').type('1234')
+      cy.get('#zipcode').type('{backspace}1234')
     })
-    cy.get('#password').type('testwachtwoord')
-    cy.get('#repeat').type('testwachtwoord')
+    cy.get('#password').type('t3stw@chtwOord')
+    cy.get('#repeat').type('t3stw@chtwOord')
     cy.get('#roles').then(() => {
       cy.get('#student').check()
       cy.get('#superstudent').check()
       cy.get('#administrator').check()
     })
     cy.get('#create').click()
-    cy.get('#submit').click()
+    // confirm
+    // cy.get('#submit').click()
+    // we are now at the new user page
+    cy.contains('test naam')
+    cy.contains('Persoonlijke gegevens')
     // check if user in userlist
+    cy.get('#users').click()
     cy.contains('test naam')
-    // click on user and check if all fields are ok? or is this more for backend testing?
   })
 
   it('edit a user', () => {
@@ -51,8 +59,6 @@ describe('admin tests', () => {
     cy.get('#roles').then(() => {
       cy.get('#administrator').uncheck()
     })
-    cy.get('#password').type('nieuwwachtwoord')
-    cy.get('#repeat').type('nieuwwachtwoord')
     // save
     cy.get('#save').click()
     // confirm
@@ -68,18 +74,27 @@ describe('admin tests', () => {
     // click user
     cy.contains('nieuwe gebruiker').click()
     // press edit button
-    cy.get('#edit').click()
+    cy.get('#editcancel').click()
     // press delete
     cy.get('#delete').click()
     // press confirm
     cy.get('#submit').click()
+    cy.contains('Deze account is verwijderd')
     // user should not be present in the table
-    // cy.get('#users').click()
+    cy.get('#users').click()
     cy.contains('nieuwe gebruiker').should('not.exist')
   })
 
   it('restore deleted user', () => {
-
+    // go to user overview
+    cy.get('#users').click()
+    // see hidden users
+    cy.get('#hidden').check()
+    // click user
+    cy.contains('nieuwe gebruiker').click()
+    cy.get('#restore').click()
+    // messaeg saying user is deleted should be gone
+    cy.contains('Deze account is verwijderd').should('not.exist')
   })
 
   it('check the profitability statistics', () => {
@@ -188,10 +203,22 @@ describe('admin tests', () => {
   })
 
   it('add new template', () => {
-
+    // go to template list
+    cy.get('#templates').click()
+    // click add button
+    cy.get('#addtemplate').click()
+    // fill in the fields
+    cy.get('#templatename').type('test template')
+    cy.get('#subject').type('test the templates')
+    cy.get('#templatebody').type('This is a test template and should not be used for real emails/messages!')
+    // save
+    cy.get('#savetemplate').click()
+    // check if template is in the list
+    cy.get('#templates').click()
+    cy.contains('test template')
   })
 
-  it('edit template', () => {
+  it.only('edit template', () => {
 
   })
 
diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index ca7f09664..2a51d55b1 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -1,25 +1,26 @@
 describe('login tests', () => {
   beforeEach(() => {
+    // in these test, saved sessions should be cleared
+    // otherwise it always restores the first login
+    //Cypress.session.clearAllSavedSessions()
+    //cy.clearCookies()
+    //cy.clearLocalStorage()
+    //cy.clearAllSessionStorage({log: true})
     cy.visit('/')
   })
 
-  it('log in succesfull', () =>{
-    cy.login('administrator@trottoir.be', 'administrator')
-  })
-
-  it('log out', () =>{
-    // in these test, saved sessions should be cleared
-    // otherwise it always restores the first login
-    Cypress.session.clearAllSavedSessions()
-    // there is a check in the login function to see if it passed
-    cy.login('administrator@trottoir.be', 'administrator')
+  it.only('log in and out succesfull', () =>{
+    //cy.login('administrator@trottoir.be', 'administrator')
+    //cy.visit('/account')
+    cy.get('#email').type('administrator@trottoir.be')
+    cy.get('#password').type('administrator')
+    cy.get('#login').click()
     cy.get('#logout').click()
     // we should be back at the log in
     cy.get('#login')
   })
 
   it('log in failed: incorrect password', () =>{
-    Cypress.session.clearAllSavedSessions()
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('incorrectpassword')
     cy.get('#login').click()
@@ -28,7 +29,6 @@ describe('login tests', () => {
   })
 
   it('log in failed: incorrect email', () =>{
-    Cypress.session.clearAllSavedSessions()
     cy.get('#email').type('administrator@trotwaar.be')
     cy.get('#password').type('administrator')
     cy.get('#login').click()
@@ -37,7 +37,6 @@ describe('login tests', () => {
   })
 
   it('ask login data', () => {
-    Cypress.session.clearAllSavedSessions()
     cy.get('#contact').click()
     cy.get('#popup').should('be.visible')
   })
diff --git a/web/cypress/support/commands.ts b/web/cypress/support/commands.ts
index 6fcd198c5..1f58e50f9 100644
--- a/web/cypress/support/commands.ts
+++ b/web/cypress/support/commands.ts
@@ -53,7 +53,6 @@ Cypress.Commands.add('login' as any, (email: string, password:string) => {
     cy.get('#email').type(email)
     cy.get('#password').type(password)
     cy.get('#login').click()
-    cy.get('#logout').should('be.visible')
   },
     {
       cacheAcrossSpecs: true
diff --git a/web/package-lock.json b/web/package-lock.json
index 38b253634..fc5c22517 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -32,6 +32,7 @@
         "@types/webfontloader": "^1.6.35",
         "@vitejs/plugin-vue": "^3.0.3",
         "@vue/eslint-config-typescript": "^11.0.0",
+        "cypress": "^12.12.0",
         "dotenv": "^16.0.3",
         "eslint": "^8.22.0",
         "eslint-plugin-vue": "^9.3.0",
@@ -44,7 +45,6 @@
       "optionalDependencies": {
         "@cypress/code-coverage": "^3.10.4",
         "@types/jest": "^29.5.1",
-        "cypress": "^12.12.0",
         "jest": "^29.0.0",
         "ts-jest": "^29.1.0"
       }
@@ -6215,8 +6215,8 @@
     },
     "node_modules/@cypress/request": {
       "version": "2.88.11",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -6264,8 +6264,8 @@
     },
     "node_modules/@cypress/xvfb": {
       "version": "1.2.4",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "debug": "^3.1.0",
         "lodash.once": "^4.1.1"
@@ -6273,8 +6273,8 @@
     },
     "node_modules/@cypress/xvfb/node_modules/debug": {
       "version": "3.2.7",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
@@ -7374,13 +7374,13 @@
     },
     "node_modules/@types/sinonjs__fake-timers": {
       "version": "8.1.1",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@types/sizzle": {
       "version": "2.3.3",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.1",
@@ -8018,8 +8018,8 @@
     },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -8093,16 +8093,16 @@
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -8115,8 +8115,8 @@
     },
     "node_modules/ansi-escapes/node_modules/type-fest": {
       "version": "0.21.3",
+      "devOptional": true,
       "license": "(MIT OR CC0-1.0)",
-      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -8170,6 +8170,7 @@
     },
     "node_modules/arch": {
       "version": "2.2.0",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -8184,8 +8185,7 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/archy": {
       "version": "1.0.0",
@@ -8219,24 +8219,24 @@
     },
     "node_modules/asn1": {
       "version": "0.2.6",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
     "node_modules/assert-plus": {
       "version": "1.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.8"
       }
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -8248,8 +8248,8 @@
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
@@ -8272,16 +8272,16 @@
     },
     "node_modules/aws-sign2": {
       "version": "0.7.0",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/aws4": {
       "version": "1.12.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/babel-loader": {
       "version": "9.1.2",
@@ -8388,6 +8388,7 @@
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -8402,13 +8403,12 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
+      "devOptional": true,
       "license": "BSD-3-Clause",
-      "optional": true,
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -8422,13 +8422,13 @@
     },
     "node_modules/blob-util": {
       "version": "2.0.2",
-      "license": "Apache-2.0",
-      "optional": true
+      "devOptional": true,
+      "license": "Apache-2.0"
     },
     "node_modules/bluebird": {
       "version": "3.7.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
@@ -8502,6 +8502,7 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -8517,7 +8518,6 @@
         }
       ],
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -8525,8 +8525,8 @@
     },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": "*"
       }
@@ -8549,8 +8549,8 @@
     },
     "node_modules/cachedir": {
       "version": "2.3.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -8618,8 +8618,8 @@
     },
     "node_modules/caseless": {
       "version": "0.12.0",
-      "license": "Apache-2.0",
-      "optional": true
+      "devOptional": true,
+      "license": "Apache-2.0"
     },
     "node_modules/chalk": {
       "version": "4.1.2",
@@ -8650,8 +8650,8 @@
     },
     "node_modules/check-more-types": {
       "version": "2.24.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -8721,16 +8721,16 @@
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/cli-cursor": {
       "version": "3.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -8740,8 +8740,8 @@
     },
     "node_modules/cli-table3": {
       "version": "0.6.3",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "string-width": "^4.2.0"
       },
@@ -8754,8 +8754,8 @@
     },
     "node_modules/cli-truncate": {
       "version": "2.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -8822,13 +8822,13 @@
     },
     "node_modules/colorette": {
       "version": "2.0.19",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -8878,8 +8878,8 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
@@ -8919,9 +8919,10 @@
     },
     "node_modules/cypress": {
       "version": "12.12.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.12.0.tgz",
+      "integrity": "sha512-UU5wFQ7SMVCR/hyKok/KmzG6fpZgBHHfrXcHzDmPHWrT+UUetxFzQgt7cxCszlwfozckzwkd22dxMwl/vNkWRw==",
+      "devOptional": true,
       "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
       "dependencies": {
         "@cypress/request": "^2.88.10",
         "@cypress/xvfb": "^1.2.4",
@@ -8975,21 +8976,21 @@
     },
     "node_modules/cypress/node_modules/@types/node": {
       "version": "14.18.42",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/cypress/node_modules/commander": {
       "version": "6.2.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9002,8 +9003,8 @@
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -9013,8 +9014,8 @@
     },
     "node_modules/dayjs": {
       "version": "1.11.7",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/de-indent": {
       "version": "1.0.2",
@@ -9094,8 +9095,8 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -9140,8 +9141,8 @@
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -9179,13 +9180,13 @@
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -9205,8 +9206,8 @@
     },
     "node_modules/enquirer": {
       "version": "2.3.6",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-colors": "^4.1.1"
       },
@@ -9592,8 +9593,8 @@
     },
     "node_modules/eventemitter2": {
       "version": "6.4.7",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/events": {
       "version": "3.3.0",
@@ -9606,8 +9607,8 @@
     },
     "node_modules/execa": {
       "version": "4.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -9628,16 +9629,16 @@
     },
     "node_modules/execa/node_modules/human-signals": {
       "version": "1.1.1",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": ">=8.12.0"
       }
     },
     "node_modules/executable": {
       "version": "4.1.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "pify": "^2.2.0"
       },
@@ -9713,13 +9714,13 @@
     },
     "node_modules/extend": {
       "version": "3.0.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/extract-zip": {
       "version": "2.0.1",
+      "devOptional": true,
       "license": "BSD-2-Clause",
-      "optional": true,
       "dependencies": {
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
@@ -9737,11 +9738,11 @@
     },
     "node_modules/extsprintf": {
       "version": "1.3.0",
+      "devOptional": true,
       "engines": [
         "node >=0.6.0"
       ],
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -9802,16 +9803,16 @@
     },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "pend": "~1.2.0"
       }
     },
     "node_modules/figures": {
       "version": "3.2.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -9824,8 +9825,8 @@
     },
     "node_modules/figures/node_modules/escape-string-regexp": {
       "version": "1.0.5",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -9948,16 +9949,16 @@
     },
     "node_modules/forever-agent": {
       "version": "0.6.1",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/form-data": {
       "version": "2.3.3",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -10079,8 +10080,8 @@
     },
     "node_modules/get-stream": {
       "version": "5.2.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -10108,16 +10109,16 @@
     },
     "node_modules/getos": {
       "version": "3.2.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "async": "^3.2.0"
       }
     },
     "node_modules/getpass": {
       "version": "0.1.7",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -10160,8 +10161,8 @@
     },
     "node_modules/global-dirs": {
       "version": "3.0.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ini": "2.0.0"
       },
@@ -10352,8 +10353,8 @@
     },
     "node_modules/http-signature": {
       "version": "1.3.6",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^2.0.2",
@@ -10378,6 +10379,7 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -10392,8 +10394,7 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
       "version": "5.2.4",
@@ -10450,8 +10451,8 @@
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -10472,8 +10473,8 @@
     },
     "node_modules/ini": {
       "version": "2.0.0",
+      "devOptional": true,
       "license": "ISC",
-      "optional": true,
       "engines": {
         "node": ">=10"
       }
@@ -10558,8 +10559,8 @@
     },
     "node_modules/is-ci": {
       "version": "3.0.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ci-info": "^3.2.0"
       },
@@ -10601,8 +10602,8 @@
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -10627,8 +10628,8 @@
     },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "global-dirs": "^3.0.0",
         "is-path-inside": "^3.0.2"
@@ -10786,13 +10787,13 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -10826,8 +10827,8 @@
     },
     "node_modules/isstream": {
       "version": "0.1.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
@@ -12151,8 +12152,8 @@
     },
     "node_modules/jsbn": {
       "version": "0.1.1",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
@@ -12187,8 +12188,8 @@
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
-      "license": "ISC",
-      "optional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -12222,11 +12223,11 @@
     },
     "node_modules/jsprim": {
       "version": "2.0.2",
+      "devOptional": true,
       "engines": [
         "node >=0.6.0"
       ],
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -12244,8 +12245,8 @@
     },
     "node_modules/lazy-ass": {
       "version": "1.6.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": "> 0.8"
       }
@@ -12281,8 +12282,8 @@
     },
     "node_modules/listr2": {
       "version": "3.14.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.16",
@@ -12355,8 +12356,8 @@
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
@@ -12365,8 +12366,8 @@
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
@@ -12380,8 +12381,8 @@
     },
     "node_modules/log-update": {
       "version": "4.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -12397,8 +12398,8 @@
     },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "4.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -12413,8 +12414,8 @@
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12504,16 +12505,16 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -12523,8 +12524,8 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -12542,8 +12543,8 @@
     },
     "node_modules/minimist": {
       "version": "1.2.8",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -12614,8 +12615,8 @@
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -12806,8 +12807,8 @@
     },
     "node_modules/onetime": {
       "version": "5.1.2",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -12836,8 +12837,8 @@
     },
     "node_modules/ospath": {
       "version": "1.2.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
@@ -12869,8 +12870,8 @@
     },
     "node_modules/p-map": {
       "version": "4.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -12970,13 +12971,13 @@
     },
     "node_modules/pend": {
       "version": "1.2.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -12994,8 +12995,8 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13230,18 +13231,18 @@
     },
     "node_modules/proxy-from-env": {
       "version": "1.0.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/psl": {
       "version": "1.9.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/pump": {
       "version": "3.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -13272,8 +13273,8 @@
     },
     "node_modules/qs": {
       "version": "6.10.4",
+      "devOptional": true,
       "license": "BSD-3-Clause",
-      "optional": true,
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -13429,8 +13430,8 @@
     },
     "node_modules/request-progress": {
       "version": "3.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "throttleit": "^1.0.0"
       }
@@ -13509,8 +13510,8 @@
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -13530,8 +13531,8 @@
     },
     "node_modules/rfdc": {
       "version": "1.3.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
@@ -13624,16 +13625,16 @@
     },
     "node_modules/rxjs": {
       "version": "7.8.0",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/rxjs/node_modules/tslib": {
       "version": "2.5.0",
-      "license": "0BSD",
-      "optional": true
+      "devOptional": true,
+      "license": "0BSD"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -13669,8 +13670,8 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/sass": {
       "version": "1.58.3",
@@ -13802,8 +13803,8 @@
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "license": "ISC",
-      "optional": true
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
@@ -13820,8 +13821,8 @@
     },
     "node_modules/slice-ansi": {
       "version": "3.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -13881,8 +13882,8 @@
     },
     "node_modules/sshpk": {
       "version": "1.17.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -13936,8 +13937,8 @@
     },
     "node_modules/string-width": {
       "version": "4.2.3",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -14049,8 +14050,8 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -14231,18 +14232,18 @@
     },
     "node_modules/throttleit": {
       "version": "1.0.0",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/through": {
       "version": "2.3.8",
-      "license": "MIT",
-      "optional": true
+      "devOptional": true,
+      "license": "MIT"
     },
     "node_modules/tmp": {
       "version": "0.2.1",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "rimraf": "^3.0.0"
       },
@@ -14275,8 +14276,8 @@
     },
     "node_modules/tough-cookie": {
       "version": "2.5.0",
+      "devOptional": true,
       "license": "BSD-3-Clause",
-      "optional": true,
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -14356,8 +14357,8 @@
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
+      "devOptional": true,
       "license": "Apache-2.0",
-      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -14367,8 +14368,8 @@
     },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
-      "license": "Unlicense",
-      "optional": true
+      "devOptional": true,
+      "license": "Unlicense"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
@@ -14504,8 +14505,8 @@
     },
     "node_modules/untildify": {
       "version": "4.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -14559,8 +14560,8 @@
     },
     "node_modules/uuid": {
       "version": "8.3.2",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -14580,11 +14581,11 @@
     },
     "node_modules/verror": {
       "version": "1.10.0",
+      "devOptional": true,
       "engines": [
         "node >=0.6.0"
       ],
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -15269,8 +15270,8 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -15416,8 +15417,8 @@
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/web/package.json b/web/package.json
index 0d5b21434..cb7e0be18 100644
--- a/web/package.json
+++ b/web/package.json
@@ -35,6 +35,7 @@
     "@types/webfontloader": "^1.6.35",
     "@vitejs/plugin-vue": "^3.0.3",
     "@vue/eslint-config-typescript": "^11.0.0",
+    "cypress": "^12.12.0",
     "dotenv": "^16.0.3",
     "eslint": "^8.22.0",
     "eslint-plugin-vue": "^9.3.0",
@@ -47,7 +48,6 @@
   "optionalDependencies": {
     "@cypress/code-coverage": "^3.10.4",
     "@types/jest": "^29.5.1",
-    "cypress": "^12.12.0",
     "jest": "^29.0.0",
     "ts-jest": "^29.1.0"
   }
diff --git a/web/src/components/cards/RemovedCard.vue b/web/src/components/cards/RemovedCard.vue
index 7de12c466..4dc5faee9 100644
--- a/web/src/components/cards/RemovedCard.vue
+++ b/web/src/components/cards/RemovedCard.vue
@@ -2,6 +2,7 @@
   <BorderCard v-show="show" prepend-icon="mdi-alert" :title="title">
     <template v-slot:append>
       <v-btn
+        id="restore"
         color="success"
         @click="restore()"
         variant="elevated"
diff --git a/web/src/components/filter/DashBoardSearch.vue b/web/src/components/filter/DashBoardSearch.vue
index 3d133d524..e7ae2d4e7 100644
--- a/web/src/components/filter/DashBoardSearch.vue
+++ b/web/src/components/filter/DashBoardSearch.vue
@@ -9,6 +9,7 @@
       variant="underlined"
     />
     <v-checkbox
+      id="hidden"
       v-if="admin"
       class="mt-4 checkbox"
       label="Verborgen"
diff --git a/web/src/layouts/MainLayout.vue b/web/src/layouts/MainLayout.vue
index cfe1f8559..f74e5c220 100644
--- a/web/src/layouts/MainLayout.vue
+++ b/web/src/layouts/MainLayout.vue
@@ -142,6 +142,7 @@
               id="rounds"
             ></v-list-item>
             <v-list-item
+              id="templates"
               :to="{ name: 'template_overview' }"
               prepend-icon="mdi-email"
               title="Templates"
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index 5e7e87ee8..0d6b40dab 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -140,7 +140,7 @@
       prepend-icon="mdi-account-multiple"
     >
       <template v-slot:title> Rollen </template>
-      <RolesForm :readonly="!edit" v-model="roles" />
+      <RolesForm id="roles" :readonly="!edit" v-model="roles" />
     </BorderCard>
 
     <!-- Section to set new password -->
@@ -148,6 +148,7 @@
       <template v-slot:title> Nieuw wachtwoord </template>
       <v-list density="compact" class="mx-4">
         <v-text-field
+          id="password"
           v-model="password"
           :prepend-inner-icon="'mdi-lock'"
           :append-inner-icon="passwordHidden ? 'mdi-eye' : 'mdi-eye-off'"
@@ -157,6 +158,7 @@
           bg
         ></v-text-field>
         <v-text-field
+          id="repeat"
           v-model="passwordCheck"
           :prepend-inner-icon="'mdi-lock'"
           :append-inner-icon="passwordHidden ? 'mdi-eye' : 'mdi-eye-off'"
@@ -215,6 +217,7 @@
         "
       >
         <v-btn
+          id="cancel"
           prepend-icon="mdi-close"
           color="error"
           @click="showPopup = false"
@@ -224,6 +227,7 @@
           Annuleer
         </v-btn>
         <v-btn
+          id="submit"
           prepend-icon="mdi-check"
           color="success"
           @click="popupSubmit()"
diff --git a/web/src/views/contact/TemplateBuilder.vue b/web/src/views/contact/TemplateBuilder.vue
index 80e8497e3..5d91eb938 100644
--- a/web/src/views/contact/TemplateBuilder.vue
+++ b/web/src/views/contact/TemplateBuilder.vue
@@ -4,7 +4,7 @@
 
     <p>
       Maak hier een nieuwe email template aan. Aan de rechterkant vindt u codes
-      die u kan gebruiken voor uw email dynamisch in te laden wanneer u deze
+      die u kan gebruiken om uw email dynamisch in te laden wanneer u deze
       gebruikt.
     </p>
     <v-row class="py-0 my-0 mx-0">
@@ -24,6 +24,7 @@
               style="min-width: 100px; max-width: 100%"
               class="flex-grow-1 flex-shrink-0 py-0 my-0 mx-3"
               ><v-text-field
+                id="templatename"
                 v-model="templateName"
                 prepend-inner-icon="mdi-file-document-outline"
                 label="Template naam"
@@ -38,6 +39,7 @@
               class="flex-grow-1 flex-shrink-0 py-0 my-0"
             >
               <v-text-field
+                id="subject"
                 prepend-inner-icon="mdi-text-short"
                 label="Template onderwerp"
                 v-model="subject"
@@ -53,6 +55,7 @@
               class="flex-grow-1 flex-shrink-0 py-0 my-0"
             >
               <v-textarea
+                id="templatebody"
                 rows="17"
                 label="Template inhoud"
                 prepend-inner-icon="mdi-text"
@@ -61,6 +64,7 @@
             ></v-col>
           </v-row>
           <v-btn
+            id="savetemplate"
             color="primary"
             prepend-icon="mdi-content-save"
             variant="tonal"
diff --git a/web/src/views/dashboard/Template.vue b/web/src/views/dashboard/Template.vue
index abef5791c..d3ed39558 100644
--- a/web/src/views/dashboard/Template.vue
+++ b/web/src/views/dashboard/Template.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="d-flex flex-row-reverse">
     <v-btn
+      id="addtemplate"
       v-if="useAuthStore().auth?.admin"
       prepend-icon="mdi-plus"
       color="primary"

From b8931adab5b480aa901762de2411cc5ae994db6a Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 20 May 2023 22:12:46 +0200
Subject: [PATCH 23/33] test: superstudent

---
 web/cypress/e2e/navbar.cy.ts           | 10 ++++-
 web/cypress/e2e/superstudent.cy.ts     | 53 ++++++++++++++++----------
 web/cypress/support/e2e.ts             |  6 ++-
 web/src/components/round/RoundCard.vue |  4 +-
 web/src/views/round/Round.vue          |  5 +++
 web/src/views/round/RoundMaker.vue     |  1 +
 web/src/views/round/RoundPlanner.vue   |  7 ++++
 7 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/web/cypress/e2e/navbar.cy.ts b/web/cypress/e2e/navbar.cy.ts
index d126f496c..1e04cba6a 100644
--- a/web/cypress/e2e/navbar.cy.ts
+++ b/web/cypress/e2e/navbar.cy.ts
@@ -1,13 +1,19 @@
 describe('navigation bar tests', () => {
   beforeEach(() => {
-    cy.login('administrator@trottoir.be', 'password')
-    cy.visit('/planning')
+    //cy.login('administrator@trottoir.be', 'password')
+    // cy.visit('/planning')
   })
 
   it('collapse and expand', () => {
+    cy.visit('/')
+    cy.get('#email').type('administrator@trottoir.be')
+    cy.get('#password').type('administrator')
+    cy.get('#login').click()
+
     cy.get('#navbar-visible').click()
     cy.get('#logout').should('not.be.visible')
     cy.get('#navbar-visible').click()
     cy.get('#logout').should('be.visible')
+    cy.get('#logout').click()
   })
 })
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 9c0d5665b..c884f8fe0 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,8 +1,13 @@
 describe('superstudent tests', () => {
   // TODO check if select(...) works better with index
   beforeEach(() => {
-    cy.login('superstudent@trottoir.be', 'super_student')
-    cy.visit('/ronde/overzicht')
+    //cy.login('superstudent@trottoir.be', 'super_student')
+    //cy.visit('/ronde/overzicht')
+    cy.visit('/')
+    cy.get('#email').type('superstudent@trottoir.be')
+    cy.get('#password').type('super_student')
+    cy.get('#login').click()
+
   })
 
   // there is a lot of overlap for superstudents and admins,
@@ -16,11 +21,11 @@ describe('superstudent tests', () => {
     // add buildings
     cy.get('#building').first().click()
     cy.get('#building').first().click()
+    cy.get('#description').type("This is the description for the test round.")
     // save
     cy.get('#createround').click()
-    // confirm?
-    // this gives QueryError2
-    // check for popup on screen?
+    // check for popup on screen
+    cy.contains("400 - Error").should('be.visible')
   })
 
   it('create round, no buildings', () => {
@@ -30,11 +35,12 @@ describe('superstudent tests', () => {
     cy.get('#newround').click()
     // add name
     cy.get('#roundname').type("test round")
+    cy.get('#description').type("This is the description for the test round.")
     // save
     cy.get('#createround').click()
-    // confirm?
-    // this gives QueryError2
-    // check for popup on screen?
+    // check for popup on screen
+    // cy.contains("400 - Error").should('be.visible')
+    // this creates a round with 0 buildings, no error
   })
 
   it('create round succes', () => {
@@ -47,6 +53,7 @@ describe('superstudent tests', () => {
     cy.get('#building').first().click()
     // add name
     cy.get('#roundname').type("test round")
+    cy.get('#description').type("This is the description for the test round.")
     // save
     cy.get('#createround').click()
     // confirm?
@@ -66,7 +73,7 @@ describe('superstudent tests', () => {
     // go to round overview
     cy.get('#rounds').click()
     // press on the round you wish to change
-    cy.contains('Round 1').click()
+    cy.contains('test round').click()
     // press edit button
 
     // edit button currently not implemented
@@ -86,12 +93,14 @@ describe('superstudent tests', () => {
     // select plan schedule
     cy.get('#schedule').click()
     // select student and date(s)
-    cy.get('#selectstudent').select('Dirk De Student') // maybe safer with index
+    cy.get('#selectstudent').parent().click()
+    cy.contains('Dirk De Student').click()
     cy.get('.selectors').then( () => {
-      cy.get('#frequency').select('wekelijks') // maybe safer with index
-      cy.get('#startdate').type('01062023')
-      cy.get('#enddate').type('31062023')
-      cy.get('#starttime').type('1930')
+      cy.get('#frequency').parent().click()
+      cy.contains('wekelijks').click()
+      cy.get('#startdate').type('2023-05-22')
+      cy.get('#enddate').type('2023-06-30')
+      cy.get('#starttime').type('20:30')
     })
     // add
     cy.get('#addschedule').click()
@@ -109,28 +118,30 @@ describe('superstudent tests', () => {
   })
 
   it('switch student for round (for a single date)', () => {
-
+    // for now, i don't know how
   })
 
   it('delete round', () => {
     // go to round overview
     cy.get('#rounds').click()
     // press on the round you wish to delete
-    cy.contains('test round').click()
+    //cy.contains('test round').click()
+    cy.contains('delete').click()
     // press delete button
     cy.get('#deleteround').click()
-    // confirm?
+    // confirm
+    cy.get('#submit').click()
     // round should not be present in the table
     cy.contains('test round').should('not.exist')
+    cy.contains('delete').should('not.exist')
   })
 
 
-  it('observe students currently doing a round', () => {
+  it.only('observe students currently doing a round', () => {
     // make sure there is a student currently doing Round X: maybe add a test that creates this?
     // give round to student -> student starts round
-    const round: string = "Ronde 3"
-    // go to the overview page
-    cy.visit('/ronde/overzicht')
+    const round: string = "Round 2"
+    // we are at round the follup page
     // add filters
     cy.get('#filter').then(() => {
       cy.get('#showfilters').click()
diff --git a/web/cypress/support/e2e.ts b/web/cypress/support/e2e.ts
index 4f37bdaae..a7ffd7026 100644
--- a/web/cypress/support/e2e.ts
+++ b/web/cypress/support/e2e.ts
@@ -16,6 +16,10 @@
 // Import commands.js using ES2015 syntax:
 import './commands.ts'
 // import '@cypress/code-coverage/support'
-
+Cypress.on('uncaught:exception', (err, runnable) => {
+  // returning false here prevents Cypress from
+  // failing the test
+  return false
+})
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
diff --git a/web/src/components/round/RoundCard.vue b/web/src/components/round/RoundCard.vue
index 474a68a1e..485b43b4c 100644
--- a/web/src/components/round/RoundCard.vue
+++ b/web/src/components/round/RoundCard.vue
@@ -11,8 +11,8 @@
     "
   >
     <div>
-      <h3>{{ new Date(schedule?.day).toLocaleDateString() }}</h3>
-      <p>{{ schedule.user.first_name }} {{ schedule?.user.last_name }}</p>
+      <h3 id="date">{{ new Date(schedule?.day).toLocaleDateString() }}</h3>
+      <p id="student">{{ schedule.user.first_name }} {{ schedule?.user.last_name }}</p>
     </div>
     <div class="flex-grow-1"></div>
     <!-- Amount of images taken indicator -->
diff --git a/web/src/views/round/Round.vue b/web/src/views/round/Round.vue
index 936c0d853..cb9b87c44 100644
--- a/web/src/views/round/Round.vue
+++ b/web/src/views/round/Round.vue
@@ -5,6 +5,7 @@
         <h1>{{ round?.name }}</h1>
         <div class="flex-grow-1"></div>
         <v-btn
+          id="deleteround"
           class="text-none"
           prepend-icon="mdi-delete"
           @click="showRemovePopup = true"
@@ -33,6 +34,7 @@
           v-model:end-date="planningEnd"
         />
         <v-btn
+          id="schedule"
           class="text-none"
           prepend-icon="mdi-calendar"
           :to="{ name: 'round_plan', params: { id: round_id } }"
@@ -46,6 +48,7 @@
       </p>
       <div class="space-y-8">
         <RoundCard
+          id="roundcard"
           v-for="schedule in schedules"
           v-bind:key="schedule.id"
           :schedule="schedule"
@@ -91,6 +94,7 @@
     </p>
     <template v-slot:actions>
       <v-btn
+        id="cancel"
         prepend-icon="mdi-close"
         color="error"
         variant="elevated"
@@ -98,6 +102,7 @@
         >Annuleren</v-btn
       >
       <v-btn
+        id="submit"
         prepend-icon="mdi-check"
         color="success"
         variant="elevated"
diff --git a/web/src/views/round/RoundMaker.vue b/web/src/views/round/RoundMaker.vue
index dd1b8e2b1..b3da8d29e 100644
--- a/web/src/views/round/RoundMaker.vue
+++ b/web/src/views/round/RoundMaker.vue
@@ -21,6 +21,7 @@
           variant="outlined"
         />
         <v-text-field
+          id="description"
           class="ml-3 mr-5"
           label="Beschrijving"
           v-model="description"
diff --git a/web/src/views/round/RoundPlanner.vue b/web/src/views/round/RoundPlanner.vue
index 9b4f80343..43caa5da0 100644
--- a/web/src/views/round/RoundPlanner.vue
+++ b/web/src/views/round/RoundPlanner.vue
@@ -53,6 +53,7 @@
                 style="min-width: 100px; max-width: 100%"
                 class="flex-grow-1 flex-shrink-0"
                 ><v-select
+                  id="selectstudent"
                   label="Selecteer student"
                   :items="students"
                   v-model="student"
@@ -80,6 +81,7 @@
               :class="multipleday ? 'grid-cols-4' : 'grid-cols-3'"
             >
               <v-select
+                id="frequency"
                 prepend-inner-icon="mdi-replay"
                 variant="outlined"
                 label="Frequentie"
@@ -89,6 +91,7 @@
               ></v-select>
 
               <v-text-field
+                id="startdate"
                 v-model="startDate"
                 prepend-inner-icon="mdi-calendar"
                 variant="outlined"
@@ -97,6 +100,7 @@
               ></v-text-field>
 
               <v-text-field
+                id="enddate"
                 v-model="endDate"
                 prepend-inner-icon="mdi-calendar"
                 variant="outlined"
@@ -106,6 +110,7 @@
               ></v-text-field>
 
               <v-text-field
+                id="starttime"
                 prepend-inner-icon="mdi-clock-time-two-outline"
                 label="Starttijd"
                 variant="outlined"
@@ -116,6 +121,7 @@
 
             <div style="display: flex; align-items: center">
               <v-btn
+                id="addschedule"
                 prepend-icon="mdi-plus"
                 @click="calcNewRounds()"
                 :disabled="student === undefined"
@@ -124,6 +130,7 @@
               >
               <div class="flex-grow-1"></div>
               <v-btn
+                id="planschedule"
                 prepend-icon="mdi-check"
                 @click="planRounds()"
                 :disabled="rounds?.length === 0"

From 051d22682b7bd990597edea777925b3f2da06726 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 20 May 2023 22:56:25 +0200
Subject: [PATCH 24/33] test: superstudent

---
 web/cypress/e2e/administrator.cy.ts            | 2 +-
 web/cypress/e2e/superstudent.cy.ts             | 5 ++++-
 web/src/components/cards/PasswordInputCard.vue | 2 ++
 web/src/components/round/RoundDetailCard.vue   | 4 ++--
 web/src/views/round/RoundFollowup.vue          | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 6d24f142e..d56966f71 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -218,7 +218,7 @@ describe('admin tests', () => {
     cy.contains('test template')
   })
 
-  it.only('edit template', () => {
+  it('edit template', () => {
 
   })
 
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index c884f8fe0..8eed9ce1d 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -153,7 +153,10 @@ describe('superstudent tests', () => {
     cy.contains(round)
     // full name wasn't visible in the round selection, but it is once you clicked on the round
     cy.contains("Dirk De Student")
-    // gebouw cards uitklappen om opmerkingen/afbeeldingen te zien
+    // expand building cards to view comments and images
+    cy.get('#expand').click()
+    cy.get('#comments').should('be.visible')
+    cy.get('#images').should('be.visible')
   })
 
 })
diff --git a/web/src/components/cards/PasswordInputCard.vue b/web/src/components/cards/PasswordInputCard.vue
index feed7b859..903bc563c 100644
--- a/web/src/components/cards/PasswordInputCard.vue
+++ b/web/src/components/cards/PasswordInputCard.vue
@@ -62,6 +62,7 @@ const passwordRepeatRules = [
     <template v-slot:title> Wachtwoord</template>
     <v-list density="compact" :class="spacing">
       <v-text-field
+        id="password"
         class="mt-2"
         v-model="password"
         :prepend-inner-icon="'mdi-lock'"
@@ -76,6 +77,7 @@ const passwordRepeatRules = [
       ></v-text-field>
       <!-- Text input field for the password confirmation-->
       <v-text-field
+        id="repeat"
         class="mt-2"
         v-model="passwordRepeat"
         :prepend-inner-icon="'mdi-lock'"
diff --git a/web/src/components/round/RoundDetailCard.vue b/web/src/components/round/RoundDetailCard.vue
index 81f9576bf..c01c638e6 100644
--- a/web/src/components/round/RoundDetailCard.vue
+++ b/web/src/components/round/RoundDetailCard.vue
@@ -122,7 +122,7 @@
     <v-expand-transition v-on:click.stop>
       <div v-show="expanded" class="px-8 pb-8">
         <divider-layout class="mb-4" />
-        <h4 class="mb-2">Opmerkingen</h4>
+        <h4 id="comments" class="mb-2">Opmerkingen</h4>
         <p v-if="!editMode">{{ progress?.report }}</p>
         <!-- eslint-disable-next-line vue/no-mutating-props -->
         <v-text-field
@@ -163,7 +163,7 @@
         <divider-layout class="my-4" />
 
         <div>
-          <h4 class="mb-2">Afbeeldingen</h4>
+          <h4 id="images" class="mb-2">Afbeeldingen</h4>
           <div class="carousel" v-if="progress?.images.length ?? 0 > 0">
             <div
               class="carousel-item"
diff --git a/web/src/views/round/RoundFollowup.vue b/web/src/views/round/RoundFollowup.vue
index 8e103d923..ee5252c6e 100644
--- a/web/src/views/round/RoundFollowup.vue
+++ b/web/src/views/round/RoundFollowup.vue
@@ -20,6 +20,7 @@
     />
     <!-- TODO: fix comment when db ready for it-->
     <RoundCard
+      id="roundcard"
       v-for="schedule in filtered"
       :key="schedule.schedule.id"
       :filtered="schedule"

From 725d1efb4c5e24e81e0bf69cd3ccfc8896d84d2e Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sat, 20 May 2023 23:54:02 +0200
Subject: [PATCH 25/33] test: student

---
 web/cypress/e2e/administrator.cy.ts           |  2 +-
 web/cypress/e2e/student.cy.ts                 | 27 +++++++++++--------
 web/cypress/e2e/superstudent.cy.ts            |  2 +-
 web/cypress/e2e/syndicus.cy.ts                | 11 +++++---
 web/src/views/round/RoundDetail.vue           |  2 +-
 .../student/SchedulingScreenStudents.vue      |  7 ++---
 6 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index d56966f71..3c66083ea 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -136,7 +136,7 @@ describe('admin tests', () => {
     // add garbage
     cy.get('#addgarbage').click()
     cy.get('#garbage').select('REST')
-    cy.get('#action').select('buiten zetten')
+    cy.get('#action').type('buiten zetten')
     cy.get('frequency').select('wekelijks')
     // TODO: add an actual date
     cy.get('startdate').type('')
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 96be6fc17..812830f47 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -1,7 +1,11 @@
 describe('student tests', () => {
   beforeEach(() => {
-    cy.login('student@trottoir.be', 'student')
-    cy.visit('/planning')
+    // cy.login('student@trottoir.be', 'student')
+    // cy.visit('/planning')
+    cy.visit('/')
+    cy.get('#email').type('student@trottoir.be')
+    cy.get('#password').type('student')
+    cy.get('#login').click()
   })
 
 
@@ -11,9 +15,8 @@ describe('student tests', () => {
     // you can start by clicking start on the round card, or by clicking on the card and then hit start
     cy.get('#round').first().click()
     // student goes to first building,
-    cy.get('#building').first().then(()=>{
-      cy.get('#start').click()
-      // TODO
+    cy.get('#buildingcard').first().then(()=>{
+      cy.contains('start').click()
       // expand the card to add pictures and leave a comment
       cy.get('#expand').click()
       // add a comment
@@ -68,7 +71,7 @@ describe('student tests', () => {
     cy.get('#editcancel').click()
     // check if changes are undone
     cy.get('#personal').get('#phone').should('not.contain.text', '0111111111')
-    cy.get('#address').get('#street').should('not.containt.text', 'street')
+    cy.get('#address').get('#street').should('not.contain.text', 'street')
   })
 
   it('edit account, save changes', () => {
@@ -77,21 +80,23 @@ describe('student tests', () => {
     cy.get('#personal').then(() => {
       cy.get('#phone').clear()
       cy.get('#phone').type('0111111111')
-      cy.get('#email').type('{backspace}') // depends on position of cursor
+      cy.get('#email').type('{backspace}{backspace}com')
     })
     cy.get('#address').then(() => {
       cy.get('#street').clear()
       cy.get('#street').type('street')
-      cy.get('#streetnr').type('{backspace}')
+      cy.get('#streetnr').type('{backspace}1')
       cy.get('#city').type('blabla')
-      cy.get('#zipcode').type('1')
+      cy.get('#zipcode').type('{backspace}1')
     })
     cy.get('#password').type('ni3uwW@chtwoord') // password has to meet the requirements
     cy.get('#repeat').type('ni3uwW@chtwoord')
     cy.get('#save').click()
     cy.get('#submit').click()
     // check if changes are saved
-    cy.get('#personal').get('#phone').should('contain.text', '0111111111')
-    cy.get('#address').get('#street').should('containt.text', 'street')
+    // cy.get('#personal').get('#phone').should('contain.text', '0111111111')
+    cy.contains('0111111111')
+    // cy.get('#address').get('#street').should('contain.text', 'street')
+    cy.contains('street')
   })
 })
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 8eed9ce1d..79f50ccf8 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -137,7 +137,7 @@ describe('superstudent tests', () => {
   })
 
 
-  it.only('observe students currently doing a round', () => {
+  it('observe students currently doing a round', () => {
     // make sure there is a student currently doing Round X: maybe add a test that creates this?
     // give round to student -> student starts round
     const round: string = "Round 2"
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index 35ccedb6c..7b89e9841 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -1,15 +1,18 @@
 describe('syndicus tests', () => {
   beforeEach(() => {
-    cy.login('syndicus@trottoir.be', 'syndicus')
+    // cy.login('syndicus@trottoir.be', 'syndicus')
+    cy.visit('/')
+    cy.get('#email').type('syndicus@trottoir.be')
+    cy.get('#password').type('syndicus')
+    cy.get('#login').click()
 
   })
 
   it('check building', () => {
-    // syndicus checks for comments left on one of their buildings
-    cy.visit('/account/settings/4')
+    // syndicus checks on one of their buildings
     cy.get('#building').first().click()
     cy.contains('Building 1')
-    // can't change the date of Taken
+    cy.contains('Taken')
   })
 
 })
diff --git a/web/src/views/round/RoundDetail.vue b/web/src/views/round/RoundDetail.vue
index be52eeb5a..d057de916 100644
--- a/web/src/views/round/RoundDetail.vue
+++ b/web/src/views/round/RoundDetail.vue
@@ -91,7 +91,7 @@
             width="100%"
           >
             <RoundDetailCard
-              id="building"
+              id="buildingcard"
               :class="mobile ? 'shiftUnderTimeLine' : ''"
               :key="JSON.stringify(entry.progress)"
               :entry="entry"
diff --git a/web/src/views/student/SchedulingScreenStudents.vue b/web/src/views/student/SchedulingScreenStudents.vue
index f49dcbfec..25b4c750a 100644
--- a/web/src/views/student/SchedulingScreenStudents.vue
+++ b/web/src/views/student/SchedulingScreenStudents.vue
@@ -7,11 +7,11 @@
       </v-btn>
       <v-spacer />
       <h4 class="mt-4">
-        {{ mondayOfTheWeek.toLocaleDateString("nl") }} tot
+        {{ mondayOfTheWeek.toLocaleDateString() }} tot
         {{
           new Date(
             new Date(mondayOfTheWeek).setDate(mondayOfTheWeek.getDate() + 6),
-          ).toLocaleDateString("nl")
+          ).toLocaleDateString()
         }}
       </h4>
       <v-spacer />
@@ -22,7 +22,7 @@
     </div>
 
     <div v-if="!empty">
-      <div v-for="day in days" :key="day.start.toLocaleDateString('nl')">
+      <div v-for="day in days" :key="day.start.toLocaleDateString()">
         <v-card
           v-if="day.list.length > 0"
           :title="day.name"
@@ -41,6 +41,7 @@
         </v-card>
 
         <BorderCard
+          id="round"
           v-for="item in day.list"
           :key="item.schedule.id"
           class="mb-3 mx-1"

From e28ad9fd56e4210c21c6f06e1d0c00737b21ac21 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 16:34:45 +0200
Subject: [PATCH 26/33] tests: superstudent

---
 web/cypress/e2e/login.cy.ts        |  2 +-
 web/cypress/e2e/navbar.cy.ts       |  5 +--
 web/cypress/e2e/student.cy.ts      | 33 ++++++++++-----
 web/cypress/e2e/superstudent.cy.ts | 64 ++++++++++++++----------------
 4 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index 2a51d55b1..76525a65d 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -9,7 +9,7 @@ describe('login tests', () => {
     cy.visit('/')
   })
 
-  it.only('log in and out succesfull', () =>{
+  it('log in and out succesfull', () =>{
     //cy.login('administrator@trottoir.be', 'administrator')
     //cy.visit('/account')
     cy.get('#email').type('administrator@trottoir.be')
diff --git a/web/cypress/e2e/navbar.cy.ts b/web/cypress/e2e/navbar.cy.ts
index 1e04cba6a..21ace1ef1 100644
--- a/web/cypress/e2e/navbar.cy.ts
+++ b/web/cypress/e2e/navbar.cy.ts
@@ -2,14 +2,13 @@ describe('navigation bar tests', () => {
   beforeEach(() => {
     //cy.login('administrator@trottoir.be', 'password')
     // cy.visit('/planning')
-  })
-
-  it('collapse and expand', () => {
     cy.visit('/')
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('administrator')
     cy.get('#login').click()
+  })
 
+  it('collapse and expand', () => {
     cy.get('#navbar-visible').click()
     cy.get('#logout').should('not.be.visible')
     cy.get('#navbar-visible').click()
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 812830f47..8b8ed1bb6 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -2,6 +2,7 @@ describe('student tests', () => {
   beforeEach(() => {
     // cy.login('student@trottoir.be', 'student')
     // cy.visit('/planning')
+
     cy.visit('/')
     cy.get('#email').type('student@trottoir.be')
     cy.get('#password').type('student')
@@ -16,13 +17,13 @@ describe('student tests', () => {
     cy.get('#round').first().click()
     // student goes to first building,
     cy.get('#buildingcard').first().then(()=>{
-      cy.contains('start').click()
+      cy.contains('Start').click()
       // expand the card to add pictures and leave a comment
       cy.get('#expand').click()
       // add a comment
-      cy.get('#addcomment').click()
-      cy.get('#writecomment').type('This is a commen')
-      cy.get('#savecomment').click()
+      //cy.get('#addcomment').click()
+      //cy.get('#writecomment').type('This is a commen')
+      //cy.get('#savecomment').click()
       // oh no, we made a spelling error. Luckily we can edit our comment!
       cy.get('#editcomment').click()
       cy.get('#writecomment').type('t.')
@@ -50,19 +51,21 @@ describe('student tests', () => {
 
 
   it('edit account, but cancel changes', () => {
+    // there used to be a bug where changes stay after cancellation
+    // this test checks if that bug is gone
     cy.get('#account').click()
     cy.get('#editcancel').click()
     cy.get('#personal').then(() => {
       cy.get('#phone').clear()
       cy.get('#phone').type('0111111111')
-      cy.get('#email').type('{backspace}') // depends on position of cursor
+      cy.get('#email').type('{backspace}{backspace}com')
     })
     cy.get('#address').then(() => {
       cy.get('#street').clear()
       cy.get('#street').type('street')
-      cy.get('#streetnr').type('{backspace}')
+      cy.get('#streetnr').type('{backspace}1')
       cy.get('#city').type('blabla')
-      cy.get('#zipcode').type('1')
+      cy.get('#zipcode').type('{backspace}1')
     })
     cy.get('#save').click()
     // there is now a popup to confirm or cancel
@@ -74,12 +77,12 @@ describe('student tests', () => {
     cy.get('#address').get('#street').should('not.contain.text', 'street')
   })
 
-  it('edit account, save changes', () => {
+  it.only('edit account, save changes', () => {
     cy.get('#account').click()
     cy.get('#editcancel').click()
     cy.get('#personal').then(() => {
       cy.get('#phone').clear()
-      cy.get('#phone').type('0111111111')
+      cy.get('#phone').type('0123456789')
       cy.get('#email').type('{backspace}{backspace}com')
     })
     cy.get('#address').then(() => {
@@ -94,9 +97,17 @@ describe('student tests', () => {
     cy.get('#save').click()
     cy.get('#submit').click()
     // check if changes are saved
-    // cy.get('#personal').get('#phone').should('contain.text', '0111111111')
+    cy.get('#personal').get('#phone').should('contain.text', '0111111111')
     cy.contains('0111111111')
-    // cy.get('#address').get('#street').should('contain.text', 'street')
+    cy.get('#address').get('#street').should('contain.text', 'street')
     cy.contains('street')
+
+    // test if password is changed
+    cy.get('#logout').click()
+    cy.get('#email').type('student@trottoir.com')
+    cy.get('#password').type('ni3uwW@chtwoord')
+    cy.get('#login').click()
+    // we should be logged back in and see the logout button
+    cy.get('#logout').should('be.visible')
   })
 })
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 79f50ccf8..fa5bf705f 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,5 +1,4 @@
 describe('superstudent tests', () => {
-  // TODO check if select(...) works better with index
   beforeEach(() => {
     //cy.login('superstudent@trottoir.be', 'super_student')
     //cy.visit('/ronde/overzicht')
@@ -22,10 +21,8 @@ describe('superstudent tests', () => {
     cy.get('#building').first().click()
     cy.get('#building').first().click()
     cy.get('#description').type("This is the description for the test round.")
-    // save
-    cy.get('#createround').click()
-    // check for popup on screen
-    cy.contains("400 - Error").should('be.visible')
+    // can't click save
+    cy.get('#createround').should('be.disabled')
   })
 
   it('create round, no buildings', () => {
@@ -36,11 +33,8 @@ describe('superstudent tests', () => {
     // add name
     cy.get('#roundname').type("test round")
     cy.get('#description').type("This is the description for the test round.")
-    // save
-    cy.get('#createround').click()
-    // check for popup on screen
-    // cy.contains("400 - Error").should('be.visible')
-    // this creates a round with 0 buildings, no error
+    // can't click save
+    cy.get('#createround').should('be.disabled')
   })
 
   it('create round succes', () => {
@@ -67,24 +61,6 @@ describe('superstudent tests', () => {
     cy.contains("test round")
   })
 
-  it('edit round', () => {
-    // also add tests where try to edit round with incorrect data?
-
-    // go to round overview
-    cy.get('#rounds').click()
-    // press on the round you wish to change
-    cy.contains('test round').click()
-    // press edit button
-
-    // edit button currently not implemented
-
-    // add/delete buildings
-    // edit name
-    // save
-    // confirm?
-    // check if correct buildings and name are present
-  })
-
   it('give a round to a student', () => {
     // go to round overview
     cy.get('#rounds').click()
@@ -111,29 +87,49 @@ describe('superstudent tests', () => {
     cy.get('#rounds').click()
     cy.contains('test round').click()
     // this will work if the last added schedule is the first one in the list
-    cy.get('#buildingcard').first().then(() => {
-      cy.get('#date').contains(new Date("2023-06-01").toLocaleDateString())
+    cy.get('#roundcard').first().then(() => {
+      cy.get('#date').contains(new Date("2023-05-22").toLocaleDateString())
       cy.get('#student').contains("Dirk De Student")
     })
   })
 
   it('switch student for round (for a single date)', () => {
-    // for now, i don't know how
+    // go to round overview
+    cy.get('#rounds').click()
+    // select round
+    cy.contains('test round').click()
+    // select plan schedule
+    cy.get('#schedule').click()
+    // go to the already planned tasks
+    cy.contains('Voorlopig schema').click()
+    // remove scheduled round
+    cy.get('#remove').click()
+    // add new one
+    cy.contains('Ronde inplannen').click()
+    cy.get('#selectstudent').parent().click()
+    cy.contains('Dirk De Student').click()
+    cy.get('.selectors').then( () => {
+      // frequency 'enkel' is standard
+      cy.get('#startdate').type('2023-05-22')
+      cy.get('#starttime').type('20:30')
+    })
+    // add
+    cy.get('#addschedule').click()
+    // save
+    cy.get('#planschedule').click()
   })
 
   it('delete round', () => {
     // go to round overview
     cy.get('#rounds').click()
     // press on the round you wish to delete
-    //cy.contains('test round').click()
-    cy.contains('delete').click()
+    cy.contains('test round').click()
     // press delete button
     cy.get('#deleteround').click()
     // confirm
     cy.get('#submit').click()
     // round should not be present in the table
     cy.contains('test round').should('not.exist')
-    cy.contains('delete').should('not.exist')
   })
 
 

From 51d1563b6ed9eff544fe757d0f8f907307ddb525 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 17:57:27 +0200
Subject: [PATCH 27/33] test: admin

---
 web/cypress/e2e/administrator.cy.ts           | 66 ++++++++++++++++---
 web/cypress/e2e/syndicus.cy.ts                |  1 +
 .../components/cards/BuildingAnalyticCard.vue |  1 +
 web/src/components/cards/UserAnalyticCard.vue |  1 +
 web/src/views/account/AccountSettings.vue     |  1 +
 web/src/views/building/BuildingScreen.vue     |  1 +
 web/src/views/building/GarbageMaker.vue       |  9 ++-
 7 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 3c66083ea..9e17b90ab 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -97,8 +97,28 @@ describe('admin tests', () => {
     cy.contains('Deze account is verwijderd').should('not.exist')
   })
 
-  it('check the profitability statistics', () => {
-    // not yet implemented
+  it('check the profitability statistics user', () => {
+    // go to user overview
+    cy.get('#users').click()
+    // click user
+    cy.contains('nieuwe gebruiker').click()
+    // check if stats are present
+    cy.contains('Prestaties').should('be.visible')
+    cy.contains('Bekijk het aantal gepresteerde uren per maand.').should('be.visible')
+    cy.get('#year').should('have.value', 2023)
+  })
+
+  it('check the profitability statistics building', () => {
+    // go to building overview
+    cy.get('#buildings').click()
+    // click building
+    cy.contains('Building 1').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
+    // check if stats are present
+    cy.contains('Prestaties').should('be.visible')
+    cy.contains('Bekijk het aantal gepresteerde uren per maand.').should('be.visible')
+    cy.get('#year').should('have.value', 2023)
   })
 
   it('add building', () => {
@@ -133,25 +153,32 @@ describe('admin tests', () => {
     cy.get('#buildings').click()
     // select building
     cy.contains('Building 1').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
     // add garbage
     cy.get('#addgarbage').click()
-    cy.get('#garbage').select('REST')
     cy.get('#action').type('buiten zetten')
-    cy.get('frequency').select('wekelijks')
+    cy.get('#frequency').parent().click()
+    cy.contains('wekelijks').click()
     // TODO: add an actual date
-    cy.get('startdate').type('')
-    cy.get('#enddate').type('')
-    cy.get('time').type('2000')
+    cy.get('#startdate').type('2023-05-22')
+    cy.get('#enddate').type('2023-06-22')
+    cy.get('#starttime').type('20:00')
     cy.get('#addtoschedule').click()
     cy.get('#schedule').click()
     // check if schedule is added
     cy.get('#buildings').click()
     cy.contains('Building 1').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
+    cy.contains('buiten zetten')
     // onder Taken bij het gebouw, of nee toch niet, dus waar kan je dit zien? wss zo bij het aanmaken van een ronde
   })
 
   it('edit garbage schedule of a building', () => {
     cy.get('#buildings').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
     // select building
     cy.contains('test building').click()
     //edit garbage
@@ -159,6 +186,8 @@ describe('admin tests', () => {
 
   it('delete garbage schedule of a building', () => {
     cy.get('#buildings').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
     // select building
     cy.contains('test building').click()
     // delete garbage
@@ -168,6 +197,8 @@ describe('admin tests', () => {
     cy.get('#buildings').click()
     // press building from buildings overview
     cy.contains('test building').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
     // press edit button
     cy.contains('#edit').click()
     // alter building data
@@ -196,7 +227,9 @@ describe('admin tests', () => {
 
   it('delete building', () => {
     cy.contains('test building').click()
-    cy.get('#edit').click()
+    // it can take a while to load all the schedules
+    cy.wait(10000)
+    cy.get('#delete').click()
     // deletion not yet implemented
     // delete
     // confirm?
@@ -219,11 +252,24 @@ describe('admin tests', () => {
   })
 
   it('edit template', () => {
+    cy.get('#templates').click()
+    cy.get(':nth-child(4) > :nth-child(2) > .v-btn').click()
+    cy.get('#templatename').clear()
+    cy.get('#templatename').type('new template')
+    cy.get('#subject').type('.')
+    cy.get('#templatebody').type('Delete this template.')
+    // save
+    cy.get('#savetemplate').click()
+    // check if template is in the list
+    cy.get('#templates').click()
+    cy.contains('new template')
 
   })
 
-  it('delete templete', () => {
-
+  it.only('delete templete', () => {
+    cy.get('#templates').click()
+    cy.get(':nth-child(4) > :nth-child(3) > .v-btn').click()
+    cy.contains('new template').should('not.exist')
   })
 
 })
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index 7b89e9841..e5e4dc16b 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -13,6 +13,7 @@ describe('syndicus tests', () => {
     cy.get('#building').first().click()
     cy.contains('Building 1')
     cy.contains('Taken')
+    cy.contains('ID')
   })
 
 })
diff --git a/web/src/components/cards/BuildingAnalyticCard.vue b/web/src/components/cards/BuildingAnalyticCard.vue
index b0e67bf2e..272afe209 100644
--- a/web/src/components/cards/BuildingAnalyticCard.vue
+++ b/web/src/components/cards/BuildingAnalyticCard.vue
@@ -7,6 +7,7 @@
       </div>
       <div class="flex-grow-1"></div>
       <input
+        id="year"
         type="number"
         min="2020"
         max="2120"
diff --git a/web/src/components/cards/UserAnalyticCard.vue b/web/src/components/cards/UserAnalyticCard.vue
index 405b64f83..c00e94648 100644
--- a/web/src/components/cards/UserAnalyticCard.vue
+++ b/web/src/components/cards/UserAnalyticCard.vue
@@ -7,6 +7,7 @@
       </div>
       <div class="flex-grow-1"></div>
       <input
+        id="year"
         type="number"
         min="2020"
         max="2120"
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index cdb41a49e..49167d0df 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -66,6 +66,7 @@
       "
     />
     <UserAnalyticCard
+      id="useranalytics"
       v-if="
         !edit &&
         (useAuthStore().auth?.admin || useAuthStore().auth?.super_student) &&
diff --git a/web/src/views/building/BuildingScreen.vue b/web/src/views/building/BuildingScreen.vue
index c331bba58..b289298f0 100644
--- a/web/src/views/building/BuildingScreen.vue
+++ b/web/src/views/building/BuildingScreen.vue
@@ -138,6 +138,7 @@
               @update:start-date="getTasks()"
             />
             <SimpleButton
+              id="addgarbage"
               v-show="noStudent && !building.deleted"
               class="mx-1 text-none"
               prepend-icon="mdi-plus"
diff --git a/web/src/views/building/GarbageMaker.vue b/web/src/views/building/GarbageMaker.vue
index c2ee2bab4..c841a5bb3 100644
--- a/web/src/views/building/GarbageMaker.vue
+++ b/web/src/views/building/GarbageMaker.vue
@@ -55,6 +55,7 @@
                 class="flex-grow-1 flex-shrink-0"
               >
                 <v-text-field
+                  id="action"
                   v-model="actionDescription"
                   label="Beschrijving van de actie"
               /></v-col>
@@ -64,6 +65,7 @@
                 class="flex-grow-1 flex-shrink-0"
               >
                 <v-select
+                  id="frequency"
                   v-model="frequency"
                   :items="frequenties"
                   label="Frequentie"
@@ -75,6 +77,7 @@
               :class="frequency !== 'enkel' ? 'grid-cols-3' : 'grid-cols-2'"
             >
               <v-text-field
+                id="startdate"
                 v-model="startDate"
                 variant="outlined"
                 type="date"
@@ -83,6 +86,7 @@
               ></v-text-field>
 
               <v-text-field
+                id="enddate"
                 v-model="endDate"
                 variant="outlined"
                 type="date"
@@ -92,6 +96,7 @@
               ></v-text-field>
 
               <v-text-field
+                id="starttime"
                 label="Starttijd"
                 variant="outlined"
                 type="time"
@@ -100,11 +105,12 @@
             </div>
 
             <div class="d-flex">
-              <v-btn prepend-icon="mdi-delete" variant="tonal" @click="clearAll"
+              <v-btn id="removeall" prepend-icon="mdi-delete" variant="tonal" @click="clearAll"
                 >Alles verwijderen</v-btn
               >
               <v-spacer></v-spacer>
               <v-btn
+                id="addtoschedule"
                 prepend-icon="mdi-plus-circle"
                 @click="add"
                 variant="tonal"
@@ -112,6 +118,7 @@
                 >Tijdelijk toevoegen</v-btn
               ><v-spacer></v-spacer>
               <v-btn
+                id="schedule"
                 prepend-icon="mdi-check"
                 variant="tonal"
                 @click="submit"

From 544e7869ebd988b7206ecde32eac67c0e6d90de1 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 20:27:32 +0200
Subject: [PATCH 28/33] test: administrator garbage schedule

---
 web/cypress/e2e/administrator.cy.ts | 23 +++++++++--------------
 web/cypress/e2e/login.cy.ts         |  8 --------
 web/cypress/e2e/navbar.cy.ts        |  2 --
 web/cypress/e2e/student.cy.ts       |  9 +++------
 web/cypress/e2e/superstudent.cy.ts  |  4 +---
 web/cypress/e2e/syndicus.cy.ts      |  1 -
 web/cypress/support/commands.ts     | 14 --------------
 7 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index 9e17b90ab..f70c9a99f 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -1,11 +1,9 @@
 describe('admin tests', () => {
   beforeEach(() => {
-    //cy.login('administrator@trottoir.be', 'administrator')
     cy.visit('/')
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('administrator')
     cy.get('#login').click()
-    //cy.visit('/ronde/overzicht')
   })
 
   it('add new user', () => {
@@ -175,23 +173,21 @@ describe('admin tests', () => {
     // onder Taken bij het gebouw, of nee toch niet, dus waar kan je dit zien? wss zo bij het aanmaken van een ronde
   })
 
-  it('edit garbage schedule of a building', () => {
+  it('delete garbage schedule of a building', () => {
     cy.get('#buildings').click()
     // it can take a while to load all the schedules
     cy.wait(10000)
     // select building
     cy.contains('test building').click()
+    cy.get('#addgarbage').click()
+    cy.contains('Voorlopig schema').click()
+    // remove first task
+    cy.get('#remove').click()
     //edit garbage
   })
 
-  it('delete garbage schedule of a building', () => {
-    cy.get('#buildings').click()
-    // it can take a while to load all the schedules
-    cy.wait(10000)
-    // select building
-    cy.contains('test building').click()
-    // delete garbage
-  })
+  // editing garbage schedule is just deleting the old one and creating a new one,
+  // so no need to test add and delete again
 
   it('edit building', () => {
     cy.get('#buildings').click()
@@ -214,13 +210,14 @@ describe('admin tests', () => {
       cy.get('#city').clear().type("city")
       cy.get('#zipcode').clear().type("1000")
     })
+    // TODO: edit manual and pictures
     cy.get('#submit').click()
     // save
     // we should be on the info page of the building
     cy.contains('test gebouw')
     cy.contains('Taken')
     cy.contains('Bezoeken')
-    // cy.contains('4321') ivago id not shown
+    // cy.contains('4321')
     // cy.contains('name of syndicus')
     // maybe click on the 'kaarten' button to see if address was added correctly
   })
@@ -230,9 +227,7 @@ describe('admin tests', () => {
     // it can take a while to load all the schedules
     cy.wait(10000)
     cy.get('#delete').click()
-    // deletion not yet implemented
     // delete
-    // confirm?
   })
 
   it('add new template', () => {
diff --git a/web/cypress/e2e/login.cy.ts b/web/cypress/e2e/login.cy.ts
index 76525a65d..48557daae 100644
--- a/web/cypress/e2e/login.cy.ts
+++ b/web/cypress/e2e/login.cy.ts
@@ -1,17 +1,9 @@
 describe('login tests', () => {
   beforeEach(() => {
-    // in these test, saved sessions should be cleared
-    // otherwise it always restores the first login
-    //Cypress.session.clearAllSavedSessions()
-    //cy.clearCookies()
-    //cy.clearLocalStorage()
-    //cy.clearAllSessionStorage({log: true})
     cy.visit('/')
   })
 
   it('log in and out succesfull', () =>{
-    //cy.login('administrator@trottoir.be', 'administrator')
-    //cy.visit('/account')
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('administrator')
     cy.get('#login').click()
diff --git a/web/cypress/e2e/navbar.cy.ts b/web/cypress/e2e/navbar.cy.ts
index 21ace1ef1..5dd05ebeb 100644
--- a/web/cypress/e2e/navbar.cy.ts
+++ b/web/cypress/e2e/navbar.cy.ts
@@ -1,7 +1,5 @@
 describe('navigation bar tests', () => {
   beforeEach(() => {
-    //cy.login('administrator@trottoir.be', 'password')
-    // cy.visit('/planning')
     cy.visit('/')
     cy.get('#email').type('administrator@trottoir.be')
     cy.get('#password').type('administrator')
diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 8b8ed1bb6..0d2deab1e 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -1,8 +1,5 @@
 describe('student tests', () => {
   beforeEach(() => {
-    // cy.login('student@trottoir.be', 'student')
-    // cy.visit('/planning')
-
     cy.visit('/')
     cy.get('#email').type('student@trottoir.be')
     cy.get('#password').type('student')
@@ -21,9 +18,9 @@ describe('student tests', () => {
       // expand the card to add pictures and leave a comment
       cy.get('#expand').click()
       // add a comment
-      //cy.get('#addcomment').click()
-      //cy.get('#writecomment').type('This is a commen')
-      //cy.get('#savecomment').click()
+      cy.get('#addcomment').click()
+      cy.get('#writecomment').type('This is a commen')
+      cy.get('#savecomment').click()
       // oh no, we made a spelling error. Luckily we can edit our comment!
       cy.get('#editcomment').click()
       cy.get('#writecomment').type('t.')
diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index fa5bf705f..317d38fe2 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -1,7 +1,5 @@
 describe('superstudent tests', () => {
   beforeEach(() => {
-    //cy.login('superstudent@trottoir.be', 'super_student')
-    //cy.visit('/ronde/overzicht')
     cy.visit('/')
     cy.get('#email').type('superstudent@trottoir.be')
     cy.get('#password').type('super_student')
@@ -102,7 +100,7 @@ describe('superstudent tests', () => {
     cy.get('#schedule').click()
     // go to the already planned tasks
     cy.contains('Voorlopig schema').click()
-    // remove scheduled round
+    // remove first scheduled round
     cy.get('#remove').click()
     // add new one
     cy.contains('Ronde inplannen').click()
diff --git a/web/cypress/e2e/syndicus.cy.ts b/web/cypress/e2e/syndicus.cy.ts
index e5e4dc16b..c6bf6403e 100644
--- a/web/cypress/e2e/syndicus.cy.ts
+++ b/web/cypress/e2e/syndicus.cy.ts
@@ -1,6 +1,5 @@
 describe('syndicus tests', () => {
   beforeEach(() => {
-    // cy.login('syndicus@trottoir.be', 'syndicus')
     cy.visit('/')
     cy.get('#email').type('syndicus@trottoir.be')
     cy.get('#password').type('syndicus')
diff --git a/web/cypress/support/commands.ts b/web/cypress/support/commands.ts
index 1f58e50f9..8db564df8 100644
--- a/web/cypress/support/commands.ts
+++ b/web/cypress/support/commands.ts
@@ -44,17 +44,3 @@ declare global {
     }
   }
 }
-
-
-Cypress.Commands.add('login' as any, (email: string, password:string) => {
-  cy.session([email, password], () =>
-  {
-    cy.visit('/')
-    cy.get('#email').type(email)
-    cy.get('#password').type(password)
-    cy.get('#login').click()
-  },
-    {
-      cacheAcrossSpecs: true
-    })
-})

From 54334db0023424cce92d56478ec791686cf1d9d8 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 20:37:26 +0200
Subject: [PATCH 29/33] test: delete building

---
 web/cypress/e2e/administrator.cy.ts       | 5 ++++-
 web/src/views/building/BuildingScreen.vue | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index f70c9a99f..a1c7a9600 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -226,8 +226,11 @@ describe('admin tests', () => {
     cy.contains('test building').click()
     // it can take a while to load all the schedules
     cy.wait(10000)
-    cy.get('#delete').click()
     // delete
+    cy.get('#delete').click()
+    cy.contains('Dit gebouw is verwijderd.').should('be.visible')
+    cy.get('#buildings').click()
+    cy.contains('test building').should('not.exist')
   })
 
   it('add new template', () => {
diff --git a/web/src/views/building/BuildingScreen.vue b/web/src/views/building/BuildingScreen.vue
index ab3efb9c4..9b7b44c24 100644
--- a/web/src/views/building/BuildingScreen.vue
+++ b/web/src/views/building/BuildingScreen.vue
@@ -218,6 +218,7 @@
         >Annuleren</SimpleButton
       >
       <SimpleButton
+        id="delete"
         prepend-icon="mdi-check"
         color="success"
         variant="elevated"

From 69e7732303d568cfab5a4125ff27172c08febaa0 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 20:50:24 +0200
Subject: [PATCH 30/33] chore: fix build problems

---
 web/cypress/e2e/student.cy.ts             | 2 +-
 web/src/components/images/PhotoMaker.vue  | 1 -
 web/src/views/account/AccountSettings.vue | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/cypress/e2e/student.cy.ts b/web/cypress/e2e/student.cy.ts
index 0d2deab1e..cea634a06 100644
--- a/web/cypress/e2e/student.cy.ts
+++ b/web/cypress/e2e/student.cy.ts
@@ -28,7 +28,7 @@ describe('student tests', () => {
       // add images
       // add arrival image
       cy.get('#addimage').click()
-      cy.get("#select").selectFile('src/assets/images/drtroittoir_logo.png')
+      cy.get("#upload-progress").selectFile('src/assets/images/drtroittoir_logo.png')
       //the standard type is arrival, so doesn't need change here
       cy.get('#comment').type('Arrival picture.')
       cy.get('#save').click()
diff --git a/web/src/components/images/PhotoMaker.vue b/web/src/components/images/PhotoMaker.vue
index 7b87f3de5..f56f480da 100644
--- a/web/src/components/images/PhotoMaker.vue
+++ b/web/src/components/images/PhotoMaker.vue
@@ -10,7 +10,6 @@
 
     <div class="mx-4 my-2">
       <v-file-input
-        id="select"
         v-if="isPhoto"
         single
         v-model="photo.image"
diff --git a/web/src/views/account/AccountSettings.vue b/web/src/views/account/AccountSettings.vue
index eb9976f50..dbddcbe4c 100644
--- a/web/src/views/account/AccountSettings.vue
+++ b/web/src/views/account/AccountSettings.vue
@@ -66,7 +66,6 @@
       "
     />
     <UserAnalyticCard
-      id="useranalytics"
       v-if="
         !edit &&
         (useAuthStore().auth?.admin || useAuthStore().auth?.super_student) &&

From b26a864c229bb30c5a059390b1d160830f119ed7 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 20:57:36 +0200
Subject: [PATCH 31/33] chore: small changes

---
 web/cypress/e2e/superstudent.cy.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/cypress/e2e/superstudent.cy.ts b/web/cypress/e2e/superstudent.cy.ts
index 317d38fe2..243f20be7 100644
--- a/web/cypress/e2e/superstudent.cy.ts
+++ b/web/cypress/e2e/superstudent.cy.ts
@@ -132,9 +132,7 @@ describe('superstudent tests', () => {
 
 
   it('observe students currently doing a round', () => {
-    // make sure there is a student currently doing Round X: maybe add a test that creates this?
-    // give round to student -> student starts round
-    const round: string = "Round 2"
+    const round: string = "Round 1"
     // we are at round the follup page
     // add filters
     cy.get('#filter').then(() => {

From 84e333ddc7cb417e3cfb6ad3d7a7775bfa522ab5 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 21:08:17 +0200
Subject: [PATCH 32/33] chore: extra comments

---
 web/cypress/e2e/administrator.cy.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index a1c7a9600..dbe05d915 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -120,6 +120,7 @@ describe('admin tests', () => {
   })
 
   it('add building', () => {
+    // TODO: not up to date
     cy.get('#buildings').click()
     // press create button
     cy.get('#newbuilding').click()
@@ -158,7 +159,6 @@ describe('admin tests', () => {
     cy.get('#action').type('buiten zetten')
     cy.get('#frequency').parent().click()
     cy.contains('wekelijks').click()
-    // TODO: add an actual date
     cy.get('#startdate').type('2023-05-22')
     cy.get('#enddate').type('2023-06-22')
     cy.get('#starttime').type('20:00')
@@ -190,6 +190,7 @@ describe('admin tests', () => {
   // so no need to test add and delete again
 
   it('edit building', () => {
+    // TODO: not up to date
     cy.get('#buildings').click()
     // press building from buildings overview
     cy.contains('test building').click()

From 12cf02ef2830c9890292e1e5a4e1e8f1eb4e05e4 Mon Sep 17 00:00:00 2001
From: Arnout_Allaert <arnout.allaert@ugent.be>
Date: Sun, 21 May 2023 21:35:33 +0200
Subject: [PATCH 33/33] chore: deleted outdated tests

---
 web/cypress/e2e/administrator.cy.ts | 67 +----------------------------
 1 file changed, 2 insertions(+), 65 deletions(-)

diff --git a/web/cypress/e2e/administrator.cy.ts b/web/cypress/e2e/administrator.cy.ts
index dbe05d915..57a31e8c3 100644
--- a/web/cypress/e2e/administrator.cy.ts
+++ b/web/cypress/e2e/administrator.cy.ts
@@ -119,35 +119,6 @@ describe('admin tests', () => {
     cy.get('#year').should('have.value', 2023)
   })
 
-  it('add building', () => {
-    // TODO: not up to date
-    cy.get('#buildings').click()
-    // press create button
-    cy.get('#newbuilding').click()
-    // add building data
-    cy.get('#name').type('test building')
-    cy.get('#ivagoid').type('1234')
-    // syndicus still hardcoded
-    // cy.get('#syndicus').select()
-    cy.get('#longitude').type("12")
-    cy.get('#latitude').type("34")
-    cy.get('#addressform').then(() => {
-      cy.get('#street').type("teststreet")
-      cy.get('#streetnr').type("1")
-      cy.get('#city').type("test")
-      cy.get('#zipcode').type("1111")
-    })
-    cy.get('#submit').click()
-    // save
-    // we should be on the info page of the building
-    cy.contains('test building')
-    cy.contains('Taken')
-    cy.contains('Bezoeken')
-    // cy.contains('1234') ivago id not shown
-    // cy.contains('name of syndicus')
-    // maybe click on the 'kaarten' button to see if address was added correctly
-  })
-
   it('add garbage schedule to a building', () => {
     cy.get('#buildings').click()
     // select building
@@ -189,49 +160,15 @@ describe('admin tests', () => {
   // editing garbage schedule is just deleting the old one and creating a new one,
   // so no need to test add and delete again
 
-  it('edit building', () => {
-    // TODO: not up to date
-    cy.get('#buildings').click()
-    // press building from buildings overview
-    cy.contains('test building').click()
-    // it can take a while to load all the schedules
-    cy.wait(10000)
-    // press edit button
-    cy.contains('#edit').click()
-    // alter building data
-    cy.get('#name').clear().type('test gebouw')
-    cy.get('#ivagoid').clear().type('4321')
-    // syndicus still hardcoded
-    // cy.get('#syndicus').select()
-    cy.get('#longitude').clear().type("21")
-    cy.get('#latitude').clear().type("43")
-    cy.get('#addressform').then(() => {
-      cy.get('#street').clear().type("teststraat")
-      cy.get('#streetnr').clear().type("10")
-      cy.get('#city').clear().type("city")
-      cy.get('#zipcode').clear().type("1000")
-    })
-    // TODO: edit manual and pictures
-    cy.get('#submit').click()
-    // save
-    // we should be on the info page of the building
-    cy.contains('test gebouw')
-    cy.contains('Taken')
-    cy.contains('Bezoeken')
-    // cy.contains('4321')
-    // cy.contains('name of syndicus')
-    // maybe click on the 'kaarten' button to see if address was added correctly
-  })
-
   it('delete building', () => {
-    cy.contains('test building').click()
+    cy.contains('Building 1').click()
     // it can take a while to load all the schedules
     cy.wait(10000)
     // delete
     cy.get('#delete').click()
     cy.contains('Dit gebouw is verwijderd.').should('be.visible')
     cy.get('#buildings').click()
-    cy.contains('test building').should('not.exist')
+    cy.contains('Building 1').should('not.exist')
   })
 
   it('add new template', () => {