Merge branch 'project-homepage-activity' into 'master'
Fixed activity not loading on project homepage See merge request !13373
This commit is contained in:
commit
c70f98be62
2 changed files with 16 additions and 0 deletions
|
@ -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();
|
||||
|
|
|
@ -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…
Reference in a new issue