Commit 87bf6fac authored by Kamil Trzciński's avatar Kamil Trzciński

Fix specs

parent 4099d5b3
......@@ -29,13 +29,6 @@ module EE
group_epic_path(entity.group, entity, *args)
end
def license_management_artifact_url(pipeline)
return unless pipeline
pipeline.present(current_user: current_user)
.downloadable_path_for_report_type(:license_management)
end
def license_management_api_url(project)
api_v4_projects_managed_licenses_path(id: project.id)
end
......
......@@ -27,7 +27,7 @@
- if pipeline.expose_license_management_data?
#js-tab-licenses.tab-pane
#js-licenses-app{ data: { license_head_path: license_management_artifact_url(pipeline),
#js-licenses-app{ data: { license_head_path: pipeline.downloadable_path_for_report_type(:license_management),
api_url: license_management_api_url(project),
license_management_settings_path: license_management_settings_path,
can_manage_licenses: can?(current_user, :admin_software_license_policy, project).to_s } }
......@@ -15,7 +15,7 @@ describe Projects::PipelinesController do
context 'with a sast artifact' do
before do
create(:ci_build, :legacy_sast, pipeline: pipeline)
create(:ee_ci_build, :legacy_sast, pipeline: pipeline)
end
context 'with feature enabled' do
......
......@@ -18,7 +18,7 @@ describe 'Pipeline', :js do
context 'with a sast artifact' do
before do
create(:ci_build, :legacy_sast, pipeline: pipeline)
create(:ee_ci_build, :legacy_sast, pipeline: pipeline)
visit security_project_pipeline_path(project, pipeline)
end
......
......@@ -28,11 +28,11 @@ describe Ci::Pipeline do
let(:pipeline_5) { create(:ci_pipeline_without_jobs, project: project) }
before do
create(:ci_build, :legacy_sast, pipeline: pipeline_1)
create(:ci_build, :legacy_dependency_scanning, pipeline: pipeline_2)
create(:ci_build, :legacy_container_scanning, pipeline: pipeline_3)
create(:ci_build, :legacy_dast, pipeline: pipeline_4)
create(:ci_build, :success, :artifacts, name: 'foobar', pipeline: pipeline_5)
create(:ee_ci_build, :legacy_sast, pipeline: pipeline_1)
create(:ee_ci_build, :legacy_dependency_scanning, pipeline: pipeline_2)
create(:ee_ci_build, :legacy_container_scanning, pipeline: pipeline_3)
create(:ee_ci_build, :legacy_dast, pipeline: pipeline_4)
create(:ee_ci_build, :success, :artifacts, name: 'foobar', pipeline: pipeline_5)
end
it "returns pipeline with security reports" do
......
......@@ -1503,8 +1503,8 @@ describe Project do
let(:pipeline_3) { create(:ci_pipeline_without_jobs, project: project) }
before do
create(:ci_build, :legacy_sast, pipeline: pipeline_1)
create(:ci_build, :legacy_sast, pipeline: pipeline_2)
create(:ee_ci_build, :legacy_sast, pipeline: pipeline_1)
create(:ee_ci_build, :legacy_sast, pipeline: pipeline_2)
end
it "returns the latest pipeline with security reports" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment