Skip to content
Snippets Groups Projects
Unverified Commit db549f5d authored by Phil Hughes's avatar Phil Hughes
Browse files

Fixed activity not loading on project homepage

parent 0ec87b3b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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();
Loading
Loading
Loading
Loading
@@ -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
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