Commit e91dc8f4 authored by Robert Speicher's avatar Robert Speicher

Merge branch '51375-fix-activity-pages' into 'master'

Fix the group and project activity pages

Closes #51375

See merge request gitlab-org/gitlab-ce!21674
parents b65c39ca 7dcb91bd
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
= render "events/event/note", event: event = render "events/event/note", event: event
- else - else
= render "events/event/common", event: event = render "events/event/common", event: event
- elsif @user.include_private_contributions? - elsif @user&.include_private_contributions?
= render "events/event/private", event: event = render "events/event/private", event: event
require 'spec_helper'
describe 'Project > Activity > User sees private activity', :js do
let(:project) { create(:project, :public) }
let(:author) { create(:user) }
let(:user) { create(:user) }
let(:issue) { create(:issue, :confidential, project: project, author: author) }
let(:message) { "#{author.name} opened issue #{issue.to_reference}" }
before do
project.add_developer(author)
create(:event, :created, project: project, target: issue, author: author)
end
it 'shows the activity to a logged-in user with permissions' do
sign_in(author)
visit activity_project_path(project)
expect(page).to have_content(message)
end
it 'hides the activity from a logged-in user without permissions' do
sign_in(user)
visit activity_project_path(project)
expect(page).not_to have_content(message)
end
it 'hides the activity from an anonymous user' do
visit activity_project_path(project)
expect(page).not_to have_content(message)
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment