Merge branch '33028-event-tag-links' into 'master'

Fix tags in the Activity tab not being clickable

Closes #33028

See merge request gitlab-org/gitlab-ce!15996

app/views/events/event/_push.html.haml

@@ -7,7 +7,8 @@
   %span.pushed #{event.action_name} #{event.ref_type}
   %strong
     - commits_link = project_commits_path(project, event.ref_name)
-    = link_to_if project.repository.branch_exists?(event.ref_name), event.ref_name, commits_link, class: 'ref-name'
+    - should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name)
+    = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name'
 
   = render "events/event_scope", event: event
 

changelogs/unreleased/33028-event-tag-links.yml

@@ -0,0 +1,5 @@
+---
+title: Fix tags in the Activity tab not being clickable
+merge_request: 15996
+author: Mario de la Ossa
+type: fixed

spec/views/events/event/_push.html.haml_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe 'events/event/_push.html.haml' do
+  let(:event) { build_stubbed(:push_event) }
+
+  context 'with a branch' do
+    let(:payload) { build_stubbed(:push_event_payload, event: event) }
+
+    before do
+      allow(event).to receive(:push_event_payload).and_return(payload)
+    end
+
+    it 'links to the branch' do
+      allow(event.project.repository).to receive(:branch_exists?).with(event.ref_name).and_return(true)
+      link = project_commits_path(event.project, event.ref_name)
+
+      render partial: 'events/event/push', locals: { event: event }
+
+      expect(rendered).to have_link(event.ref_name, href: link)
+    end
+
+    context 'that has been deleted' do
+      it 'does not link to the branch' do
+        render partial: 'events/event/push', locals: { event: event }
+
+        expect(rendered).not_to have_link(event.ref_name)
+      end
+    end
+  end
+
+  context 'with a tag' do
+    let(:payload) { build_stubbed(:push_event_payload, event: event, ref_type: :tag, ref: 'v0.1.0') }
+
+    before do
+      allow(event).to receive(:push_event_payload).and_return(payload)
+    end
+
+    it 'links to the tag' do
+      allow(event.project.repository).to receive(:tag_exists?).with(event.ref_name).and_return(true)
+      link = project_commits_path(event.project, event.ref_name)
+
+      render partial: 'events/event/push', locals: { event: event }
+
+      expect(rendered).to have_link(event.ref_name, href: link)
+    end
+
+    context 'that has been deleted' do
+      it 'does not link to the tag' do
+        render partial: 'events/event/push', locals: { event: event }
+
+        expect(rendered).not_to have_link(event.ref_name)
+      end
+    end
+  end
+end