Merge branch...

Merge branch '12767-broken-master-ee-spec-features-merge_request-user_approves_with_password_spec-rb' into 'master'

Resolve flaky test in user_approves_with_password_spec.rb

Closes #12767

See merge request gitlab-org/gitlab-ee!14640

ee/spec/features/merge_request/user_approves_with_password_spec.rb

@@ -38,8 +38,9 @@ describe 'Merge request > User approves with password', :js do
     page.within('.js-mr-approvals-modal') do
       expect(page).to have_text('Approval password is invalid.')
       click_button 'Cancel'
-      expect(page).not_to have_text('Approved by')
     end
+
+    expect(page).not_to have_text('Approved by')
   end
 end