Commit 5b6ebf27 authored by Nick Kipling's avatar Nick Kipling

Applying maintainer feedback

Used shortcut for dependency_links map function
Updated tests to use let for dependency_links
Updated tests by merging with let
parent b8ed46c7
...@@ -22,7 +22,7 @@ module Packages ...@@ -22,7 +22,7 @@ module Packages
package_detail[:maven_metadatum] = @package.maven_metadatum if @package.maven_metadatum package_detail[:maven_metadatum] = @package.maven_metadatum if @package.maven_metadatum
package_detail[:nuget_metadatum] = @package.nuget_metadatum if @package.nuget_metadatum package_detail[:nuget_metadatum] = @package.nuget_metadatum if @package.nuget_metadatum
package_detail[:dependency_links] = @package.dependency_links.map { |dl| build_dependency_links(dl) } 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 package_detail[:pipeline] = build_pipeline_info(@package.build_info.pipeline) if @package.build_info
package_detail package_detail
......
...@@ -33,6 +33,7 @@ describe ::Packages::Detail::PackagePresenter do ...@@ -33,6 +33,7 @@ describe ::Packages::Detail::PackagePresenter do
} }
} }
end end
let!(:dependency_links) { [] }
let!(:expected_package_details) do let!(:expected_package_details) do
{ {
id: package.id, id: package.id,
...@@ -44,17 +45,16 @@ describe ::Packages::Detail::PackagePresenter do ...@@ -44,17 +45,16 @@ describe ::Packages::Detail::PackagePresenter do
tags: package.tags.as_json, tags: package.tags.as_json,
updated_at: package.updated_at, updated_at: package.updated_at,
version: package.version, version: package.version,
dependency_links: [] dependency_links: dependency_links
} }
end end
context 'detail_view' do context 'detail_view' do
context 'with build_info' do context 'with build_info' do
let_it_be(:package) { create(:npm_package, :with_build, project: project) } let_it_be(:package) { create(:npm_package, :with_build, project: project) }
let(:expected_package_details) { super().merge(pipeline: pipeline_info) }
it 'returns details with pipeline' do it 'returns details with pipeline' do
expected_package_details[:pipeline] = pipeline_info
expect(presenter.detail_view).to eq expected_package_details expect(presenter.detail_view).to eq expected_package_details
end end
end end
...@@ -70,10 +70,9 @@ describe ::Packages::Detail::PackagePresenter do ...@@ -70,10 +70,9 @@ describe ::Packages::Detail::PackagePresenter do
context 'with nuget_metadatum' do context 'with nuget_metadatum' do
let_it_be(:package) { create(:nuget_package, project: project) } let_it_be(:package) { create(:nuget_package, project: project) }
let_it_be(:nuget_metadatum) { create(:nuget_metadatum, package: package) } let_it_be(:nuget_metadatum) { create(:nuget_metadatum, package: package) }
let(:expected_package_details) { super().merge(nuget_metadatum: nuget_metadatum) }
it 'returns nuget_metadatum' do it 'returns nuget_metadatum' do
expected_package_details[:nuget_metadatum] = nuget_metadatum
expect(presenter.detail_view).to eq expected_package_details expect(presenter.detail_view).to eq expected_package_details
end end
end end
...@@ -89,10 +88,9 @@ describe ::Packages::Detail::PackagePresenter do ...@@ -89,10 +88,9 @@ describe ::Packages::Detail::PackagePresenter do
target_framework: nuget_dependency.target_framework target_framework: nuget_dependency.target_framework
} }
end end
let_it_be(:dependency_links) { [expected_link] }
it 'returns the correct dependency link' do it 'returns the correct dependency link' do
expected_package_details[:dependency_links] = [expected_link]
expect(presenter.detail_view).to eq expected_package_details expect(presenter.detail_view).to eq expected_package_details
end end
end end
......
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