From bac4c34d023c5a90af0e75c685490a3e97f96a9a Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Wed, 22 May 2024 17:12:41 +0200
Subject: [PATCH] test: cleanup #434

---
 frontend/cypress/support/e2e.ts               | 23 +++++++------------
 .../src/components/layout/base/BaseHeader.vue | 10 ++++++--
 frontend/src/test/e2e/setup/data.ts           | 15 ------------
 frontend/src/test/e2e/setup/seed.ts           | 20 ----------------
 test.sh                                       |  4 ++--
 5 files changed, 18 insertions(+), 54 deletions(-)
 delete mode 100644 frontend/src/test/e2e/setup/data.ts
 delete mode 100644 frontend/src/test/e2e/setup/seed.ts

diff --git a/frontend/cypress/support/e2e.ts b/frontend/cypress/support/e2e.ts
index edc31e4a..f553c558 100644
--- a/frontend/cypress/support/e2e.ts
+++ b/frontend/cypress/support/e2e.ts
@@ -44,21 +44,14 @@ const logout = () => {
     });
 }
 
-before(() => {
-    cy.intercept('POST', '/api/auth/cas/logout/', (req) => {
-        console.log('intercepted');
-        req.headers['Referer'] = Cypress.config('baseUrl');
-
-        return req;
-    });
-
-    cy.request('POST', '/api/auth/test-user/student/');
-    logout();
-    cy.request('POST', '/api/auth/test-user/multi/');
-    logout();
-    cy.request('POST', '/api/auth/test-user/admin/');
-    logout();
-})
+// before(() => {
+//     cy.request('POST', '/api/auth/test-user/student/');
+//     logout();
+//     cy.request('POST', '/api/auth/test-user/multi/');
+//     logout();
+//     cy.request('POST', '/api/auth/test-user/admin/');
+//     logout();
+// })
 
 afterEach(() => {
     logout();
diff --git a/frontend/src/components/layout/base/BaseHeader.vue b/frontend/src/components/layout/base/BaseHeader.vue
index 519ecbe0..2a9b20e2 100644
--- a/frontend/src/components/layout/base/BaseHeader.vue
+++ b/frontend/src/components/layout/base/BaseHeader.vue
@@ -107,7 +107,13 @@ const items = computed(() => [
             <!-- Navigation -->
             <div id="navigation" class="hidden md:flex w-full h-full">
                 <template v-if="isAuthenticated">
-                    <RouterLink :to="{ name: item.route }" v-for="item in items" :key="item.route" class="nav-item">
+                    <RouterLink
+                        :to="{ name: item.route }"
+                        v-for="item in items"
+                        :key="item.route"
+                        class="nav-item"
+                        :id="item.route"
+                    >
                         <div
                             class="flex align-items-center uppercase flex justify-content-center p-3 pl-0 cursor-pointer text-primary font-medium"
                         >
@@ -139,7 +145,7 @@ const items = computed(() => [
                     </div>
                     <div class="overflow-y-auto px-2">
                         <ul class="list-none p-0 m-0">
-                            <li v-for="item in items" :key="item.route">
+                            <li v-for="item in items" :key="item.route" :id="item.route">
                                 <RouterLink
                                     :to="{ name: item.route }"
                                     @click="closeCallback"
diff --git a/frontend/src/test/e2e/setup/data.ts b/frontend/src/test/e2e/setup/data.ts
deleted file mode 100644
index 86212f76..00000000
--- a/frontend/src/test/e2e/setup/data.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-const date = new Date();
-
-export const faculty = {
-    id: '0',
-    name: 'Faculty'
-};
-
-export const course = {
-    name: 'Course',
-    academic_startyear: date.getMonth() > 8 ? date.getFullYear() : date.getFullYear() - 1,
-    excerpt: 'This is a course',
-    faculty: faculty.id,
-    private_course: false
-};
-
diff --git a/frontend/src/test/e2e/setup/seed.ts b/frontend/src/test/e2e/setup/seed.ts
deleted file mode 100644
index 1c0dadc7..00000000
--- a/frontend/src/test/e2e/setup/seed.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { faculty, course } from './data.ts';
-import { client } from '@/config/axios.ts';
-
-export const seed = async () => {
-    // log in as normal users to add 2 users to the database
-    await client.post('/api/auth/test-user/student/');
-    await client.post('/api/auth/cas/logout/');
-    await client.post('/api/auth/test-user/multi/');
-    await client.post('/api/auth/cas/logout/');
-
-    // log in as an admin user to insert our test data into the database
-    await client.post('/api/auth/test-user/admin/');
-
-    // add test data
-    await client.post('/api/faculties/', faculty);
-    await client.post('/api/courses/', course);
-
-    // logout for cleanup
-   await  client.post('/api/auth/cas/logout/');
-}
\ No newline at end of file
diff --git a/test.sh b/test.sh
index 1213123f..6f665f2d 100755
--- a/test.sh
+++ b/test.sh
@@ -68,8 +68,8 @@ if [ "$frontend" = true ]; then
     echo "Running frontend tests..."
     echo "Filling up database with test data"
     docker exec backend sh -c "python manage.py flush --no-input; python manage.py migrate; python manage.py loaddata
-      notifications/fixtures/$data/*; python manage.py loaddata authentication/fixtures/$data/*; python manage.py
-      loaddata api/fixtures/$data/*;"
+      notifications/fixtures/$data/*; python manage.py loaddata authentication/fixtures/$data/*; python
+      manage.py loaddata api/fixtures/$data/*;"
     echo "Running Cypress tests..."
     docker-compose -f test.yml up --exit-code-from cypress --abort-on-container-exit  cypress
     cypress_exit=$?