+
{{ $t('users.deactivated') }}
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index 502b86df..5d0e5f54 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -90,8 +90,8 @@
{{ $t('userProfile.status') }} |
{{ $t('userProfile.pending') }}
- {{ $t('userProfile.active') }}
- {{ $t('userProfile.deactivated') }}
+ {{ $t('userProfile.active') }}
+ {{ $t('userProfile.deactivated') }}
|
diff --git a/test/views/users/index.test.js b/test/views/users/index.test.js
index 0215e463..8c486cdf 100644
--- a/test/views/users/index.test.js
+++ b/test/views/users/index.test.js
@@ -154,11 +154,11 @@ describe('Users actions', () => {
await flushPromises()
const user = store.state.users.fetchedUsers[1]
- expect(user.deactivated).toBe(false)
+ expect(user.is_active).toBe(true)
wrapper.find(htmlElement(2, 4)).trigger('click')
const updatedUser = store.state.users.fetchedUsers[1]
- expect(updatedUser.deactivated).toBe(true)
+ expect(updatedUser.is_active).toBe(false)
done()
})
@@ -172,13 +172,13 @@ describe('Users actions', () => {
}
})
await flushPromises()
- expect(store.state.users.fetchedUsers[1].deactivated).toBe(false)
+ expect(store.state.users.fetchedUsers[1].is_active).toBe(true)
wrapper.find(htmlElement(2, 5)).trigger('click')
- store.dispatch('DeleteUsers', { users: [{ active: true, deactivated: false, id: '10', nickname: 'bob', local: false, external: true, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'] }] })
+ store.dispatch('DeleteUsers', { users: [{ active: true, is_active: true, id: '10', nickname: 'bob', local: false, external: true, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'] }] })
await flushPromises()
- expect(store.state.users.fetchedUsers[1].deactivated).toBe(true)
+ expect(store.state.users.fetchedUsers[1].is_active).toBe(false)
done()
})