summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-01-08 11:05:59 +0000
committerSean McGivern <sean@gitlab.com>2019-01-08 12:04:59 +0000
commitdf5b7a660fa6594fd85afdaa3f205d821dfa8f5d (patch)
tree5c6ada37799857fdf1a6d3d01cd636446fbd5a1c
parent30d71ccf5df1d4bd71ce3646ec0f9954a3f68888 (diff)
downloadgitlab-ce-df5b7a660fa6594fd85afdaa3f205d821dfa8f5d.tar.gz
Wait for requests in LFS files spec
Without this, sometimes we will get a unique constraint violation about GPG signatures on MySQL.
-rw-r--r--spec/features/projects/files/user_browses_lfs_files_spec.rb4
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