diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index ed5394d11..cb1e0eeba 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -21,20 +21,20 @@ const routes = [ requiresAuth: true, }, }, - { - path: '/profileedit', - component: () => import('../views/Pages/UserProfileEdit.vue'), - meta: { - requiresAuth: true, - }, - }, - { - path: '/activity', - component: () => import('../views/Pages/UserProfileActivity.vue'), - meta: { - requiresAuth: true, - }, - }, + //{ + // path: '/profileedit', + // component: () => import('../views/Pages/UserProfileEdit.vue'), + // meta: { + // requiresAuth: true, + // }, + //}, + //{ + // path: '/activity', + // component: () => import('../views/Pages/UserProfileActivity.vue'), + // meta: { + // requiresAuth: true, + // }, + //}, { path: '/transactions', component: () => import('../views/Pages/UserProfileTransactionList.vue'), diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index 3625df05e..651bef5a5 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -79,7 +79,7 @@ describe('DashboardLayoutGdd', () => { }) it('has five items in the navbar', () => { - expect(navbar.findAll('ul > li')).toHaveLength(5) + expect(navbar.findAll('ul > li')).toHaveLength(3) }) it('has first item "send" in navbar', () => { @@ -116,29 +116,29 @@ describe('DashboardLayoutGdd', () => { expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profile') }) - it('has fourth item "Settigs" in navbar', () => { - expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings') - }) + //it('has fourth item "Settigs" in navbar', () => { + // expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings') + //}) + // + //it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => { + // navbar.findAll('ul > li > a').at(3).trigger('click') + // await flushPromises() + // await jest.runAllTimers() + // await flushPromises() + // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit') + //}) - it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => { - navbar.findAll('ul > li > a').at(3).trigger('click') - await flushPromises() - await jest.runAllTimers() - await flushPromises() - expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit') - }) - - it('has fifth item "Activity" in navbar', () => { - expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity') - }) - - it.skip('has fourth item "Activity" linked to activity in navbar', async () => { - navbar.findAll('ul > li > a').at(4).trigger('click') - await flushPromises() - await jest.runAllTimers() - await flushPromises() - expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity') - }) + //it('has fifth item "Activity" in navbar', () => { + // expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity') + //}) + // + //it.skip('has fourth item "Activity" linked to activity in navbar', async () => { + // navbar.findAll('ul > li > a').at(4).trigger('click') + // await flushPromises() + // await jest.runAllTimers() + // await flushPromises() + // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity') + //}) }) }) }) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 7e8c1240f..5fa3ed0e8 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -12,12 +12,14 @@ {{ $t('site.navbar.my-profil') }} +