merge master, languange-switch test

This commit is contained in:
ogerly 2021-05-12 15:10:00 +02:00
parent 379b055c63
commit 3592393609
5 changed files with 12 additions and 9 deletions

View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="language-switch">
<b-dropdown size="sm" :text="$t('language') + ' - ' + $i18n.locale">
<b-dropdown-item @click.prevent="setLocale('de')">Deutsch</b-dropdown-item>
<b-dropdown-item @click.prevent="setLocale('en')">English</b-dropdown-item>

View File

@ -112,6 +112,12 @@ describe('SideBar', () => {
expect(wrapper.emitted('logout')).toEqual([[]])
})
})
describe('language-switch', () => {
it('has a language-switch button', () => {
expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
})
})
})
})
})

View File

@ -59,10 +59,6 @@ describe('DashboardLayoutGdd', () => {
expect(wrapper.find('nav#sidenav-main').exists()).toBeTruthy()
})
it('has a notifications component', () => {
expect(wrapper.find('div.notifications').exists()).toBeTruthy()
})
it('has a main content div', () => {
expect(wrapper.find('div.main-content').exists()).toBeTruthy()
})

View File

@ -1,6 +1,5 @@
<template>
<div class="wrapper">
<notifications></notifications>
<side-bar @logout="logout" :balance="balance" :pending="pending">
<template slot="links">
<sidebar-item

View File

@ -2,13 +2,15 @@
<div>
<base-header class="pb-lg-4 pt-lg-2 bg-transparent"></base-header>
<b-container fluid class="p-lg-2 mt-lg-5">
<gdd-status v-if="showTransactionList" :balance="balance" :gdt-balance="GdtBalance" />
<br />
<gdd-send
<gdd-status
v-if="showContext"
:pending="pending"
:balance="balance"
:gdt-balance="GdtBalance"
/>
<br />
<gdd-send :balance="balance" :gdt-balance="GdtBalance" />
<br />
<gdd-send :currentTransactionStep="currentTransactionStep">
<template #transaction-form>
<transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>