summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-10 16:14:06 +0000
committerRémy Coutable <remy@rymai.me>2017-02-10 16:14:06 +0000
commit4a9258371bf25ef0ce8687c3d7750d06b4337fe4 (patch)
treeb33c94ec8e38908aaf7e653467d303788157b22f
parent14c58e959ef10e9ec6ed49c55d911e42330bf1f1 (diff)
parentd1ecbd6ce8c3dac8228397259a3fd41cbb1577f8 (diff)
downloadgitlab-ce-4a9258371bf25ef0ce8687c3d7750d06b4337fe4.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