diff options
author | Phil Hughes <me@iamphill.com> | 2018-03-15 17:16:59 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-15 17:16:59 +0000 |
commit | 3e20b83b8b3145abd4e3f09848111d427032d309 (patch) | |
tree | 12e5eaa394b8c57055ec2f9852eb7395e7a2440d | |
parent | 49d5c09758fe9cf6d7ab196be4bdb0f1f4b6b275 (diff) | |
parent | e2e0a4d1570ad4adc640b4c49fc58ed544272e93 (diff) | |
download | gitlab-ce-3e20b83b8b3145abd4e3f09848111d427032d309.tar.gz |
Merge branch 'jivl-realtime-update-adding-file' into 'master'
Add realtime pipeline status component for files
Closes #42927
See merge request gitlab-org/gitlab-ce!17705
-rw-r--r-- | app/assets/javascripts/pages/projects/blob/show/index.js | 22 | ||||
-rw-r--r-- | changelogs/unreleased/jivl-realtime-update-adding-file.yml | 5 | ||||
-rw-r--r-- | spec/features/projects/blobs/blob_show_spec.rb | 25 |
3 files changed, 52 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js index 26cbb279d4a..85c6862d629 100644 --- a/app/assets/javascripts/pages/projects/blob/show/index.js +++ b/app/assets/javascripts/pages/projects/blob/show/index.js @@ -1,7 +1,29 @@ +import Vue from 'vue'; +import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import BlobViewer from '~/blob/viewer/index'; import initBlob from '~/pages/projects/init_blob'; document.addEventListener('DOMContentLoaded', () => { new BlobViewer(); // eslint-disable-line no-new initBlob(); + + const CommitPipelineStatusEl = document.querySelector('.js-commit-pipeline-status'); + const statusLink = document.querySelector('.commit-actions .ci-status-link'); + if (statusLink) { + statusLink.remove(); + // eslint-disable-next-line no-new + new Vue({ + el: CommitPipelineStatusEl, + components: { + commitPipelineStatus, + }, + render(createElement) { + return createElement('commit-pipeline-status', { + props: { + endpoint: CommitPipelineStatusEl.dataset.endpoint, + }, + }); + }, + }); + } }); diff --git a/changelogs/unreleased/jivl-realtime-update-adding-file.yml b/changelogs/unreleased/jivl-realtime-update-adding-file.yml new file mode 100644 index 00000000000..df1bdb1648d --- /dev/null +++ b/changelogs/unreleased/jivl-realtime-update-adding-file.yml @@ -0,0 +1,5 @@ +--- +title: Add realtime pipeline status for adding/viewing files +merge_request: 17705 +author: +type: other diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index 88813d9b5ff..ac82f869f0f 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -509,4 +509,29 @@ feature 'File blob', :js do end end end + + context 'realtime pipelines' do + before do + Files::CreateService.new( + project, + project.creator, + start_branch: 'feature', + branch_name: 'feature', + commit_message: "Add ruby file", + file_path: 'files/ruby/test.rb', + file_content: "# Awesome content" + ).execute + + create(:ci_pipeline, status: 'running', project: project, ref: 'feature', sha: project.commit('feature').sha) + visit_blob('files/ruby/test.rb', ref: 'feature') + end + + it 'should show the realtime pipeline status' do + page.within('.commit-actions') do + expect(page).to have_css('.ci-status-icon') + expect(page).to have_css('.ci-status-icon-running') + expect(page).to have_css('.js-ci-status-icon-running') + end + end + end end |