From fa245d0b640df1fbf4c8ff17a17380657050572d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 13 Dec 2021 11:52:20 +0100 Subject: [PATCH 1/4] feat: Frontend Tests and Optimization --- frontend/src/views/Pages/SendOverview.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frontend/src/views/Pages/SendOverview.vue b/frontend/src/views/Pages/SendOverview.vue index fc0dc5692..822cc3117 100644 --- a/frontend/src/views/Pages/SendOverview.vue +++ b/frontend/src/views/Pages/SendOverview.vue @@ -70,11 +70,6 @@ export default { default: true, }, }, - computed: { - showContext() { - return this.currentTransactionStep === 0 - }, - }, methods: { setTransaction(data) { this.transactionData = { ...data } From c9581196da1782f51b4844a9cbb3aa7dabf1e955 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 13 Dec 2021 12:16:13 +0100 Subject: [PATCH 2/4] test admin and setVisible methods, test elopage links --- .../views/Layout/DashboardLayout_gdd.spec.js | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index 3e03bec2e..4ea2e86b2 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -52,6 +52,7 @@ describe('DashboardLayoutGdd', () => { publisherId: 123, firstName: 'User', lastName: 'Example', + token: 'valid-token', }, dispatch: storeDispatchMock, commit: storeCommitMock, @@ -222,6 +223,65 @@ describe('DashboardLayoutGdd', () => { expect(toasterMock).toBeCalledWith('Ouch!') }) }) + + describe('set visible method', () => { + beforeEach(() => { + wrapper.findComponent({ name: 'Navbar' }).vm.$emit('set-visible', true) + }) + + it('sets visible to true', () => { + expect(wrapper.vm.visible).toBe(true) + }) + }) + + describe('elopage URI', () => { + describe('user has no publisher ID and no elopage', () => { + beforeEach(() => { + mocks.$store.state.publisherId = null + mocks.$store.state.hasElopage = false + wrapper = Wrapper() + }) + + it('links to basic-de', () => { + expect(wrapper.vm.elopageUri).toBe( + 'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=2896&firstName=User&lastName=Example&email=user@example.org', + ) + }) + }) + + describe('user has elopage', () => { + beforeEach(() => { + mocks.$store.state.publisherId = '123' + mocks.$store.state.hasElopage = true + wrapper = Wrapper() + }) + + it('links to sign in for elopage', () => { + expect(wrapper.vm.elopageUri).toBe('https://elopage.com/s/gradido/sign_in?locale=en') + }) + }) + }) + + describe('admin method', () => { + const windowLocationMock = jest.fn() + beforeEach(() => { + delete window.location + window.location = { + assign: windowLocationMock, + } + wrapper.findComponent({ name: 'Navbar' }).vm.$emit('admin') + }) + + it('dispatches logout to store', () => { + expect(storeDispatchMock).toBeCalled() + }) + + it('changes window location to admin interface', () => { + expect(windowLocationMock).toBeCalledWith( + 'http://localhost/admin/authenticate?token=valid-token', + ) + }) + }) }) }) }) From 041c5a7024a983a5a7da9e20e93e0df10d0a22a6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 13 Dec 2021 12:29:26 +0100 Subject: [PATCH 3/4] Test global directives --- frontend/src/plugins/globalDirectives.js | 2 -- frontend/src/plugins/globalDirectives.test.js | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 frontend/src/plugins/globalDirectives.test.js diff --git a/frontend/src/plugins/globalDirectives.js b/frontend/src/plugins/globalDirectives.js index 1ef005f5b..836643706 100755 --- a/frontend/src/plugins/globalDirectives.js +++ b/frontend/src/plugins/globalDirectives.js @@ -1,4 +1,3 @@ -// import clickOutside from '@/directives/click-ouside.js' import { focus } from 'vue-focus' /** @@ -7,7 +6,6 @@ import { focus } from 'vue-focus' const GlobalDirectives = { install(Vue) { - // Vue.directive('click-outside', clickOutside) Vue.directive('focus', focus) }, } diff --git a/frontend/src/plugins/globalDirectives.test.js b/frontend/src/plugins/globalDirectives.test.js new file mode 100644 index 000000000..385ccb651 --- /dev/null +++ b/frontend/src/plugins/globalDirectives.test.js @@ -0,0 +1,21 @@ +import GlobalDirectives from './globalDirectives' +import { focus } from 'vue-focus' +import Vue from 'vue' + +jest.mock('vue-focus', () => { + return { + __esModule: true, + focus: jest.fn(), + } +}) +jest.mock('vue') + +const vueDirectiveMock = jest.fn() +Vue.directive = vueDirectiveMock + +describe('globalDirectives', () => { + it('installs the focus directive', () => { + GlobalDirectives.install(Vue) + expect(vueDirectiveMock).toBeCalledWith('focus', focus) + }) +}) From d2fb2e86e2af22d17b1014ba081cb648b7827eb1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 13 Dec 2021 15:29:04 +0100 Subject: [PATCH 4/4] coverage frontend to 94% --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24aec5fff..526c15cca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -399,7 +399,7 @@ jobs: report_name: Coverage Frontend type: lcov result_path: ./coverage/lcov.info - min_coverage: 90 + min_coverage: 94 token: ${{ github.token }} ##############################################################################