Merge branch '50224-rails5-duplicate-key-value-violates-unique-constraint-index_gpg_signatures_on_commit_sha' into 'master'

Resolve "[Rails5] duplicate key value violates unique constraint "index_gpg_signatures_on_commit_sha""

Closes #50224

See merge request gitlab-org/gitlab-ce!24226

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb
index c559a301ca1..d56476adb05 100644
--- a/spec/features/projects/files/user_browses_lfs_files_spec.rb
+++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb
@@ -12,6 +12,7 @@ describe 'Projects > Files > User browses LFS files' do
     before do
       allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false)
       visit project_tree_path(project, 'lfs')
+      wait_for_requests
     end
 
     it 'is possible to see raw content of LFS pointer' do
@@ -26,10 +27,11 @@ describe 'Projects > Files > User browses LFS files' do
     end
   end
 
-  context 'when LFS is enabled' do
+  context 'when LFS is enabled', :js do
     before do
       allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true)
       visit project_tree_path(project, 'lfs')
+      wait_for_requests
     end
 
     it 'shows an LFS object' do