Fixed activity not loading on project homepage

This commit is contained in:
Phil Hughes 2017-08-08 12:43:45 +01:00
parent 0ec87b3bf0
commit db549f5d34
No known key found for this signature in database
GPG Key ID: DB8CE4B3A3EE91AB
2 changed files with 16 additions and 0 deletions

View File

@ -343,6 +343,7 @@ import UserFeatureHelper from './helpers/user_feature_helper';
if ($('#tree-slider').length) new TreeView();
if ($('.blob-viewer').length) new BlobViewer();
if ($('.project-show-activity').length) new gl.Activities();
break;
case 'projects:edit':
setupProjectEdit();

View File

@ -167,6 +167,21 @@ feature 'Project' do
end
end
describe 'activity view' do
let(:user) { create(:user, project_view: 'activity') }
let(:project) { create(:project, :repository) }
before do
project.team << [user, :master]
sign_in user
visit project_path(project)
end
it 'loads activity', :js do
expect(page).to have_selector('.event-item')
end
end
def remove_with_confirm(button_text, confirm_with)
click_button button_text
fill_in 'confirm_name_input', with: confirm_with