Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 22 deletions

diff --git a/qa/qa/resource/members.rb b/qa/qa/resource/members.rb
index adb5acc77f1..7f31808d2ff 100644
--- a/qa/qa/resource/members.rb
+++ b/qa/qa/resource/members.rb
@@ -31,14 +31,10 @@ module QA
         parse_body(api_get_from("#{api_members_path}/all"))
       end
 
-      def find_direct_member(username)
+      def find_member(username)
         list_members.find { |member| member[:username] == username }
       end
 
-      def find_direct_or_inherited_member(username)
-        list_all_members.find { |member| member[:username] == username }
-      end
-
       def invite_group(group, access_level = AccessLevel::GUEST)
         Support::Retrier.retry_until do
           QA::Runtime::Logger.info(%(Sharing #{self.class.name} with #{group.name}))
diff --git a/qa/qa/specs/features/api/1_manage/user_inherited_access_spec.rb b/qa/qa/specs/features/api/1_manage/user_inherited_access_spec.rb
index af78b112be4..124b6c9cd44 100644
--- a/qa/qa/specs/features/api/1_manage/user_inherited_access_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/user_inherited_access_spec.rb
@@ -39,11 +39,6 @@ module QA
 
         before do
           parent_group.add_member(parent_group_user)
-
-          # Due to the async nature of project authorization refreshes,
-          # we wait to confirm the user has been added as a member and
-          # their access level has been updated before proceeding with the test
-          wait_for_membership_update(parent_group_user, sub_group_project, Resource::Members::AccessLevel::DEVELOPER)
         end
 
         it(
@@ -182,16 +177,6 @@ module QA
           sub_group_user.remove_via_api!
         end
       end
-
-      private
-
-      def wait_for_membership_update(user, project, access_level)
-        Support::Retrier.retry_until(sleep_interval: 1, message: 'Waiting for user membership to be updated') do
-          found_member = project.reload!.find_direct_or_inherited_member(user.username)
-
-          found_member && found_member.fetch(:access_level) == access_level
-        end
-      end
     end
   end
 end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/group_member_access_request_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/group_member_access_request_spec.rb
index 62f596c8915..3a84646977f 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/group_member_access_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/group_member_access_request_spec.rb
@@ -65,7 +65,7 @@ module QA
 
           it 'adds user to the group',
              testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386792' do
-            found_member = group.reload!.find_direct_member(user.username)
+            found_member = group.reload!.find_member(user.username)
 
             expect(found_member).not_to be_nil
             expect(found_member.fetch(:access_level))
@@ -82,7 +82,7 @@ module QA
 
           it 'does not add user to the group',
              testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386793' do
-            found_member = group.reload!.find_direct_member(user.username)
+            found_member = group.reload!.find_member(user.username)
 
             expect(found_member).to be_nil
           end