ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Clean up code

This commit is contained in:
Ramon Wenger 2021-03-15 10:54:14 +01:00
parent 0434d27d5d
commit 65a263e78e
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/cypress/integration/sync-module-visibility.spec.js
View File

@ -61,14 +61,14 @@ describe('Apply module visibility', () => {
cy.visit('/module/lohn-und-budget'); cy.visit('/module/lohn-und-budget');
cy.selectClass('Andere Klasse'); cy.selectClass('Andere Klasse');
// click on settings // click on settings
cy.dataCy('module-settings-button').click(); cy.getByDataCy('module-settings-button').click();
// click on select button // click on select button
cy.dataCy('select-school-class-button').click(); cy.getByDataCy('select-school-class-button').click();
// select schoolclass // select schoolclass
cy.dataCy('school-class-visibility-dropdown').select('FLID2018a'); cy.getByDataCy('school-class-visibility-dropdown').select('FLID2018a');
// save changes // 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');
}); });
}); });

8
client/cypress/support/commands.js
View File

@ -175,14 +175,14 @@ Cypress.Commands.add('skipOnboarding', (onboarding) => {
cy.get('[data-cy=onboarding-skip-link]').click(); cy.get('[data-cy=onboarding-skip-link]').click();
}); });
Cypress.Commands.add('dataCy', (selector) => { Cypress.Commands.add('getByDataCy', (selector) => {
return cy.get(`[data-cy=${selector}]`); return cy.get(`[data-cy=${selector}]`);
}); });
Cypress.Commands.add('selectClass', (schoolClass) => { Cypress.Commands.add('selectClass', (schoolClass) => {
cy.dataCy('user-widget-avatar').click(); cy.getByDataCy('user-widget-avatar').click();
cy.dataCy('class-selection').click(); cy.getByDataCy('class-selection').click();
cy.dataCy('class-selection-entry').contains(schoolClass).click(); cy.getByDataCy('class-selection-entry').contains(schoolClass).click();
}); });
Cypress.Commands.add('fakeLogin', () => { Cypress.Commands.add('fakeLogin', () => {

8
client/cypress/support/helpers.js
View File

@ -5,13 +5,11 @@ const getSchoolClassNode = (id, schoolClassName) => ({
}); });
export const getMe = ({schoolClasses, teacher}) => { export const getMe = ({schoolClasses, teacher}) => {
let schoolClassNodes = []; let schoolClassNodes;
if (schoolClasses) { if (schoolClasses) {
for (let i = 0; i < schoolClasses.length; i++) { schoolClassNodes = schoolClasses.map((schoolClass, i) => getSchoolClassNode(i, schoolClass));
schoolClassNodes.push(getSchoolClassNode(i, schoolClasses[i]));
}
} else { } else {
schoolClassNodes.push(getSchoolClassNode(1, 'FLID2018a')); schoolClassNodes = [getSchoolClassNode(1, 'FLID2018a')];
} }
return { return {

4
client/cypress/support/index.d.ts vendored
View File

@ -14,9 +14,9 @@ declare namespace Cypress {
* Selects an element based on the `data-cy=xxx` attribute * Selects an element based on the `data-cy=xxx` attribute
* @param selector - The value of the data-cy attribute to select * @param selector - The value of the data-cy attribute to select
* @example * @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 selectClass(schoolClass: string): void

4
client/src/mixins/me.js
View File

@ -37,7 +37,9 @@ export default {
let currentClass = this.me.schoolClasses.find(schoolClass => { let currentClass = this.me.schoolClasses.find(schoolClass => {
return schoolClass.id === this.me.selectedClass.id; 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 : '');
}, },
}, },