Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 0 deletions

diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index 7ab642c84a7..161e96c0c48 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -127,6 +127,7 @@ export const dataAttribute = JSON.stringify({
     pagination: paginationData,
     member_path: '/groups/foo-bar/-/group_members/:id',
     ldap_override_path: '/groups/ldap-group/-/group_members/:id/override',
+    disable_two_factor_path: '/groups/ldap-group/-/two_factor_auth',
   },
   source_id: 234,
   can_manage_members: true,
diff --git a/spec/frontend/members/utils_spec.js b/spec/frontend/members/utils_spec.js
index 9d52c789db2..9f200324c02 100644
--- a/spec/frontend/members/utils_spec.js
+++ b/spec/frontend/members/utils_spec.js
@@ -16,6 +16,7 @@ import {
   canRemoveBlockedByLastOwner,
   canResend,
   canUpdate,
+  canDisableTwoFactor,
   canOverride,
   parseSortParam,
   buildSortHref,
@@ -163,6 +164,19 @@ describe('Members Utils', () => {
     });
   });
 
+  describe('canDisableTwoFactor', () => {
+    it.each`
+      member                                               | expected
+      ${{ ...memberMock, canGetTwoFactorDisabled: true }}  | ${false}
+      ${{ ...memberMock, canGetTwoFactorDisabled: false }} | ${false}
+    `(
+      'returns $expected for members whose two factor authentication can be disabled',
+      ({ member, expected }) => {
+        expect(canDisableTwoFactor(member)).toBe(expected);
+      },
+    );
+  });
+
   describe('canOverride', () => {
     it('returns `false`', () => {
       expect(canOverride(memberMock)).toBe(false);