Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 50 deletions

diff --git a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
index 1cf5f67f9a9..2e8979f2b9d 100644
--- a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
+++ b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
@@ -267,28 +267,11 @@ describe('Pipeline graph wrapper', () => {
   });
 
   describe('view dropdown', () => {
-    describe('when pipelineGraphLayersView feature flag is off', () => {
-      beforeEach(async () => {
-        createComponentWithApollo();
-        jest.runOnlyPendingTimers();
-        await wrapper.vm.$nextTick();
-      });
-
-      it('does not appear', () => {
-        expect(getViewSelector().exists()).toBe(false);
-      });
-    });
-
-    describe('when pipelineGraphLayersView feature flag is on', () => {
+    describe('default', () => {
       let layersFn;
       beforeEach(async () => {
         layersFn = jest.spyOn(parsingUtils, 'listByLayers');
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           mountFn: mount,
         });
 
@@ -326,14 +309,9 @@ describe('Pipeline graph wrapper', () => {
       });
     });
 
-    describe('when pipelineGraphLayersView feature flag is on and layers view is selected', () => {
+    describe('when layers view is selected', () => {
       beforeEach(async () => {
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           data: {
             currentViewType: LAYER_VIEW,
           },
@@ -356,14 +334,9 @@ describe('Pipeline graph wrapper', () => {
       });
     });
 
-    describe('when pipelineGraphLayersView feature flag is on, layers view is selected, and links are active', () => {
+    describe('when layers view is selected, and links are active', () => {
       beforeEach(async () => {
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           data: {
             currentViewType: LAYER_VIEW,
             showLinks: true,
@@ -384,11 +357,6 @@ describe('Pipeline graph wrapper', () => {
     describe('when hover tip would otherwise show, but it has been previously dismissed', () => {
       beforeEach(async () => {
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           data: {
             currentViewType: LAYER_VIEW,
             showLinks: true,
@@ -412,11 +380,6 @@ describe('Pipeline graph wrapper', () => {
         localStorage.setItem(VIEW_TYPE_KEY, LAYER_VIEW);
 
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           mountFn: mount,
         });
 
@@ -444,11 +407,6 @@ describe('Pipeline graph wrapper', () => {
         localStorage.setItem(VIEW_TYPE_KEY, LAYER_VIEW);
 
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           mountFn: mount,
           getPipelineDetailsHandler: jest.fn().mockResolvedValue(nonNeedsResponse),
         });
@@ -472,11 +430,6 @@ describe('Pipeline graph wrapper', () => {
         nonNeedsResponse.data.project.pipeline.usesNeeds = false;
 
         createComponentWithApollo({
-          provide: {
-            glFeatures: {
-              pipelineGraphLayersView: true,
-            },
-          },
           mountFn: mount,
           getPipelineDetailsHandler: jest.fn().mockResolvedValue(nonNeedsResponse),
         });