diff --git a/admin/package.json b/admin/package.json index 677095a28..3cd0c54c0 100644 --- a/admin/package.json +++ b/admin/package.json @@ -11,7 +11,7 @@ "serve": "vue-cli-service serve --open", "dev": "yarn run serve", "build": "vue-cli-service build", - "lint": "eslint --ext .js,.vue .", + "lint": "eslint --max-warnings=0 --ext .js,.vue .", "test": "TZ=UTC jest --coverage", "locales": "scripts/missing-keys.sh && scripts/sort.sh" }, diff --git a/admin/src/components/Overlay.spec.js b/admin/src/components/Overlay.spec.js new file mode 100644 index 000000000..6a857068f --- /dev/null +++ b/admin/src/components/Overlay.spec.js @@ -0,0 +1,31 @@ +import { mount } from '@vue/test-utils' +import Overlay from './Overlay.vue' + +const localVue = global.localVue + +const propsData = { + item: {}, +} + +const mocks = { + $t: jest.fn((t) => t), + $d: jest.fn((d) => String(d)), +} + +describe('Overlay', () => { + let wrapper + + const Wrapper = () => { + return mount(Overlay, { localVue, mocks, propsData }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('has a DIV element with the class.component-overlay', () => { + expect(wrapper.find('.component-overlay').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue new file mode 100644 index 000000000..bf477c491 --- /dev/null +++ b/admin/src/components/Overlay.vue @@ -0,0 +1,67 @@ + + diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 90a60475c..954d73e41 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -20,6 +20,7 @@ "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", "update_creation": "Schöpfung aktualisieren" }, + "creation_for_month": "Schöpfung für Monat", "date": "Datum", "delete": "Löschen", "details": "Details", @@ -31,6 +32,7 @@ "lastname": "Nachname", "moderator": "Moderator", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", + "name": "Name", "navbar": { "logout": "Abmelden", "multi_creation": "Mehrfachschöpfung", @@ -44,7 +46,7 @@ "open_creations": "Offene Schöpfungen", "overlay": { "confirm": { - "no": "Nein, nicht speichern.", + "cancel": "Abbrechen", "question": "Willst du diese vorgespeicherte Schöpfung wirklich vollziehen und endgültig speichern?", "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.", "title": "Schöpfung bestätigen!", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 8775393dd..4897c58f6 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -20,6 +20,7 @@ "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", "update_creation": "Creation update" }, + "creation_for_month": "Creation for month", "date": "Date", "delete": "Delete", "details": "Details", @@ -31,6 +32,7 @@ "lastname": "Lastname", "moderator": "Moderator", "multiple_creation_text": "Please select one or more members for which you would like to perform creations.", + "name": "Name", "navbar": { "logout": "Logout", "multi_creation": "Multiple creation", @@ -44,7 +46,7 @@ "open_creations": "Open creations", "overlay": { "confirm": { - "no": "No, do not save.", + "cancel": "Cancel", "question": "Do you really want to carry out and finally save this pre-stored creation?", "text": "After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.", "title": "Confirm creation!", diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 067aedd61..f0412678b 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -132,8 +132,8 @@ describe('CreationConfirm', () => { await wrapper.find('#overlay').findAll('button').at(0).trigger('click') }) - it('closes the overlay', () => { - expect(wrapper.find('#overlay').isVisible()).toBeFalsy() + it('closes the overlay', async () => { + expect(wrapper.find('#overlay').exists()).toBeFalsy() }) it('still has 2 items in the table', () => { diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index d0b1e489b..54580c366 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,18 +1,7 @@