Merge branch 'dm-fix-quarantined-spec' into 'master'

Fix quarantined spec by waiting for requests

Closes #65329

See merge request gitlab-org/gitlab-ce!31862
This commit is contained in:
Nick Thomas 2019-08-16 09:46:19 +00:00
commit 0b3fbffab0

View file

@ -3,18 +3,15 @@
require 'spec_helper'
# This is a regression test for https://gitlab.com/gitlab-org/gitlab-ce/issues/37569
# Quarantine: https://gitlab.com/gitlab-org/gitlab-ce/issues/65329
describe 'Projects > Files > User browses a tree with a folder containing only a folder', :quarantine do
describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js do
let(:project) { create(:project, :empty_repo) }
let(:user) { project.owner }
before do
# We need to disable the tree.flat_path provided by Gitaly to reproduce the issue
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
project.repository.create_dir(user, 'foo/bar', branch_name: 'master', message: 'Add the foo/bar folder')
sign_in(user)
visit(project_tree_path(project, project.repository.root_ref))
wait_for_requests
end
it 'shows the nested folder on a single row' do