diff options
| -rw-r--r-- | app/views/events/event/_common.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_created_project.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 1 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 1 | ||||
| -rw-r--r-- | features/steps/shared/project.rb | 2 | ||||
| -rw-r--r-- | spec/features/dashboard/project_member_activity_index_spec.rb | 6 |
6 files changed, 8 insertions, 4 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index c0c11d00519..af97e9588a5 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -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 diff --git a/app/views/events/event/_created_project.html.haml b/app/views/events/event/_created_project.html.haml index 340d8c61026..fee85c94277 100644 --- a/app/views/events/event/_created_project.html.haml +++ b/app/views/events/event/_created_project.html.haml @@ -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) diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index cbcfe0ff71f..83709f5e4d0 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -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) diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 1583f380737..efdc8764acf 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -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) diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 73206c3f30d..15625e045f5 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -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 diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb index d62839a09ef..49d93db58a9 100644 --- a/spec/features/dashboard/project_member_activity_index_spec.rb +++ b/spec/features/dashboard/project_member_activity_index_spec.rb @@ -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 |