Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6ca3def0
Commit
6ca3def0
authored
Aug 17, 2020
by
Steve Abrams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing conan_metadatum to package presenter
parent
0894c467
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/presenters/packages/detail/package_presenter.rb
app/presenters/packages/detail/package_presenter.rb
+1
-0
changelogs/unreleased/232998-package-metadata.yml
changelogs/unreleased/232998-package-metadata.yml
+5
-0
spec/presenters/packages/detail/package_presenter_spec.rb
spec/presenters/packages/detail/package_presenter_spec.rb
+9
-0
No files found.
app/presenters/packages/detail/package_presenter.rb
View file @
6ca3def0
...
...
@@ -23,6 +23,7 @@ module Packages
package_detail
[
:maven_metadatum
]
=
@package
.
maven_metadatum
if
@package
.
maven_metadatum
package_detail
[
:nuget_metadatum
]
=
@package
.
nuget_metadatum
if
@package
.
nuget_metadatum
package_detail
[
:composer_metadatum
]
=
@package
.
composer_metadatum
if
@package
.
composer_metadatum
package_detail
[
:conan_metadatum
]
=
@package
.
conan_metadatum
if
@package
.
conan_metadatum
package_detail
[
:dependency_links
]
=
@package
.
dependency_links
.
map
(
&
method
(
:build_dependency_links
))
package_detail
[
:pipeline
]
=
build_pipeline_info
(
@package
.
build_info
.
pipeline
)
if
@package
.
build_info
...
...
changelogs/unreleased/232998-package-metadata.yml
0 → 100644
View file @
6ca3def0
---
title
:
Fix Conan recipe display in the package details page
merge_request
:
39643
author
:
type
:
fixed
spec/presenters/packages/detail/package_presenter_spec.rb
View file @
6ca3def0
...
...
@@ -74,6 +74,15 @@ RSpec.describe ::Packages::Detail::PackagePresenter do
end
end
context
'with conan metadata'
do
let
(
:package
)
{
create
(
:conan_package
,
project:
project
)
}
let
(
:expected_package_details
)
{
super
().
merge
(
conan_metadatum:
package
.
conan_metadatum
)
}
it
'returns conan_metadatum'
do
expect
(
presenter
.
detail_view
).
to
eq
expected_package_details
end
end
context
'with composer metadata'
do
let
(
:package
)
{
create
(
:composer_package
,
:with_metadatum
,
sha:
'123'
,
project:
project
)
}
let
(
:expected_package_details
)
{
super
().
merge
(
composer_metadatum:
package
.
composer_metadatum
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment