From 65a263e78e56626cb29630e238688f2209b74d66 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Mon, 15 Mar 2021 10:54:14 +0100
Subject: [PATCH] Clean up code

---
 .../cypress/integration/sync-module-visibility.spec.js | 10 +++++-----
 client/cypress/support/commands.js                     |  8 ++++----
 client/cypress/support/helpers.js                      |  8 +++-----
 client/cypress/support/index.d.ts                      |  4 ++--
 client/src/mixins/me.js                                |  4 +++-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/cypress/integration/sync-module-visibility.spec.js b/client/cypress/integration/sync-module-visibility.spec.js
index 9a180a80..af91d95c 100644
--- a/client/cypress/integration/sync-module-visibility.spec.js
+++ b/client/cypress/integration/sync-module-visibility.spec.js
@@ -61,14 +61,14 @@ describe('Apply module visibility', () => {
     cy.visit('/module/lohn-und-budget');
     cy.selectClass('Andere Klasse');
     // click on settings
-    cy.dataCy('module-settings-button').click();
+    cy.getByDataCy('module-settings-button').click();
     // click on select button
-    cy.dataCy('select-school-class-button').click();
+    cy.getByDataCy('select-school-class-button').click();
     // select schoolclass
-    cy.dataCy('school-class-visibility-dropdown').select('FLID2018a');
+    cy.getByDataCy('school-class-visibility-dropdown').select('FLID2018a');
     // save changes
-    cy.dataCy('save-visibility-button').click();
+    cy.getByDataCy('save-visibility-button').click();
 
-    cy.dataCy('module-title').should('exist');
+    cy.getByDataCy('module-title').should('exist');
   });
 });
diff --git a/client/cypress/support/commands.js b/client/cypress/support/commands.js
index f884ba64..1f153f78 100644
--- a/client/cypress/support/commands.js
+++ b/client/cypress/support/commands.js
@@ -175,14 +175,14 @@ Cypress.Commands.add('skipOnboarding', (onboarding) => {
   cy.get('[data-cy=onboarding-skip-link]').click();
 });
 
-Cypress.Commands.add('dataCy', (selector) => {
+Cypress.Commands.add('getByDataCy', (selector) => {
   return cy.get(`[data-cy=${selector}]`);
 });
 
 Cypress.Commands.add('selectClass', (schoolClass) => {
-  cy.dataCy('user-widget-avatar').click();
-  cy.dataCy('class-selection').click();
-  cy.dataCy('class-selection-entry').contains(schoolClass).click();
+  cy.getByDataCy('user-widget-avatar').click();
+  cy.getByDataCy('class-selection').click();
+  cy.getByDataCy('class-selection-entry').contains(schoolClass).click();
 });
 
 Cypress.Commands.add('fakeLogin', () => {
diff --git a/client/cypress/support/helpers.js b/client/cypress/support/helpers.js
index 773dd6eb..2cae9751 100644
--- a/client/cypress/support/helpers.js
+++ b/client/cypress/support/helpers.js
@@ -5,13 +5,11 @@ const getSchoolClassNode = (id, schoolClassName) => ({
 });
 
 export const getMe = ({schoolClasses, teacher}) => {
-  let schoolClassNodes = [];
+  let schoolClassNodes;
   if (schoolClasses) {
-    for (let i = 0; i < schoolClasses.length; i++) {
-      schoolClassNodes.push(getSchoolClassNode(i, schoolClasses[i]));
-    }
+    schoolClassNodes = schoolClasses.map((schoolClass, i) => getSchoolClassNode(i, schoolClass));
   } else {
-    schoolClassNodes.push(getSchoolClassNode(1, 'FLID2018a'));
+    schoolClassNodes = [getSchoolClassNode(1, 'FLID2018a')];
   }
 
   return {
diff --git a/client/cypress/support/index.d.ts b/client/cypress/support/index.d.ts
index 8f237b52..22da3dab 100644
--- a/client/cypress/support/index.d.ts
+++ b/client/cypress/support/index.d.ts
@@ -14,9 +14,9 @@ declare namespace Cypress {
      * Selects an element based on the `data-cy=xxx` attribute
      * @param selector - The value of the data-cy attribute to select
      * @example
-     * cy.dataCy('my-new-button')
+     * cy.getByDataCy('my-new-button')
      */
-    dataCy(selector: string): Chainable<any>
+    getByDataCy(selector: string): Chainable<any>
 
     selectClass(schoolClass: string): void
 
diff --git a/client/src/mixins/me.js b/client/src/mixins/me.js
index e2e592c7..20eb9568 100644
--- a/client/src/mixins/me.js
+++ b/client/src/mixins/me.js
@@ -37,7 +37,9 @@ export default {
       let currentClass = this.me.schoolClasses.find(schoolClass => {
         return schoolClass.id === this.me.selectedClass.id;
       });
-      return currentClass ? currentClass.name : this.me.schoolClasses.length ? this.me.schoolClasses[0].name : '';
+      return currentClass
+        ? currentClass.name
+        : (this.me.schoolClasses.length ? this.me.schoolClasses[0].name : '');
     },
   },