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

1 files changed, 5 insertions, 2 deletions

diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index 4326700bab1..84ea9495f08 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -12,6 +12,9 @@ RSpec.describe 'Profile account page', :js do
   describe 'when I delete my account' do
     before do
       visit profile_account_path
+
+      # Scroll page to the bottom to make Delete account button visible
+      execute_script('window.scrollTo(0, document.body.scrollHeight)')
     end
 
     it { expect(page).to have_content('Delete account') }
@@ -101,10 +104,10 @@ RSpec.describe 'Profile account page', :js do
     it 'changes my username' do
       fill_in 'username-change-input', with: 'new-username'
 
-      page.find('[data-target="#username-change-confirmation-modal"]').click
+      page.find('[data-testid="username-change-confirmation-modal"]').click
 
       page.within('.modal') do
-        find('.js-modal-primary-action').click
+        find('.js-modal-action-primary').click
       end
 
       expect(page).to have_content('new-username')