Commit da662ce0 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch '334789-fix-aux-viewers' into 'master'

Blob refactor: Fix the Auxiliary viewers

See merge request gitlab-org/gitlab!66529
parents 64a920f2 b3d15ebd
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import VueApollo from 'vue-apollo'; import VueApollo from 'vue-apollo';
import TableOfContents from '~/blob/components/table_contents.vue'; import TableOfContents from '~/blob/components/table_contents.vue';
import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue'; import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue';
import { BlobViewer } from '~/blob/viewer/index'; import { BlobViewer, initAuxiliaryViewer } from '~/blob/viewer/index';
import GpgBadges from '~/gpg_badges'; import GpgBadges from '~/gpg_badges';
import createDefaultClient from '~/lib/graphql'; import createDefaultClient from '~/lib/graphql';
import initBlob from '~/pages/projects/init_blob'; import initBlob from '~/pages/projects/init_blob';
...@@ -39,6 +39,8 @@ if (viewBlobEl) { ...@@ -39,6 +39,8 @@ if (viewBlobEl) {
}); });
}, },
}); });
initAuxiliaryViewer();
} else { } else {
new BlobViewer(); // eslint-disable-line no-new new BlobViewer(); // eslint-disable-line no-new
initBlob(); initBlob();
......
...@@ -584,6 +584,11 @@ RSpec.describe 'File blob', :js do ...@@ -584,6 +584,11 @@ RSpec.describe 'File blob', :js do
end end
end end
context 'files with auxiliary viewers' do
before do
stub_feature_flags(refactor_blob_viewer: true)
end
describe '.gitlab-ci.yml' do describe '.gitlab-ci.yml' do
before do before do
project.add_maintainer(project.creator) project.add_maintainer(project.creator)
...@@ -780,6 +785,7 @@ RSpec.describe 'File blob', :js do ...@@ -780,6 +785,7 @@ RSpec.describe 'File blob', :js do
end end
end end
end end
end
context 'realtime pipelines' do context 'realtime pipelines' do
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment