Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 7 insertions, 8 deletions

diff --git a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
index 25c967996e3..d6f85dcfcc7 100644
--- a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import MockAdapter from 'axios-mock-adapter';
 import mountComponent from 'helpers/vue_mount_component_helper';
-import { withGonExperiment } from 'helpers/experimentation_helper';
 import Api from '~/api';
 import axios from '~/lib/utils/axios_utils';
 import mrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue';
@@ -850,7 +849,7 @@ describe('mrWidgetOptions', () => {
     });
   });
 
-  describe('suggestPipeline Experiment', () => {
+  describe('suggestPipeline feature flag', () => {
     beforeEach(() => {
       mock.onAny().reply(200);
 
@@ -859,10 +858,10 @@ describe('mrWidgetOptions', () => {
       jest.spyOn(console, 'warn').mockImplementation();
     });
 
-    describe('given experiment is enabled', () => {
-      withGonExperiment('suggestPipeline');
-
+    describe('given feature flag is enabled', () => {
       beforeEach(() => {
+        gon.features = { suggestPipeline: true };
+
         createComponent();
 
         vm.mr.hasCI = false;
@@ -893,10 +892,10 @@ describe('mrWidgetOptions', () => {
       });
     });
 
-    describe('given suggestPipeline experiment is not enabled', () => {
-      withGonExperiment('suggestPipeline', false);
-
+    describe('given feature flag is not enabled', () => {
       beforeEach(() => {
+        gon.features = { suggestPipeline: false };
+
         createComponent();
 
         vm.mr.hasCI = false;