Commit c662ec7b authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 7f17e99c 49f538c7
......@@ -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
......
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