Add latest changes from gitlab-org/gitlab@master

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
index d785818166d..28f43476dc8 100644
--- a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
+++ b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
@@ -354,6 +354,36 @@ describe('Pipeline graph wrapper', () => {
       });
     });
 
+    describe('when feature flag is on and local storage is set, but the graph does not use needs', () => {
+      beforeEach(async () => {
+        const nonNeedsResponse = { ...mockPipelineResponse };
+        nonNeedsResponse.data.project.pipeline.usesNeeds = false;
+
+        localStorage.setItem(VIEW_TYPE_KEY, LAYER_VIEW);
+
+        createComponentWithApollo({
+          provide: {
+            glFeatures: {
+              pipelineGraphLayersView: true,
+            },
+          },
+          mountFn: mount,
+          getPipelineDetailsHandler: jest.fn().mockResolvedValue(nonNeedsResponse),
+        });
+
+        jest.runOnlyPendingTimers();
+        await wrapper.vm.$nextTick();
+      });
+
+      afterEach(() => {
+        localStorage.clear();
+      });
+
+      it('still passes stage type to graph', () => {
+        expect(getGraph().props('viewType')).toBe(STAGE_VIEW);
+      });
+    });
+
     describe('when feature flag is on but pipeline does not use needs', () => {
       beforeEach(async () => {
         const nonNeedsResponse = { ...mockPipelineResponse };