diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 08:27:41 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 08:27:41 +0000 |
commit | 121b90aa69946a3ecdb9f1d60eb7d0debeb414f0 (patch) | |
tree | 9b44beb908a51a2b23bd01bfa55835010fc4a7a3 /spec/serializers | |
parent | fd0823d6e49b0d0a4819f54f54fa034479c6884b (diff) | |
parent | 250dbecd28473ce256e46f7233c14acb8c02a29d (diff) | |
download | gitlab-ce-121b90aa69946a3ecdb9f1d60eb7d0debeb414f0.tar.gz |
Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into 'master'
Pending delete projects should now show in deploy keys
Closes #35338
See merge request !13088
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/deploy_key_entity_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb index 9620f9665cf..8149de869f1 100644 --- a/spec/serializers/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_key_entity_spec.rb @@ -2,13 +2,15 @@ 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)} + let!(:project_pending_delete) { create(:empty_project, :internal, pending_delete: true) } let(:deploy_key) { create(:deploy_key) } let!(:deploy_key_internal) { create(:deploy_keys_project, project: project, deploy_key: deploy_key) } let!(:deploy_key_private) { create(:deploy_keys_project, project: project_private, deploy_key: deploy_key) } + let!(:deploy_key_pending_delete) { create(:deploy_keys_project, project: project_pending_delete, deploy_key: deploy_key) } let(:entity) { described_class.new(deploy_key, user: user) } |