1 files changed, 32 insertions, 10 deletions

diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb
index 2d0b2e483c5..e6da2ce7cec 100644
--- a/spec/features/groups/members/request_access_spec.rb
+++ b/spec/features/groups/members/request_access_spec.rb
@@ -3,10 +3,15 @@
 require 'spec_helper'
 
 RSpec.describe 'Groups > Members > Request access', feature_category: :groups_and_projects do
+  include Spec::Support::Helpers::ModalHelpers
+
   let(:user) { create(:user) }
   let(:owner) { create(:user) }
   let(:group) { create(:group, :public) }
   let!(:project) { create(:project, :private, namespace: group) }
+  let(:more_actions_dropdown) do
+    find('[data-testid="groups-projects-more-actions-dropdown"] .gl-new-dropdown-custom-toggle')
+  end
 
   before do
     group.add_owner(owner)
@@ -14,15 +19,19 @@ RSpec.describe 'Groups > Members > Request access', feature_category: :groups_an
     visit group_path(group)
   end
 
-  it 'request access feature is disabled' do
+  it 'request access feature is disabled', :js do
     group.update!(request_access_enabled: false)
     visit group_path(group)
+    more_actions_dropdown.click
 
     expect(page).not_to have_content 'Request Access'
   end
 
-  it 'user can request access to a group' do
-    perform_enqueued_jobs { click_link 'Request Access' }
+  it 'user can request access to a group', :js do
+    perform_enqueued_jobs do
+      more_actions_dropdown.click
+      click_link 'Request Access'
+    end
 
     expect(ActionMailer::Base.deliveries.last.to).to eq [owner.notification_email_or_default]
     expect(ActionMailer::Base.deliveries.last.subject).to match "Request to join the #{group.name} group"
@@ -30,18 +39,26 @@ RSpec.describe 'Groups > Members > Request access', feature_category: :groups_an
     expect(group.requesters.exists?(user_id: user)).to be_truthy
     expect(page).to have_content 'Your request for access has been queued for review.'
 
+    more_actions_dropdown.click
+
     expect(page).to have_content 'Withdraw Access Request'
     expect(page).not_to have_content 'Leave group'
   end
 
-  it 'user does not see private projects' do
-    perform_enqueued_jobs { click_link 'Request Access' }
+  it 'user does not see private projects', :js do
+    perform_enqueued_jobs do
+      more_actions_dropdown.click
+      click_link 'Request Access'
+    end
 
     expect(page).not_to have_content project.name
   end
 
-  it 'user does not see group in the Dashboard > Groups page' do
-    perform_enqueued_jobs { click_link 'Request Access' }
+  it 'user does not see group in the Dashboard > Groups page', :js do
+    perform_enqueued_jobs do
+      more_actions_dropdown.click
+      click_link 'Request Access'
+    end
 
     visit dashboard_groups_path
 
@@ -49,6 +66,7 @@ RSpec.describe 'Groups > Members > Request access', feature_category: :groups_an
   end
 
   it 'user is not listed in the group members page', :js do
+    more_actions_dropdown.click
     click_link 'Request Access'
 
     expect(group.requesters.exists?(user_id: user)).to be_truthy
@@ -63,20 +81,24 @@ RSpec.describe 'Groups > Members > Request access', feature_category: :groups_an
     end
   end
 
-  it 'user can withdraw its request for access' do
+  it 'user can withdraw its request for access', :js do
+    more_actions_dropdown.click
     click_link 'Request Access'
 
     expect(group.requesters.exists?(user_id: user)).to be_truthy
 
+    more_actions_dropdown.click
     click_link 'Withdraw Access Request'
+    accept_gl_confirm
 
-    expect(group.requesters.exists?(user_id: user)).to be_falsey
     expect(page).to have_content 'Your access request to the group has been withdrawn.'
+    expect(group.requesters.exists?(user_id: user)).to be_falsey
   end
 
-  it 'member does not see the request access button' do
+  it 'member does not see the request access button', :js do
     group.add_owner(user)
     visit group_path(group)
+    more_actions_dropdown.click
 
     expect(page).not_to have_content 'Request Access'
   end