Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/api/protected_branches_spec.rb')
-rw-r--r--spec/requests/api/protected_branches_spec.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/spec/requests/api/protected_branches_spec.rb b/spec/requests/api/protected_branches_spec.rb
index 04d5f7ac20a..b79cff5a905 100644
--- a/spec/requests/api/protected_branches_spec.rb
+++ b/spec/requests/api/protected_branches_spec.rb
@@ -121,7 +121,18 @@ RSpec.describe API::ProtectedBranches, feature_category: :source_code_management
get api(route, user)
expect(json_response['push_access_levels']).to include(
- a_hash_including('access_level_description' => 'Deploy key', 'deploy_key_id' => deploy_key.id)
+ a_hash_including('access_level_description' => deploy_key.title, 'deploy_key_id' => deploy_key.id)
+ )
+ end
+ end
+
+ context 'when a deploy key is not present' do
+ it 'returns null deploy key field' do
+ create(:protected_branch_push_access_level, protected_branch: protected_branch)
+ get api(route, user)
+
+ expect(json_response['push_access_levels']).to include(
+ a_hash_including('deploy_key_id' => nil)
)
end
end