summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-04-10 10:31:00 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-04-10 10:31:00 +0000
commitc0601403adc1d48aa0cca1df37a7233e6d7e4481 (patch)
tree074fe5a54842ac34378736d75235ae4e373300ad /spec
parentde24e9b877581fd02076a72059e75f9e460cac12 (diff)
parent6d7876c1287a105e447aeea727e43431e10f9f53 (diff)
downloadgitlab-ce-c0601403adc1d48aa0cca1df37a7233e6d7e4481.tar.gz
Merge branch 'quarantine-flaky-specs' into 'master'
Quarantine a flaky spec in spec/features/issues/user_creates_branch_and_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!27202
Diffstat (limited to 'spec')
-rw-r--r--spec/features/issues/user_creates_branch_and_merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 0a006011c89..cf665cff262 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -139,7 +139,7 @@ describe 'User creates branch and merge request on issue page', :js do
visit project_issue_path(project, issue)
end
- it 'disables the create branch button' do
+ it 'disables the create branch button', :quarantine do
expect(page).to have_css('.create-mr-dropdown-wrap .unavailable:not(.hidden)')
expect(page).to have_css('.create-mr-dropdown-wrap .available.hidden', visible: false)
expect(page).to have_content /Related merge requests/