Commit 0eda4548 authored by Tetiana Chupryna's avatar Tetiana Chupryna

Replace usage of dependency_list feature

parent 81132171
...@@ -72,7 +72,7 @@ module EE ...@@ -72,7 +72,7 @@ module EE
end end
def collect_dependency_list_reports!(dependency_list_report) def collect_dependency_list_reports!(dependency_list_report)
if project.feature_available?(:dependency_list) if project.feature_available?(:dependency_scanning)
dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha) dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha)
each_report(::Ci::JobArtifact::DEPENDENCY_LIST_REPORT_FILE_TYPES) do |file_type, blob| each_report(::Ci::JobArtifact::DEPENDENCY_LIST_REPORT_FILE_TYPES) do |file_type, blob|
...@@ -84,7 +84,7 @@ module EE ...@@ -84,7 +84,7 @@ module EE
end end
def collect_licenses_for_dependency_list!(dependency_list_report) def collect_licenses_for_dependency_list!(dependency_list_report)
if project.feature_available?(:dependency_list) if project.feature_available?(:dependency_scanning)
dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha) dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha)
each_report(::Ci::JobArtifact::LICENSE_MANAGEMENT_REPORT_FILE_TYPES) do |file_type, blob| each_report(::Ci::JobArtifact::LICENSE_MANAGEMENT_REPORT_FILE_TYPES) do |file_type, blob|
......
...@@ -240,7 +240,7 @@ describe Ci::Build do ...@@ -240,7 +240,7 @@ describe Ci::Build do
context 'with available licensed feature' do context 'with available licensed feature' do
before do before do
stub_licensed_features(dependency_list: true) stub_licensed_features(dependency_scanning: true)
end end
it 'parses blobs and add the results to the report' do it 'parses blobs and add the results to the report' do
...@@ -277,7 +277,7 @@ describe Ci::Build do ...@@ -277,7 +277,7 @@ describe Ci::Build do
context 'with available licensed feature' do context 'with available licensed feature' do
before do before do
stub_licensed_features(dependency_list: true) stub_licensed_features(dependency_scanning: true)
end end
it 'parses blobs and add found license' do it 'parses blobs and add found license' do
......
...@@ -277,7 +277,7 @@ describe Ci::Pipeline do ...@@ -277,7 +277,7 @@ describe Ci::Pipeline do
subject { pipeline.dependency_list_report } subject { pipeline.dependency_list_report }
before do before do
stub_licensed_features(dependency_list: true) stub_licensed_features(dependency_scanning: true)
end end
context 'when pipeline has a build with dependency list reports' do context 'when pipeline has a build with dependency list 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