Commit 84444203 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Merge branch 'cleanup-pipeline_editor_mini_graph' into 'master'

Enable pipeline_editor_mini_graph feature flag by default

See merge request gitlab-org/gitlab!73612
parents 549c58be 779b7038
......@@ -10,7 +10,6 @@ import {
toggleQueryPollingByVisibility,
} from '~/pipelines/components/graph/utils';
import CiIcon from '~/vue_shared/components/ci_icon.vue';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import PipelineEditorMiniGraph from './pipeline_editor_mini_graph.vue';
const POLL_INTERVAL = 10000;
......@@ -37,7 +36,6 @@ export default {
GlSprintf,
PipelineEditorMiniGraph,
},
mixins: [glFeatureFlagMixin()],
inject: ['projectFullPath'],
props: {
commitSha: {
......@@ -172,11 +170,7 @@ export default {
</span>
</div>
<div class="gl-display-flex gl-flex-wrap">
<pipeline-editor-mini-graph
v-if="glFeatures.pipelineEditorMiniGraph"
:pipeline="pipeline"
v-on="$listeners"
/>
<pipeline-editor-mini-graph :pipeline="pipeline" v-on="$listeners" />
<gl-button
class="gl-mt-2 gl-md-mt-0"
target="_blank"
......
......@@ -3,7 +3,6 @@
class Projects::Ci::PipelineEditorController < Projects::ApplicationController
before_action :check_can_collaborate!
before_action do
push_frontend_feature_flag(:pipeline_editor_mini_graph, @project, default_enabled: :yaml)
push_frontend_feature_flag(:schema_linting, @project, default_enabled: :yaml)
end
......
---
name: pipeline_editor_mini_graph
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71622
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342217
milestone: '14.4'
type: development
group: group::pipeline authoring
default_enabled: false
......@@ -16,7 +16,7 @@ describe('Pipeline Status', () => {
let mockApollo;
let mockPipelineQuery;
const createComponentWithApollo = (glFeatures = {}) => {
const createComponentWithApollo = () => {
const handlers = [[getPipelineQuery, mockPipelineQuery]];
mockApollo = createMockApollo(handlers);
......@@ -27,7 +27,6 @@ describe('Pipeline Status', () => {
commitSha: mockCommitSha,
},
provide: {
glFeatures,
projectFullPath: mockProjectFullPath,
},
stubs: { GlLink, GlSprintf },
......@@ -106,8 +105,8 @@ describe('Pipeline Status', () => {
expect(findPipelineViewBtn().attributes('href')).toBe(detailsPath);
});
it('does not render the pipeline mini graph', () => {
expect(findPipelineEditorMiniGraph().exists()).toBe(false);
it('renders the pipeline mini graph', () => {
expect(findPipelineEditorMiniGraph().exists()).toBe(true);
});
});
......@@ -150,19 +149,4 @@ describe('Pipeline Status', () => {
});
});
});
describe('when feature flag for pipeline mini graph is enabled', () => {
beforeEach(() => {
mockPipelineQuery.mockResolvedValue({
data: { project: mockProjectPipeline() },
});
createComponentWithApollo({ pipelineEditorMiniGraph: true });
waitForPromises();
});
it('renders the pipeline mini graph', () => {
expect(findPipelineEditorMiniGraph().exists()).toBe(true);
});
});
});
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