summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2018-03-12 14:00:29 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2018-03-14 13:31:32 -0600
commit52c79bc8b30f391e205a66f109a94f2ace5c6b6a (patch)
treed32e65eaa46197ad82c77a1499ec2148acc9be23
parenta3b85d10e2c61b650d64016c580403d01098da33 (diff)
downloadgitlab-ce-52c79bc8b30f391e205a66f109a94f2ace5c6b6a.tar.gz
Add realtime pipeline status component for files
-rw-r--r--app/assets/javascripts/pages/projects/blob/show/index.js22
-rw-r--r--changelogs/unreleased/jivl-realtime-update-adding-file.yml5
-rw-r--r--spec/features/projects/blobs/blob_show_spec.rb16
3 files changed, 43 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..0fd21a2019c 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -509,4 +509,20 @@ feature 'File blob', :js do
end
end
end
+
+ context 'realtime pipelines' do
+ let(:user) { create(:user) }
+ let(:pipeline) { create(:ci_pipeline, project: project, ref: 'feature', sha: project.commit.id, user: user, status: :success) }
+
+ before do
+ project.add_master(user)
+ sign_in(user)
+ visit_blob('files/ruby/popen.rb', ref: 'feature')
+ end
+
+ it 'should show the realtime pipeline status' do
+ wait_for_requests
+ expect(find('.js-commit-pipeline-status')).not_to be nil
+ end
+ end
end