summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-10 16:14:06 +0000
committerRegis <boudinot.regis@yahoo.com>2017-02-14 15:05:57 -0700
commit8b011af4c5669d64a8ae760327d7f5da5ade9885 (patch)
treed776b323083491ab53750b8d2b73e2a36a85fad1
parent1104ac1d5c1126813c7f9031e8bd24d2adadf19b (diff)
downloadgitlab-ce-8b011af4c5669d64a8ae760327d7f5da5ade9885.tar.gz
Merge branch 'issue_27855' into 'master'
Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135
-rw-r--r--spec/features/admin/admin_labels_spec.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/spec/features/admin/admin_labels_spec.rb b/spec/features/admin/admin_labels_spec.rb
index eaa42aad0a7..6d6c9165c83 100644
--- a/spec/features/admin/admin_labels_spec.rb
+++ b/spec/features/admin/admin_labels_spec.rb
@@ -35,15 +35,16 @@ RSpec.describe 'admin issues labels' do
it 'deletes all labels', js: true do
page.within '.labels' do
page.all('.btn-remove').each do |remove|
- wait_for_ajax
remove.click
+ wait_for_ajax
end
end
- page.within '.manage-labels-list' do
- expect(page).not_to have_content('bug')
- expect(page).not_to have_content('feature_label')
- end
+ wait_for_ajax
+
+ expect(page).to have_content("There are no labels yet")
+ expect(page).not_to have_content('bug')
+ expect(page).not_to have_content('feature_label')
end
end