Skip to content
Snippets Groups Projects
Commit 667fa9af authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Put back usernames in activity and profile feed

parent 6ca6ca89
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,6 +10,7 @@
= custom_icon("icon_code_fork")
 
.event-title
%span.author_name= link_to_author event
%span{ class: event.action_name }
- if event.target
= event.action_name
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@
= custom_icon("icon_status_open")
 
.event-title
%span.author_name= link_to_author event
%span{ class: event.action_name }
= event_action_name(event)
 
Loading
Loading
Loading
Loading
@@ -2,6 +2,7 @@
= custom_icon("icon_comment_o")
 
.event-title
%span.author_name= link_to_author event
= event.action_name
= event_note_title_html(event)
 
Loading
Loading
Loading
Loading
@@ -7,6 +7,7 @@
= custom_icon("icon_commit")
 
.event-title
%span.author_name= link_to_author event
%span.pushed #{event.action_name} #{event.ref_type}
%strong
- commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
Loading
Loading
Loading
Loading
@@ -97,7 +97,7 @@ module SharedProject
 
step 'I should see project "Shop" activity feed' do
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
 
step 'I should see project settings' do
Loading
Loading
Loading
Loading
@@ -21,20 +21,20 @@ feature 'Project member activity', feature: true, js: true do
context 'when a user joins the project' do
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
 
context 'when a user leaves the project' do
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
 
context 'when a users membership expires for the project' do
before { visit_activities_and_wait_with_event(Event::EXPIRED) }
 
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)
end
end
Loading
Loading
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