Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-14 12:12:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-14 12:12:58 +0300
commit3cb798d80b6b5235b5f5febaaacef410e75c2963 (patch)
tree9568ccb5e3919feb3f61f1731d6d75ff581b56d1 /spec/frontend/members
parentd898994a1465412b024091e22ff59fd863e5ac2f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/members')
-rw-r--r--spec/frontend/members/mock_data.js1
-rw-r--r--spec/frontend/members/utils_spec.js16
2 files changed, 13 insertions, 4 deletions
diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index 06ccd107ce3..49c4c46c3ac 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -23,6 +23,7 @@ export const member = {
webUrl: 'https://gitlab.com/root',
avatarUrl: 'https://www.gravatar.com/avatar/4816142ef496f956a277bedf1a40607b?s=80&d=identicon',
blocked: false,
+ isBot: false,
twoFactorEnabled: false,
oncallSchedules: [{ name: 'schedule 1' }],
escalationPolicies: [{ name: 'policy 1' }],
diff --git a/spec/frontend/members/utils_spec.js b/spec/frontend/members/utils_spec.js
index b0c9459ff4f..0271483801c 100644
--- a/spec/frontend/members/utils_spec.js
+++ b/spec/frontend/members/utils_spec.js
@@ -1,5 +1,12 @@
import setWindowLocation from 'helpers/set_window_location_helper';
-import { DEFAULT_SORT, MEMBER_TYPES } from '~/members/constants';
+import {
+ DEFAULT_SORT,
+ MEMBER_TYPES,
+ I18N_USER_YOU,
+ I18N_USER_BLOCKED,
+ I18N_USER_BOT,
+ I188N_USER_2FA,
+} from '~/members/constants';
import {
generateBadges,
isGroup,
@@ -52,9 +59,10 @@ describe('Members Utils', () => {
it.each`
member | expected
- ${memberMock} | ${{ show: true, text: "It's you", variant: 'success' }}
- ${{ ...memberMock, user: { ...memberMock.user, blocked: true } }} | ${{ show: true, text: 'Blocked', variant: 'danger' }}
- ${member2faEnabled} | ${{ show: true, text: '2FA', variant: 'info' }}
+ ${memberMock} | ${{ show: true, text: I18N_USER_YOU, variant: 'success' }}
+ ${{ ...memberMock, user: { ...memberMock.user, blocked: true } }} | ${{ show: true, text: I18N_USER_BLOCKED, variant: 'danger' }}
+ ${{ ...memberMock, user: { ...memberMock.user, isBot: true } }} | ${{ show: true, text: I18N_USER_BOT, variant: 'muted' }}
+ ${member2faEnabled} | ${{ show: true, text: I188N_USER_2FA, variant: 'info' }}
`('returns expected output for "$expected.text" badge', ({ member, expected }) => {
expect(
generateBadges({ member, isCurrentUser: true, canManageMembers: true }),