diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-28 20:59:20 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-28 20:59:20 +0100 |
commit | 357ab10da34102499a32ad569d9b58c8d5b97d17 (patch) | |
tree | 00fd99161d55174097298604dc1222dd836f251e /spec | |
parent | 0b7824d433ec5029da17114389f425f816b7be74 (diff) | |
download | gitlab-ce-357ab10da34102499a32ad569d9b58c8d5b97d17.tar.gz |
Fixed some spinach & rspec tests
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/deploy_keys_spec.rb | 12 | ||||
-rw-r--r-- | spec/serializers/deploy_key_entity_spec.rb | 9 |
2 files changed, 16 insertions, 5 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 diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb index cc3fb193f1b..e73fbe190ca 100644 --- a/spec/serializers/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_key_entity_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe DeployKeyEntity do + include RequestAwareEntity + let(:user) { create(:user) } let(:project) { create(:empty_project, :internal)} let(:project_private) { create(:empty_project, :private)} @@ -22,7 +24,12 @@ describe DeployKeyEntity do created_at: deploy_key.created_at, updated_at: deploy_key.updated_at, projects: [ - { id: project.id, name: project.name, full_path: project.full_path, full_name: project.full_name } + { + id: project.id, + name: project.name, + full_path: namespace_project_path(project.namespace, project), + full_name: project.full_name + } ] } |