Put back usernames in activity and profile feed
This commit is contained in:
parent
6ca6ca8917
commit
667fa9afa2
|
@ -10,6 +10,7 @@
|
||||||
= custom_icon("icon_code_fork")
|
= custom_icon("icon_code_fork")
|
||||||
|
|
||||||
.event-title
|
.event-title
|
||||||
|
%span.author_name= link_to_author event
|
||||||
%span{ class: event.action_name }
|
%span{ class: event.action_name }
|
||||||
- if event.target
|
- if event.target
|
||||||
= event.action_name
|
= event.action_name
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
= custom_icon("icon_status_open")
|
= custom_icon("icon_status_open")
|
||||||
|
|
||||||
.event-title
|
.event-title
|
||||||
|
%span.author_name= link_to_author event
|
||||||
%span{ class: event.action_name }
|
%span{ class: event.action_name }
|
||||||
= event_action_name(event)
|
= event_action_name(event)
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
= custom_icon("icon_comment_o")
|
= custom_icon("icon_comment_o")
|
||||||
|
|
||||||
.event-title
|
.event-title
|
||||||
|
%span.author_name= link_to_author event
|
||||||
= event.action_name
|
= event.action_name
|
||||||
= event_note_title_html(event)
|
= event_note_title_html(event)
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
= custom_icon("icon_commit")
|
= custom_icon("icon_commit")
|
||||||
|
|
||||||
.event-title
|
.event-title
|
||||||
|
%span.author_name= link_to_author event
|
||||||
%span.pushed #{event.action_name} #{event.ref_type}
|
%span.pushed #{event.action_name} #{event.ref_type}
|
||||||
%strong
|
%strong
|
||||||
- commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
|
- commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
|
||||||
|
|
|
@ -97,7 +97,7 @@ module SharedProject
|
||||||
|
|
||||||
step 'I should see project "Shop" activity feed' do
|
step 'I should see project "Shop" activity feed' do
|
||||||
project = Project.find_by(name: "Shop")
|
project = Project.find_by(name: "Shop")
|
||||||
expect(page).to have_content "pushed new branch fix at #{project.name_with_namespace}"
|
expect(page).to have_content "#{@user.name} pushed new branch fix at #{project.name_with_namespace}"
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see project settings' do
|
step 'I should see project settings' do
|
||||||
|
|
|
@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
|
||||||
context 'when a user joins the project' do
|
context 'when a user joins the project' do
|
||||||
before { visit_activities_and_wait_with_event(Event::JOINED) }
|
before { visit_activities_and_wait_with_event(Event::JOINED) }
|
||||||
|
|
||||||
it { is_expected.to eq("joined project") }
|
it { is_expected.to eq("#{user.name} joined project") }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when a user leaves the project' do
|
context 'when a user leaves the project' do
|
||||||
before { visit_activities_and_wait_with_event(Event::LEFT) }
|
before { visit_activities_and_wait_with_event(Event::LEFT) }
|
||||||
|
|
||||||
it { is_expected.to eq("left project") }
|
it { is_expected.to eq("#{user.name} left project") }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when a users membership expires for the project' do
|
context 'when a users membership expires for the project' do
|
||||||
before { visit_activities_and_wait_with_event(Event::EXPIRED) }
|
before { visit_activities_and_wait_with_event(Event::EXPIRED) }
|
||||||
|
|
||||||
it "presents the correct message" do
|
it "presents the correct message" do
|
||||||
message = "removed due to membership expiration from project"
|
message = "#{user.name} removed due to membership expiration from project"
|
||||||
is_expected.to eq(message)
|
is_expected.to eq(message)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue