Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/frontend/vue_shared/components/members/table/role_dropdown_spec.js b/spec/frontend/vue_shared/components/members/table/role_dropdown_spec.js
index 1e47953a510..55ec7000693 100644
--- a/spec/frontend/vue_shared/components/members/table/role_dropdown_spec.js
+++ b/spec/frontend/vue_shared/components/members/table/role_dropdown_spec.js
@@ -30,6 +30,7 @@ describe('RoleDropdown', () => {
     wrapper = mount(RoleDropdown, {
       propsData: {
         member,
+        permissions: {},
         ...propsData,
       },
       localVue,
@@ -115,11 +116,11 @@ describe('RoleDropdown', () => {
 
         await nextTick();
 
-        expect(findDropdown().attributes('disabled')).toBe('disabled');
+        expect(findDropdown().props('disabled')).toBe(true);
 
         await waitForPromises();
 
-        expect(findDropdown().attributes('disabled')).toBeUndefined();
+        expect(findDropdown().props('disabled')).toBe(false);
       });
     });
   });