Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/releases/components/release_block.vue

@@ -98,7 +98,7 @@ export default {
           <li v-for="link in assets.links" :key="link.name" class="append-bottom-8">
             <gl-link v-gl-tooltip.bottom :title="__('Download asset')" :href="link.url">
               <icon name="package" class="align-middle append-right-4 align-text-bottom" />
-              {{ link.name }}
+              {{ link.name }} <span v-if="link.external"> {{ __('(external source)') }}</span>
             </gl-link>
           </li>
         </ul>

locale/gitlab.pot

@@ -226,6 +226,9 @@ msgstr ""
 msgid "%{user_name} profile page"
 msgstr ""
 
+msgid "(external source)"
+msgstr ""
+
 msgid "+ %{count} more"
 msgstr ""
 

spec/features/projects/releases/user_views_releases_spec.rb

+require 'spec_helper'
+
+describe 'User views releases', :js do
+  let!(:project) { create(:project, :repository) }
+  let!(:release) { create(:release, project: project ) }
+  let!(:user) { create(:user) }
+
+  before do
+    project.add_maintainer(user)
+
+    gitlab_sign_in(user)
+  end
+
+  it 'sees the release' do
+    visit project_releases_path(project)
+
+    expect(page).to have_content(release.name)
+    expect(page).to have_content(release.tag)
+  end
+
+  context 'when there is a link as an asset' do
+    let!(:release_link) { create(:release_link, release: release, url: url ) }
+    let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
+
+    it 'sees the link' do
+      visit project_releases_path(project)
+
+      page.within('.js-assets-list') do
+        expect(page).to have_link release_link.name, href: release_link.url
+        expect(page).not_to have_content('(external source)')
+      end
+    end
+
+    context 'when url points to external resource' do
+      let(:url) { 'http://google.com/download' }
+
+      it 'sees that the link is external resource' do
+        visit project_releases_path(project)
+
+        page.within('.js-assets-list') do
+          expect(page).to have_content('(external source)')
+        end
+      end
+    end
+  end
+end

spec/javascripts/releases/components/release_block_spec.js

@@ -137,4 +137,16 @@ describe('Release block', () => {
   it('renders author avatar', () => {
     expect(vm.$el.querySelector('.user-avatar-link')).not.toBeNull();
   });
+
+  describe('external label', () => {
+    it('renders external label when link is external', () => {
+      expect(vm.$el.querySelector('.js-assets-list li a').textContent).toContain('external source');
+    });
+
+    it('does not render external label when link is not external', () => {
+      expect(vm.$el.querySelector('.js-assets-list li:nth-child(2) a').textContent).not.toContain(
+        'external source',
+      );
+    });
+  });
 });