diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
commit | 42f41de46525ce0065f02ee07c1a79f5669526a0 (patch) | |
tree | 6e8151aae2628d2c2ce8942be1ba547afe0264b2 /spec/controllers | |
parent | 1eeef229aae5affdce415c2364858e8efc64f4b5 (diff) | |
download | gitlab-ce-42f41de46525ce0065f02ee07c1a79f5669526a0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/pipelines_controller_spec.rb | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 0368130118f..d9345cfaced 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -788,6 +788,28 @@ describe Projects::PipelinesController do expect(json_response['status']).to eq('error_parsing_report') end end + + context 'when test_report contains attachment and scope is with_attachment as a URL param' do + let(:pipeline) { create(:ci_pipeline, :with_test_reports_attachment, project: project) } + + it 'returns a test reports with attachment' do + get_test_report_json(scope: 'with_attachment') + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response["test_suites"]).to be_present + end + end + + context 'when test_report does not contain attachment and scope is with_attachment as a URL param' do + let(:pipeline) { create(:ci_pipeline, :with_test_reports, project: project) } + + it 'returns a test reports with empty values' do + get_test_report_json(scope: 'with_attachment') + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response["test_suites"]).to be_empty + end + end end context 'when feature is disabled' do @@ -805,13 +827,18 @@ describe Projects::PipelinesController do end end - def get_test_report_json - get :test_report, params: { + def get_test_report_json(**args) + params = { namespace_id: project.namespace, project_id: project, id: pipeline.id - }, - format: :json + } + + params.merge!(args) if args + + get :test_report, + params: params, + format: :json end def clear_controller_memoization |