Commit 1089cd07 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '257839-remove-coverage-fuzzing-feature-flag' into 'master'

Remove coverage_fuzzing_mr_widget feature flag

See merge request gitlab-org/gitlab!50751
parents 9c4ff8a5 f955ba0a
---
name: coverage_fuzzing_mr_widget
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43545
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257839
milestone: '13.6'
type: development
group: group::fuzz testing
default_enabled: true
......@@ -8,7 +8,6 @@ import ArtifactDownload from './components/artifact_download.vue';
import { LOADING } from '~/reports/constants';
import { securityReportTypeEnumToReportType } from './constants';
import { vulnerabilityModalMixin } from './mixins/vulnerability_modal_mixin';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import ReportSection from '~/reports/components/report_section.vue';
import SummaryRow from '~/reports/components/summary_row.vue';
import Tracking from '~/tracking';
......@@ -50,7 +49,7 @@ export default {
directives: {
'gl-modal': GlModalDirective,
},
mixins: [securityReportsMixin, vulnerabilityModalMixin(), glFeatureFlagsMixin()],
mixins: [securityReportsMixin, vulnerabilityModalMixin()],
apollo: {
dastSummary: {
query: securityReportSummaryQuery,
......@@ -295,8 +294,7 @@ export default {
return this.enabledReports.apiFuzzing;
},
hasCoverageFuzzingReports() {
// TODO: Remove feature flag in https://gitlab.com/gitlab-org/gitlab/-/issues/257839
return this.enabledReports.coverageFuzzing && this.glFeatures.coverageFuzzingMrWidget;
return this.enabledReports.coverageFuzzing;
},
hasSastReports() {
return this.enabledReports.sast;
......
......@@ -11,7 +11,6 @@ module EE
before_action only: [:show] do
push_frontend_feature_flag(:anonymous_visual_review_feedback)
push_frontend_feature_flag(:missing_mr_security_scan_types, @project)
push_frontend_feature_flag(:coverage_fuzzing_mr_widget, @project, default_enabled: true)
end
before_action :whitelist_query_limiting_ee_merge, only: [:merge]
......
......@@ -20,6 +20,6 @@
window.gl.mrWidgetData.sast_comparison_path = '#{sast_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:sast)}'
window.gl.mrWidgetData.dast_comparison_path = '#{dast_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:dast)}'
window.gl.mrWidgetData.secret_scanning_comparison_path = '#{secret_detection_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:secret_detection)}'
window.gl.mrWidgetData.coverage_fuzzing_comparison_path = '#{coverage_fuzzing_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:coverage_fuzzing) && Feature.enabled?(:coverage_fuzzing_mr_widget, @project, default_enabled: true)}'
window.gl.mrWidgetData.coverage_fuzzing_comparison_path = '#{coverage_fuzzing_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:coverage_fuzzing)}'
window.gl.mrWidgetData.api_fuzzing_comparison_path = '#{api_fuzzing_reports_project_merge_request_path(@project, @merge_request) if @project.feature_available?(:api_fuzzing)}'
......@@ -103,7 +103,6 @@ describe('Grouped security reports app', () => {
},
store: appStore(),
provide: {
glFeatures: { coverageFuzzingMrWidget: true },
...provide,
},
});
......@@ -430,27 +429,20 @@ describe('Grouped security reports app', () => {
});
describe('coverage fuzzing reports', () => {
describe.each([true, false])('given featureEnabled is %s', (shouldShowFuzzing) => {
beforeEach(() => {
createWrapper(
{
...props,
enabledReports: {
coverageFuzzing: true,
},
},
{},
{
glFeatures: { coverageFuzzingMrWidget: shouldShowFuzzing },
beforeEach(() => {
createWrapper(
{
...props,
enabledReports: {
coverageFuzzing: true,
},
);
});
},
{},
);
});
it(`${shouldShowFuzzing ? 'renders' : 'does not render'}`, () => {
expect(wrapper.find('[data-qa-selector="coverage_fuzzing_report"]').exists()).toBe(
shouldShowFuzzing,
);
});
it('renders', () => {
expect(wrapper.find('[data-qa-selector="coverage_fuzzing_report"]').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