Skip to content
代码片段 群组 项目
未验证 提交 1871decf 编辑于 作者: Océane Legrand's avatar Océane Legrand 提交者: GitLab
浏览文件

Exclude Conan package files with recipe revisions from package presenter

上级 d60b5815
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
...@@ -80,7 +80,7 @@ def map_package_files ...@@ -80,7 +80,7 @@ def map_package_files
def package_files def package_files
return unless @package return unless @package
@package.installable_package_files.preload_conan_file_metadata @package.installable_package_files.without_conan_recipe_revision.preload_conan_file_metadata
end end
strong_memoize_attr :package_files strong_memoize_attr :package_files
......
...@@ -41,6 +41,15 @@ ...@@ -41,6 +41,15 @@
end end
end end
shared_examples 'excludes files with recipe revisions' do
context 'when there are files with recipe revisions' do
let_it_be(:recipe_revision) { create(:conan_recipe_revision, package: package) }
let_it_be(:conan_package_file) { create(:conan_package_file, :conan_recipe_file, package: package, conan_recipe_revision: recipe_revision) }
it { is_expected.to eq(expected_result) }
end
end
describe '#recipe_urls' do describe '#recipe_urls' do
subject { presenter.recipe_urls } subject { presenter.recipe_urls }
...@@ -57,6 +66,8 @@ ...@@ -57,6 +66,8 @@
it { is_expected.to eq(expected_result) } it { is_expected.to eq(expected_result) }
it_behaves_like 'excludes files with recipe revisions'
context 'when there are multiple channels for the same package' do context 'when there are multiple channels for the same package' do
let(:conan_metadatum) { create(:conan_metadatum, package_channel: 'newest') } let(:conan_metadatum) { create(:conan_metadatum, package_channel: 'newest') }
let!(:newest_package) { create(:conan_package, name: package.name, version: package.version, project: project, conan_metadatum: conan_metadatum) } let!(:newest_package) { create(:conan_package, name: package.name, version: package.version, project: project, conan_metadatum: conan_metadatum) }
...@@ -97,6 +108,8 @@ ...@@ -97,6 +108,8 @@
end end
it { is_expected.to eq(expected_result) } it { is_expected.to eq(expected_result) }
it_behaves_like 'excludes files with recipe revisions'
end end
end end
...@@ -130,6 +143,8 @@ ...@@ -130,6 +143,8 @@
it { is_expected.to eq(expected_result) } it { is_expected.to eq(expected_result) }
it_behaves_like 'excludes files with recipe revisions'
context 'with package_scope of project' do context 'with package_scope of project' do
# #package_file_url checks for params[:id] # #package_file_url checks for params[:id]
let(:params) do let(:params) do
...@@ -198,6 +213,8 @@ ...@@ -198,6 +213,8 @@
it { is_expected.to eq(expected_result) } it { is_expected.to eq(expected_result) }
it_behaves_like 'excludes files with recipe revisions'
context 'when requested with invalid reference' do context 'when requested with invalid reference' do
let(:reference) { 'invalid' } let(:reference) { 'invalid' }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册