diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 21:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 21:09:12 +0000 |
| commit | a8394884e257a9cc69090b97104749b590b064fe (patch) | |
| tree | 5763e70d70e90b9d6dc8aa4c28416d9db6afccc2 /spec/requests/api/internal | |
| parent | 36b0a5b87569e1b0e9f193630e50d1a376a71a4a (diff) | |
| download | gitlab-ce-a8394884e257a9cc69090b97104749b590b064fe.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/internal')
| -rw-r--r-- | spec/requests/api/internal/base_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb index 7d219954e9d..6f5eb3e992a 100644 --- a/spec/requests/api/internal/base_spec.rb +++ b/spec/requests/api/internal/base_spec.rb @@ -321,6 +321,8 @@ RSpec.describe API::Internal::Base do expect(json_response["status"]).to be_truthy expect(json_response["gl_project_path"]).to eq(project.wiki.full_path) expect(json_response["gl_repository"]).to eq("wiki-#{project.id}") + expect(json_response["gl_key_type"]).to eq("key") + expect(json_response["gl_key_id"]).to eq(key.id) expect(user.reload.last_activity_on).to be_nil end @@ -444,6 +446,8 @@ RSpec.describe API::Internal::Base do expect(json_response["status"]).to be_truthy expect(json_response["gl_repository"]).to eq("project-#{project.id}") expect(json_response["gl_project_path"]).to eq(project.full_path) + expect(json_response["gl_key_type"]).to eq("key") + expect(json_response["gl_key_id"]).to eq(key.id) expect(json_response["gitaly"]).not_to be_nil expect(json_response["gitaly"]["repository"]).not_to be_nil expect(json_response["gitaly"]["repository"]["storage_name"]).to eq(project.repository.gitaly_repository.storage_name) @@ -706,6 +710,8 @@ RSpec.describe API::Internal::Base do expect(response).to have_gitlab_http_status(:ok) expect(json_response["status"]).to be_truthy expect(json_response["gitaly"]).not_to be_nil + expect(json_response["gl_key_type"]).to eq("deploy_key") + expect(json_response["gl_key_id"]).to eq(key.id) expect(json_response["gitaly"]["repository"]).not_to be_nil expect(json_response["gitaly"]["repository"]["storage_name"]).to eq(project.repository.gitaly_repository.storage_name) expect(json_response["gitaly"]["repository"]["relative_path"]).to eq(project.repository.gitaly_repository.relative_path) |