From 74072847221629ce344893a14b5b70a2d5660400 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Wed, 26 Oct 2022 16:00:11 +0200
Subject: [PATCH] Fix school class cypress test

---
 .../e2e/frontend/users/school-class-management.spec.js   | 8 +++-----
 .../src/components/school-class/ClassSelectionWidget.vue | 9 +++++++--
 client/src/components/school-class/CurrentClass.vue      | 2 --
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/cypress/e2e/frontend/users/school-class-management.spec.js b/client/cypress/e2e/frontend/users/school-class-management.spec.js
index fd532a37..420b4bd5 100644
--- a/client/cypress/e2e/frontend/users/school-class-management.spec.js
+++ b/client/cypress/e2e/frontend/users/school-class-management.spec.js
@@ -321,8 +321,9 @@ describe('Teacher Class Management', () => {
 
   it('tries to create a new class with duplicate name', () => {
     const name = 'Hill Billy Valley';
+    const oldName = 'Some stupid class';
     let selectedClass = teacher.selectedClass;
-    selectedClass.name = 'Some stupid class';
+    selectedClass.name = oldName;
 
     const schoolClasses = [teacher.selectedClass];
 
@@ -337,10 +338,6 @@ describe('Teacher Class Management', () => {
         MeQuery: () => ({
           me: me(),
         }),
-        WhateverNode() {
-          console.log('Through here');
-          return {};
-        },
         MySchoolClassQuery: () => ({
           me: me(),
         }),
@@ -366,6 +363,7 @@ describe('Teacher Class Management', () => {
     cy.visit('/me/my-class');
 
     cy.get('h1').should('exist');
+    cy.getByDataCy('group-list-name').should('contain', oldName);
 
     cy.get('[data-cy=header-user-widget]').within(() => {
       cy.get('[data-cy=user-widget-avatar]').click();
diff --git a/client/src/components/school-class/ClassSelectionWidget.vue b/client/src/components/school-class/ClassSelectionWidget.vue
index 72eac8d8..222a16d4 100644
--- a/client/src/components/school-class/ClassSelectionWidget.vue
+++ b/client/src/components/school-class/ClassSelectionWidget.vue
@@ -6,9 +6,11 @@
     <div
       data-cy="class-selection"
       class="class-selection__selected-class selected-class"
-      @click.stop="showPopover = !showPopover"
+      @click.stop="toggle"
     >
-      <current-class class="selected-class__text" />
+      <current-class
+        class="selected-class__text"
+      />
       <chevron-down class="selected-class__dropdown-icon" />
     </div>
     <widget-popover
@@ -100,6 +102,9 @@
     },
 
     methods: {
+      toggle() {
+        this.showPopover = !this.showPopover;
+      },
       updateSelectedClassAndHidePopover(selectedClass) {
         this.updateSelectedClass(selectedClass);
         this.showPopover = false;
diff --git a/client/src/components/school-class/CurrentClass.vue b/client/src/components/school-class/CurrentClass.vue
index 1090b872..80934aa4 100644
--- a/client/src/components/school-class/CurrentClass.vue
+++ b/client/src/components/school-class/CurrentClass.vue
@@ -2,7 +2,6 @@
   <span
     class="current-class"
     data-cy="current-class-name"
-    @click.stop="$emit('click', $event)"
   >{{ currentClassName }}</span>
 </template>
 
@@ -10,7 +9,6 @@
   import me from '@/mixins/me';
 
   export default {
-    emits: ['click'],
     mixins: [me],
   };
 </script>