Commit d02059dd authored by Mario de la Ossa's avatar Mario de la Ossa

BlobViewer::PackageJson - if private link to homepage

parent b0378939
...@@ -21,9 +21,7 @@ module BlobViewer ...@@ -21,9 +21,7 @@ module BlobViewer
end end
def package_url def package_url
return nil if private? private? ? homepage : npm_url
"https://www.npmjs.com/package/#{package_name}"
end end
private private
...@@ -31,5 +29,13 @@ module BlobViewer ...@@ -31,5 +29,13 @@ module BlobViewer
def private? def private?
!!json_data['private'] !!json_data['private']
end end
def homepage
json_data['homepage']
end
def npm_url
"https://www.npmjs.com/package/#{package_name}"
end
end end
end end
--- ---
title: Do not generate links for private NPM modules in blob view title: Do not generate NPM links for private NPM modules in blob view
merge_request: 16002 merge_request: 16002
author: Mario de la Ossa author: Mario de la Ossa
type: added type: added
...@@ -45,7 +45,8 @@ describe BlobViewer::PackageJson do ...@@ -45,7 +45,8 @@ describe BlobViewer::PackageJson do
{ {
"name": "module-name", "name": "module-name",
"version": "10.3.1", "version": "10.3.1",
"private": true "private": true,
"homepage": "myawesomepackage.com"
} }
SPEC SPEC
end end
...@@ -53,10 +54,10 @@ describe BlobViewer::PackageJson do ...@@ -53,10 +54,10 @@ describe BlobViewer::PackageJson do
subject { described_class.new(blob) } subject { described_class.new(blob) }
describe '#package_url' do describe '#package_url' do
it 'returns nil' do it 'returns homepage if any' do
expect(subject).to receive(:prepare!) expect(subject).to receive(:prepare!)
expect(subject.package_url).to be_nil expect(subject.package_url).to eq('myawesomepackage.com')
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