diff options
author | Phil Hughes <me@iamphill.com> | 2017-08-08 12:43:45 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-08-08 12:43:45 +0100 |
commit | db549f5d347503c4bf31c708d44566cdde513875 (patch) | |
tree | 632cc11ae66af5892977990c692ede996c970f7b | |
parent | 0ec87b3bf0ac27af5f5fedf97d51c8b14b050f50 (diff) | |
download | gitlab-ce-db549f5d347503c4bf31c708d44566cdde513875.tar.gz |
Fixed activity not loading on project homepageproject-homepage-activity
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 | ||||
-rw-r--r-- | spec/features/projects_spec.rb | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 265e304b957..7cc7636cca3 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -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(); diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 7e4d53332e5..d3d7915bebf 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -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 |