diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-04 18:30:41 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-04 18:30:41 +0000 |
commit | 7a66cd688aea6bd7d1103d0024204a1470153975 (patch) | |
tree | d3f4b3774d2b8673209304705a23462414490586 /spec/features/projects | |
parent | 97a9a38b689e2ff7ab6dcd04d8bae65ef778e411 (diff) | |
parent | 136baeda508ddf46f6d91c03d4128b2ee890d205 (diff) | |
download | gitlab-ce-7a66cd688aea6bd7d1103d0024204a1470153975.tar.gz |
Merge branch 'deploy-keys-load-async' into 'master'
Deploy keys load async
Closes #29667
See merge request !10973
Diffstat (limited to 'spec/features/projects')
-rw-r--r-- | spec/features/projects/deploy_keys_spec.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/features/projects/deploy_keys_spec.rb b/spec/features/projects/deploy_keys_spec.rb index 0b997f130ea..06abfbbc86b 100644 --- a/spec/features/projects/deploy_keys_spec.rb +++ b/spec/features/projects/deploy_keys_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Project deploy keys', feature: true do +describe 'Project deploy keys', :js, :feature do let(:user) { create(:user) } let(:project) { create(:project_empty_repo) } @@ -17,9 +17,13 @@ describe 'Project deploy keys', feature: true do it 'removes association between project and deploy key' do visit namespace_project_settings_repository_path(project.namespace, project) - page.within '.deploy-keys' do - expect { click_on 'Remove' } - .to change { project.deploy_keys.count }.by(-1) + page.within(find('.deploy-keys')) do + expect(page).to have_selector('.deploy-keys li', count: 1) + + click_on 'Remove' + + expect(page).not_to have_selector('.fa-spinner', count: 0) + expect(page).to have_selector('.deploy-keys li', count: 0) end end end |