diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
| commit | 7ec89692858a207691489aed566af7785a923895 (patch) | |
| tree | dfad4c6ea77f322b68db974102c5ec54fe0366f6 /spec/features/admin | |
| parent | 2f62af684e127010cffd81e027f469dcde3bc9b2 (diff) | |
| parent | 78de1c059ac588df4ba1ef352b28e5b1c6102804 (diff) | |
| download | gitlab-ce-7ec89692858a207691489aed566af7785a923895.tar.gz | |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'spec/features/admin')
| -rw-r--r-- | spec/features/admin/admin_labels_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/admin/admin_labels_spec.rb b/spec/features/admin/admin_labels_spec.rb index fa3d9ee25c0..a9251db13e5 100644 --- a/spec/features/admin/admin_labels_spec.rb +++ b/spec/features/admin/admin_labels_spec.rb @@ -34,11 +34,11 @@ RSpec.describe 'admin issues labels' do page.within '.labels' do page.all('.btn-remove').each do |remove| remove.click - wait_for_ajax + wait_for_requests end end - wait_for_ajax + wait_for_requests expect(page).to have_content("There are no labels yet") expect(page).not_to have_content('bug') diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index c5b1ef1295c..12cf59f42b0 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -277,7 +277,7 @@ describe "Admin::Users", feature: true do page.within(first('.group_member')) do find('.btn-remove').click end - wait_for_ajax + wait_for_requests expect(page).not_to have_selector('.group_member') end |