Skip to content
Snippets Groups Projects
Commit 0759db80 authored by Toon Claes's avatar Toon Claes
Browse files

Move user_link to generic UsersHelper

Make the user_link helper more generic to be used for objects other
than pipelines.
parent a57890bc
No related branches found
No related tags found
No related merge requests found
module PipelinesHelper
def pipeline_user_avatar(pipeline)
user_avatar(user: pipeline.user, size: 24)
end
def pipeline_user_link(pipeline)
link_to(pipeline.user.name, user_path(pipeline.user),
title: pipeline.user.email,
class: 'has-tooltip commit-committer-link')
end
end
module UsersHelper
def user_link(user)
link_to(user.name, user_path(user),
title: user.email,
class: 'has-tooltip commit-committer-link')
end
end
Loading
Loading
@@ -5,8 +5,8 @@
triggered #{time_ago_with_tooltip(@pipeline.created_at)}
- if @pipeline.user
by
= pipeline_user_avatar(@pipeline)
= pipeline_user_link(@pipeline)
= user_avatar(user: @pipeline.user, size: 24)
= user_link(@pipeline.user)
.header-action-buttons
- if can?(current_user, :update_pipeline, @pipeline.project)
- if @pipeline.retryable?
Loading
Loading
require 'rails_helper'
 
describe PipelinesHelper do
describe AvatarsHelper do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id, user: user) }
 
describe '#pipeline_user_avatar' do
subject { helper.pipeline_user_avatar(pipeline) }
describe '#user_avatar' do
subject { helper.user_avatar(user: user) }
 
it "links to the user's profile" do
is_expected.to include("href=\"#{user_path(user)}\"")
Loading
Loading
@@ -17,19 +15,7 @@ describe PipelinesHelper do
end
 
it "contains the user's avatar image" do
is_expected.to include(CGI.escapeHTML(user.avatar_url(24)))
end
end
describe '#pipeline_user_link' do
subject { helper.pipeline_user_link(pipeline) }
it "links to the user's profile" do
is_expected.to include("href=\"#{user_path(user)}\"")
end
it "has the user's email as title" do
is_expected.to include("title=\"#{user.email}\"")
is_expected.to include(CGI.escapeHTML(user.avatar_url(16)))
end
end
end
require 'rails_helper'
describe UsersHelper do
let(:user) { create(:user) }
describe '#user_link' do
subject { helper.user_link(user) }
it "links to the user's profile" do
is_expected.to include("href=\"#{user_path(user)}\"")
end
it "has the user's email as title" do
is_expected.to include("title=\"#{user.email}\"")
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment