From 6ef1251daa09f4d9f0e88db7965b1d16d57b561a Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 2 May 2024 16:24:50 +0200 Subject: [PATCH] fix some tests --- frontend/src/components/Menu/Sidebar.spec.js | 14 +++++++++----- frontend/src/pages/Circles.vue | 6 +++++- frontend/src/routes/router.test.js | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js index 77a525f3b..79cf84df7 100644 --- a/frontend/src/components/Menu/Sidebar.spec.js +++ b/frontend/src/components/Menu/Sidebar.spec.js @@ -32,9 +32,9 @@ describe('Sidebar', () => { expect(wrapper.find('div#component-sidebar').exists()).toBe(true) }) - describe('the genaral section', () => { - it('has six nav-items', () => { - expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(7) + describe('the general section', () => { + it('has eight nav-items', () => { + expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(8) }) it('has nav-item "navigation.overview" in navbar', () => { @@ -61,8 +61,12 @@ describe('Sidebar', () => { expect(wrapper.findAll('.nav-item').at(5).text()).toContain('navigation.info') }) - it('has nav-item "usersearch" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(6).text()).toContain('navigation.usersearch') + it('has nav-item "navigation.circles" in navbar', () => { + expect(wrapper.findAll('.nav-item').at(6).text()).toContain('navigation.circles') + }) + + it('has nav-item "navigation.usersearch" in navbar', () => { + expect(wrapper.findAll('.nav-item').at(7).text()).toContain('navigation.usersearch') }) }) diff --git a/frontend/src/pages/Circles.vue b/frontend/src/pages/Circles.vue index ef6652652..3ce50c847 100644 --- a/frontend/src/pages/Circles.vue +++ b/frontend/src/pages/Circles.vue @@ -14,6 +14,7 @@ @@ -36,7 +37,7 @@ export default { name: 'Circles', data() { return { - humhubUri: null, + enableButton: true, } }, computed: { @@ -46,6 +47,7 @@ export default { }, methods: { async authenticateCirclesAutoLogin() { + this.enableButton = false this.humhubUri = null this.$apollo .query({ @@ -54,9 +56,11 @@ export default { }) .then(async (result) => { window.open(result.data.authenticateCirclesAutoLogin, '_blank') + this.enableButton = true }) .catch(() => { this.toastError('authenticateCirclesAutoLogin failed!') + this.enableButton = true }) }, }, diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index af6b1c431..1fa76a5e6 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -49,8 +49,8 @@ describe('router', () => { expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' }) }) - it('has 20 routes defined', () => { - expect(routes).toHaveLength(20) + it('has 21 routes defined', () => { + expect(routes).toHaveLength(21) }) describe('overview', () => {