diff --git a/src/Resources/src/components/dishes/DishesHeader.vue b/src/Resources/src/components/dishes/DishesHeader.vue
index 2209159c3..51656d9f2 100644
--- a/src/Resources/src/components/dishes/DishesHeader.vue
+++ b/src/Resources/src/components/dishes/DishesHeader.vue
@@ -17,9 +17,7 @@
/>
-
+
diff --git a/src/Resources/src/components/events/EventsActions.vue b/src/Resources/src/components/events/EventsActions.vue
index fb6f75cd3..3e9136950 100644
--- a/src/Resources/src/components/events/EventsActions.vue
+++ b/src/Resources/src/components/events/EventsActions.vue
@@ -1,8 +1,6 @@
-
+
-
+
(null);
const selectedEvent = ref(null);
const participationLimitNotZero = computed(() => {
let limitNotZero = false;
- (Object.values(props.modelValue.meals) as MealDTO[][]).forEach(meals => {
- meals.forEach(meal => {
+ (Object.values(props.modelValue.meals) as MealDTO[][]).forEach((meals) => {
+ meals.forEach((meal) => {
if (meal.participationLimit !== 0) {
- limitNotZero = true
+ limitNotZero = true;
}
});
});
diff --git a/src/Resources/src/components/menu/MenuParticipationPanel.vue b/src/Resources/src/components/menu/MenuParticipationPanel.vue
index 9f407db05..4c1d45e3d 100644
--- a/src/Resources/src/components/menu/MenuParticipationPanel.vue
+++ b/src/Resources/src/components/menu/MenuParticipationPanel.vue
@@ -26,7 +26,7 @@ import { computed } from 'vue';
import { XCircleIcon } from '@heroicons/vue/solid';
const props = defineProps<{
- meals: Dictionary
+ meals: Dictionary;
}>();
const emit = defineEmits(['closePanel']);
diff --git a/src/Resources/src/components/menuParticipants/MenuTableData.vue b/src/Resources/src/components/menuParticipants/MenuTableData.vue
index f768c1a82..3d3d79e6c 100644
--- a/src/Resources/src/components/menuParticipants/MenuTableData.vue
+++ b/src/Resources/src/components/menuParticipants/MenuTableData.vue
@@ -69,7 +69,7 @@ const { getDishById } = useDishes();
const isCombi = computed(() => props.meal.dish === 'combined-dish');
const bookedCombi = computed(() => {
- return hasParticipantBookedCombiDish(props.dayId, props.participant, mealIdToDishIdDict.get(props.meal.id))
+ return hasParticipantBookedCombiDish(props.dayId, props.participant, mealIdToDishIdDict.get(props.meal.id));
});
const bookedMeal = computed(() => hasParticipantBookedMeal(props.dayId, props.participant, props.meal.id));
@@ -94,7 +94,7 @@ async function closeCombiModal(combiMeals: number[]) {
if (combiMeals !== undefined && combiMeals.length === 2) {
const dishSlugs = combiMeals.map((mealId) => {
const dishId = mealIdToDishIdDict.get(mealId);
- return dishId !== -1 ? getDishById(dishId).slug : null
+ return dishId !== -1 ? getDishById(dishId).slug : null;
});
if (dishSlugs !== null) {
await addParticipantToMeal(props.meal.id, props.participant, props.dayId, dishSlugs);
diff --git a/src/Resources/tests/unit/finances/FinanceHeader.spec.ts b/src/Resources/tests/unit/finances/FinanceHeader.spec.ts
index 9d17103ae..fb1dc62ef 100644
--- a/src/Resources/tests/unit/finances/FinanceHeader.spec.ts
+++ b/src/Resources/tests/unit/finances/FinanceHeader.spec.ts
@@ -15,7 +15,7 @@ describe('Test FinanceHeader (with controls)', () => {
});
it('should render correctly', () => {
- expect(wrapper.find('h1').text()).toBe('01.09.-10.09.2023');
+ expect(wrapper.find('h2').text()).toBe('01.09.-10.09.2023');
expect(wrapper.findComponent(VueDatePicker).exists()).toBe(true);
});
});
@@ -29,7 +29,7 @@ describe('Test FinanceHeader (without controls)', () => {
});
it('should render correctly', () => {
- expect(wrapper.find('h1').text()).toBe('01.09.-10.09.2023');
+ expect(wrapper.find('h2').text()).toBe('01.09.-10.09.2023');
expect(wrapper.findComponent(VueDatePicker).exists()).toBe(false);
});
});
diff --git a/tests/e2e/cypress/e2e/Costs.cy.ts b/tests/e2e/cypress/e2e/Costs.cy.ts
index a45a23688..f15e96a30 100644
--- a/tests/e2e/cypress/e2e/Costs.cy.ts
+++ b/tests/e2e/cypress/e2e/Costs.cy.ts
@@ -80,12 +80,12 @@ describe('Test Cost View', () => {
cy.get('form')
.find('input')
.first()
- .clear()
- .type('1234');
+ .clear({ force: true })
+ .type('1234', { force: true });
cy.get('form')
.find('input[value="Speichern"]')
- .click();
+ .click({ force: true });
cy.get('tr')
.eq(1)
@@ -123,12 +123,12 @@ describe('Test Cost View', () => {
cy.get('form')
.find('input')
.first()
- .clear()
- .type('147');
+ .clear({ force: true })
+ .type('147', { force: true });
cy.get('form')
.find('input[value="Speichern"]')
- .click();
+ .click({ force: true });
cy.get('tr')
.eq(1)
diff --git a/tests/e2e/cypress/e2e/Dishes.cy.ts b/tests/e2e/cypress/e2e/Dishes.cy.ts
index 46af1edf0..30b433e5c 100644
--- a/tests/e2e/cypress/e2e/Dishes.cy.ts
+++ b/tests/e2e/cypress/e2e/Dishes.cy.ts
@@ -99,12 +99,12 @@ describe('Test Dishes View', () => {
cy.get('h3').contains('Gericht editieren');
cy.get('input[placeholder="Deutscher Titel"]')
.should('have.value', 'TestGericht1234')
- .clear()
- .type('TestGericht5678');
+ .clear({ force: true })
+ .type('TestGericht5678', { force: true });
cy.get('input[placeholder="Englischer Titel"]')
.should('have.value', 'TestDish1234')
- .clear()
- .type('TestDish5678');
+ .clear({ force: true })
+ .type('TestDish5678', { force: true });
cy.contains('input', 'Speichern').click({ force: true });
cy.wait(['@putDishes']);
cy.log('edit dish');
@@ -159,8 +159,8 @@ describe('Test Dishes View', () => {
// Create a dish to filter for
cy.get('button').contains('+ Gericht erstellen').click();
cy.wait(['@getCategories']);
- cy.get('input[placeholder="Deutscher Titel"]').type('TestGericht1234');
- cy.get('input[placeholder="Englischer Titel"]').type('TestDish1234');
+ cy.get('input[placeholder="Deutscher Titel"]').type('TestGericht1234', { force: true });
+ cy.get('input[placeholder="Englischer Titel"]').type('TestDish1234', { force: true });
cy.contains('input', 'Speichern').click({ force: true });
cy.log('created dish to filter for');
cy.wait(['@getDishes', '@postDishes'])
@@ -202,17 +202,17 @@ describe('Test Dishes View', () => {
cy.get('button').contains('+ Gericht erstellen').click();
cy.wait(['@getCategories']);
cy.get('h3').contains('Neues Gericht erstellen');
- cy.get('input[placeholder="Deutscher Titel"]').type('TestGericht1234')
+ cy.get('input[placeholder="Deutscher Titel"]').type('TestGericht1234', { force: true })
.invoke('val')
.then(val => {
expect(val).to.equal('TestGericht1234')
});
- cy.get('input[placeholder="Englischer Titel"]').type('TestDish1234')
+ cy.get('input[placeholder="Englischer Titel"]').type('TestDish1234', { force: true })
.invoke('val')
.then(val => {
expect(val).to.equal('TestDish1234')
});
- cy.contains('input', 'Speichern').click();
+ cy.contains('input', 'Speichern').click({ force: true });
cy.wait(['@getDishes']);
cy.log('created dish');
cy.get('[data-cy="msgClose"]').click();
@@ -229,17 +229,17 @@ describe('Test Dishes View', () => {
.contains('Variation erstellen')
.click();
cy.get('h3').contains('Variation erstellen');
- cy.get('input[placeholder="Deutscher Titel"]').type('TestVariation1234')
+ cy.get('input[placeholder="Deutscher Titel"]').type('TestVariation1234', { force: true })
.invoke('val')
.then(val => {
expect(val).to.equal('TestVariation1234')
});
- cy.get('input[placeholder="Englischer Titel"]').type('TestVariation1234')
+ cy.get('input[placeholder="Englischer Titel"]').type('TestVariation1234', { force: true })
.invoke('val')
.then(val => {
expect(val).to.equal('TestVariation1234')
});
- cy.contains('input', 'Speichern').click();
+ cy.contains('input', 'Speichern').click({ force: true });
cy.wait(['@getDishes']);
cy.log('create variation');
cy.get('[data-cy="msgClose"]').click();
diff --git a/tests/e2e/cypress/e2e/MenuCreationRoundtrip.cy.ts b/tests/e2e/cypress/e2e/MenuCreationRoundtrip.cy.ts
index 0b72ea5de..2b2d3f28d 100644
--- a/tests/e2e/cypress/e2e/MenuCreationRoundtrip.cy.ts
+++ b/tests/e2e/cypress/e2e/MenuCreationRoundtrip.cy.ts
@@ -229,8 +229,6 @@ describe('Test Creating a Menu', () => {
cy.wait(['@putMenu', '@getWeeks']);
- cy.get('[data-cy="msgClose"]').click();
-
// Check that all meals and the event are saved
cy.get('input')
.eq(0)
@@ -320,8 +318,6 @@ describe('Test Creating a Menu', () => {
// Add participant
cy.get('input').first().click().clear().type('finance');
cy.get('li').contains('Meals, Finance').click();
- cy.get('[data-cy="msgClose"]').click();
- cy.get('h2').contains('Teilnahmen').click();
cy.get('table')
.find('span')
.contains('Meals, Finance')