Commit df5b7a66 authored by Sean McGivern's avatar Sean McGivern

Wait for requests in LFS files spec

Without this, sometimes we will get a unique constraint violation about
GPG signatures on MySQL.
parent 30d71ccf
...@@ -12,6 +12,7 @@ describe 'Projects > Files > User browses LFS files' do ...@@ -12,6 +12,7 @@ describe 'Projects > Files > User browses LFS files' do
before do before do
allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false) allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false)
visit project_tree_path(project, 'lfs') visit project_tree_path(project, 'lfs')
wait_for_requests
end end
it 'is possible to see raw content of LFS pointer' do it 'is possible to see raw content of LFS pointer' do
...@@ -26,10 +27,11 @@ describe 'Projects > Files > User browses LFS files' do ...@@ -26,10 +27,11 @@ describe 'Projects > Files > User browses LFS files' do
end end
end end
context 'when LFS is enabled' do context 'when LFS is enabled', :js do
before do before do
allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true) allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true)
visit project_tree_path(project, 'lfs') visit project_tree_path(project, 'lfs')
wait_for_requests
end end
it 'shows an LFS object' do it 'shows an LFS object' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment