summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-08-16 09:46:19 +0000
committerNick Thomas <nick@gitlab.com>2019-08-16 09:46:19 +0000
commit0b3fbffab096854fac9c32a0c2ccaa6978f988be (patch)
tree5a2bf1306e2fdb20278f20a3457e2736a6848d5a
parent7b2c2573cef311c243216eb25fb9960e3bcdd8e6 (diff)
parent3d045ea84f0c04355b9fafc3536b825768841ac3 (diff)
downloadgitlab-ce-0b3fbffab096854fac9c32a0c2ccaa6978f988be.tar.gz
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
-rw-r--r--spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
index c19e46da913..6bd569e5ee2 100644
--- a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
+++ b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
@@ -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