-
-
-
-
-
- {{ validationContext.errors[0] }}
-
-
-
-
+
{{ $t('site.password.reset_now') }}
@@ -59,9 +39,13 @@
-
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
index b1d705952..3227895ad 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.spec.js
@@ -1,29 +1,28 @@
import { mount } from '@vue/test-utils'
-import { extend } from 'vee-validate'
import UserCardFormUsername from './UserCard_FormUsername'
import loginAPI from '../../../apis/loginAPI'
import flushPromises from 'flush-promises'
+import { extend } from 'vee-validate'
jest.mock('../../../apis/loginAPI')
-extend('gddUsernameRgex', {
- validate(value) {
- return true
- },
-})
-
-extend('gddUsernameUnique', {
- validate(value) {
- return true
- },
-})
-
const localVue = global.localVue
const mockAPIcall = jest.fn((args) => {
return { success: true }
})
+// override this rule to avoid API call
+extend('gddUsernameUnique', {
+ validate(value) {
+ return true
+ },
+})
+
+const toastErrorMock = jest.fn()
+const toastSuccessMock = jest.fn()
+const storeCommitMock = jest.fn()
+
loginAPI.changeUsernameProfile = mockAPIcall
describe('UserCard_FormUsername', () => {
@@ -37,10 +36,11 @@ describe('UserCard_FormUsername', () => {
email: 'user@example.org',
username: '',
},
- commit: jest.fn(),
+ commit: storeCommitMock,
},
- $toast: {
- success: jest.fn(),
+ $toasted: {
+ success: toastSuccessMock,
+ error: toastErrorMock,
},
}
@@ -111,10 +111,43 @@ describe('UserCard_FormUsername', () => {
expect(wrapper.find('div.display-username').text()).toEqual('@username')
})
+ it('commits the username to the store', () => {
+ expect(storeCommitMock).toBeCalledWith('username', 'username')
+ })
+
+ it('toasts an success message', () => {
+ expect(toastSuccessMock).toBeCalledWith('site.profil.user-data.change-success')
+ })
+
it('has no edit button anymore', () => {
expect(wrapper.find('svg.bi-pencil').exists()).toBeFalsy()
})
})
+
+ describe('submit retruns error', () => {
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ mockAPIcall.mockReturnValue({
+ success: false,
+ result: { message: 'Error' },
+ })
+ await wrapper.find('input[placeholder="Username"]').setValue('username')
+ await wrapper.find('form').trigger('submit')
+ await flushPromises()
+ })
+
+ it('calls the loginAPI', () => {
+ expect(mockAPIcall).toHaveBeenCalledWith(1, 'user@example.org', 'username')
+ })
+
+ it('toasts an error message', () => {
+ expect(toastErrorMock).toBeCalledWith('Error')
+ })
+
+ it('renders an empty username', () => {
+ expect(wrapper.find('div.display-username').text()).toEqual('@')
+ })
+ })
})
})
})
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
index e908fd08c..dc971acba 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUsername.vue
@@ -95,9 +95,9 @@ export default {
this.$store.commit('username', this.form.username)
this.username = this.form.username
this.showUsername = true
- this.$toast.success(this.$t('site.profil.user-data.change-success'))
+ this.$toasted.success(this.$t('site.profil.user-data.change-success'))
} else {
- this.$toast.error(result.result.message)
+ this.$toasted.error(result.result.message)
this.showUsername = true
this.username = this.$store.state.username
this.form.username = this.$store.state.username
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.spec.js b/frontend/src/views/Pages/UserProfileTransactionList.spec.js
new file mode 100644
index 000000000..0761c5032
--- /dev/null
+++ b/frontend/src/views/Pages/UserProfileTransactionList.spec.js
@@ -0,0 +1,41 @@
+import { mount } from '@vue/test-utils'
+import UserProfileTransactionList from './UserProfileTransactionList'
+
+const localVue = global.localVue
+
+describe('UserProfileTransactionList', () => {
+ let wrapper
+
+ const mocks = {
+ $t: jest.fn((t) => t),
+ }
+
+ const Wrapper = () => {
+ return mount(UserProfileTransactionList, { localVue, mocks })
+ }
+
+ describe('mount', () => {
+ beforeEach(() => {
+ wrapper = Wrapper()
+ })
+
+ it('renders the transaction table', () => {
+ expect(wrapper.findComponent({ name: 'GddTransactionList' }).exists()).toBeTruthy()
+ })
+
+ it('emits update-transactions after creation', () => {
+ expect(wrapper.emitted('update-transactions')).toEqual(
+ expect.arrayContaining([expect.arrayContaining([{ firstPage: 1, items: 25 }])]),
+ )
+ })
+
+ it('emist update-transactions when update-transactions is called', () => {
+ wrapper
+ .findComponent({ name: 'GddTransactionList' })
+ .vm.$emit('update-transactions', { firstPage: 2, items: 25 })
+ expect(wrapper.emitted('update-transactions')).toEqual(
+ expect.arrayContaining([expect.arrayContaining([{ firstPage: 2, items: 25 }])]),
+ )
+ })
+ })
+})
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index f1896acc7..e6a25b436 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -19,12 +19,13 @@
import GddTransactionList from './AccountOverview/GddTransactionList.vue'
export default {
+ name: 'UserProfileTransactionList',
components: {
GddTransactionList,
},
props: {
transactions: {
- default: [],
+ default: () => [],
},
transactionCount: { type: Number, default: 0 },
},
diff --git a/frontend/test/testSetup.js b/frontend/test/testSetup.js
index 26d311941..565ebc33f 100644
--- a/frontend/test/testSetup.js
+++ b/frontend/test/testSetup.js
@@ -1,10 +1,11 @@
import { createLocalVue } from '@vue/test-utils'
import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
import Vuex from 'vuex'
+
import { ValidationProvider, ValidationObserver, extend } from 'vee-validate'
import * as rules from 'vee-validate/dist/rules'
-
import { messages } from 'vee-validate/dist/locale/en.json'
+
import RegeneratorRuntime from 'regenerator-runtime'
import SideBar from '@/components/SidebarPlugin'
import VueQrcode from 'vue-qrcode'
@@ -14,7 +15,7 @@ import VueMoment from 'vue-moment'
import clickOutside from '@/directives/click-ouside.js'
import { focus } from 'vue-focus'
-global.localVue = createLocalVue()
+import { loadAllRules } from '../src/validation-rules'
Object.keys(rules).forEach((rule) => {
extend(rule, {
@@ -23,6 +24,15 @@ Object.keys(rules).forEach((rule) => {
})
})
+const i18nMock = {
+ t: (identifier, values) => identifier,
+ n: (value, format) => value,
+}
+
+loadAllRules(i18nMock)
+
+global.localVue = createLocalVue()
+
global.localVue.use(BootstrapVue)
global.localVue.use(Vuex)
global.localVue.use(IconsPlugin)
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 65f3ff71d..7f689a72c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -13268,11 +13268,6 @@ vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-vue-bootstrap-toasts@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/vue-bootstrap-toasts/-/vue-bootstrap-toasts-1.0.7.tgz#111c38855941e8eb0538e21f41c173e2af67dd53"
- integrity sha512-JhurJOAwdNcINQ/QlT701sx0r447YTGpvtxtmZNC9pwDvEqp2I0Pyv15jS4neWwYHkA1gXB42nBsDRcWcj1hlg==
-
vue-bootstrap-typeahead@^0.2.6:
version "0.2.6"
resolved "https://registry.yarnpkg.com/vue-bootstrap-typeahead/-/vue-bootstrap-typeahead-0.2.6.tgz#8c1999a00bf4bf9fc906bae3a462482482cbc297"
@@ -13475,6 +13470,11 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
+vue-toasted@^1.1.28:
+ version "1.1.28"
+ resolved "https://registry.yarnpkg.com/vue-toasted/-/vue-toasted-1.1.28.tgz#dbabb83acc89f7a9e8765815e491d79f0dc65c26"
+ integrity sha512-UUzr5LX51UbbiROSGZ49GOgSzFxaMHK6L00JV8fir/CYNJCpIIvNZ5YmS4Qc8Y2+Z/4VVYRpeQL2UO0G800Raw==
+
vue2-transitions@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/vue2-transitions/-/vue2-transitions-0.2.3.tgz#69c9d75b1db05f231b80980c03459d68490ba27d"
diff --git a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
index a99881756..eb18bf8f7 100644
--- a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
@@ -123,13 +123,18 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params)
}
}
else if ("User.description" == name) {
- std::string str_val = validateString(value, "User.description", jsonErrorsArray);
+ std::string errorMessage = "User.description";
- if (str_val.size() > 0 && str_val != user_model->getDescription()) {
+ if (!value.isString()) {
+ errorMessage += " isn't a string";
+ jsonErrorsArray.add(errorMessage);
+ }
+ std::string str_val = value.toString();
+
+ if (str_val != user_model->getDescription()) {
user_model->setDescription(str_val);
extractet_values++;
}
-
}
else if ("User.disabled" == name) {
bool disabled;