Add latest changes from gitlab-org/gitlab@master

3 files changed, 59 insertions, 7 deletions

diff --git a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
index b84dad5a988..b54feea6ff7 100644
--- a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
+++ b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
@@ -12,7 +12,9 @@ import {
   COMMIT_SUCCESS,
   COMMIT_SUCCESS_WITH_REDIRECT,
 } from '~/pipeline_editor/constants';
+import { resolvers } from '~/pipeline_editor/graphql/resolvers';
 import commitCreate from '~/pipeline_editor/graphql/mutations/commit_ci_file.mutation.graphql';
+import getCurrentBranch from '~/pipeline_editor/graphql/queries/client/current_branch.query.graphql';
 import updatePipelineEtag from '~/pipeline_editor/graphql/mutations/client/update_pipeline_etag.mutation.graphql';
 
 import {
@@ -70,7 +72,20 @@ describe('Pipeline Editor | Commit section', () => {
   const createComponentWithApollo = (options) => {
     const handlers = [[commitCreate, mockMutateCommitData]];
     Vue.use(VueApollo);
-    mockApollo = createMockApollo(handlers);
+    mockApollo = createMockApollo(handlers, resolvers);
+
+    mockApollo.clients.defaultClient.cache.writeQuery({
+      query: getCurrentBranch,
+      data: {
+        workBranches: {
+          __typename: 'BranchList',
+          current: {
+            __typename: 'WorkBranch',
+            name: mockDefaultBranch,
+          },
+        },
+      },
+    });
 
     const apolloConfig = {
       apolloProvider: mockApollo,
@@ -198,6 +213,7 @@ describe('Pipeline Editor | Commit section', () => {
     const newBranch = 'new-branch';
 
     beforeEach(async () => {
+      mockMutateCommitData.mockResolvedValue(mockCommitCreateResponse);
       createComponentWithApollo();
       mockMutateCommitData.mockResolvedValue(mockCommitCreateResponse);
       await submitCommit({
diff --git a/spec/frontend/pipeline_editor/components/file-nav/branch_switcher_spec.js b/spec/frontend/pipeline_editor/components/file-nav/branch_switcher_spec.js
index ab9027a56a4..7dbacad34bf 100644
--- a/spec/frontend/pipeline_editor/components/file-nav/branch_switcher_spec.js
+++ b/spec/frontend/pipeline_editor/components/file-nav/branch_switcher_spec.js
@@ -12,6 +12,10 @@ import waitForPromises from 'helpers/wait_for_promises';
 import BranchSwitcher from '~/pipeline_editor/components/file_nav/branch_switcher.vue';
 import { DEFAULT_FAILURE } from '~/pipeline_editor/constants';
 import getAvailableBranchesQuery from '~/pipeline_editor/graphql/queries/available_branches.query.graphql';
+import getCurrentBranch from '~/pipeline_editor/graphql/queries/client/current_branch.query.graphql';
+import getLastCommitBranch from '~/pipeline_editor/graphql/queries/client/last_commit_branch.query.graphql';
+import { resolvers } from '~/pipeline_editor/graphql/resolvers';
+
 import {
   mockBranchPaginationLimit,
   mockDefaultBranch,
@@ -34,6 +38,7 @@ describe('Pipeline editor branch switcher', () => {
 
   const createComponent = ({
     currentBranch = mockDefaultBranch,
+    availableBranches = ['main'],
     isQueryLoading = false,
     mountFn = shallowMount,
     options = {},
@@ -59,7 +64,7 @@ describe('Pipeline editor branch switcher', () => {
       },
       data() {
         return {
-          availableBranches: ['main'],
+          availableBranches,
           currentBranch,
         };
       },
@@ -67,13 +72,44 @@ describe('Pipeline editor branch switcher', () => {
     });
   };
 
-  const createComponentWithApollo = ({ mountFn = shallowMount, props = {} } = {}) => {
+  const createComponentWithApollo = ({
+    mountFn = shallowMount,
+    props = {},
+    availableBranches = ['main'],
+  } = {}) => {
     const handlers = [[getAvailableBranchesQuery, mockAvailableBranchQuery]];
-    mockApollo = createMockApollo(handlers);
+    mockApollo = createMockApollo(handlers, resolvers);
+
+    mockApollo.clients.defaultClient.cache.writeQuery({
+      query: getCurrentBranch,
+      data: {
+        workBranches: {
+          __typename: 'BranchList',
+          current: {
+            __typename: 'WorkBranch',
+            name: mockDefaultBranch,
+          },
+        },
+      },
+    });
+
+    mockApollo.clients.defaultClient.cache.writeQuery({
+      query: getLastCommitBranch,
+      data: {
+        workBranches: {
+          __typename: 'BranchList',
+          lastCommit: {
+            __typename: 'WorkBranch',
+            name: '',
+          },
+        },
+      },
+    });
 
     createComponent({
       mountFn,
       props,
+      availableBranches,
       options: {
         localVue,
         apolloProvider: mockApollo,
@@ -113,7 +149,7 @@ describe('Pipeline editor branch switcher', () => {
 
   describe('when querying for the first time', () => {
     beforeEach(() => {
-      createComponentWithApollo();
+      createComponentWithApollo({ availableBranches: [] });
     });
 
     it('disables the dropdown', () => {
@@ -153,7 +189,7 @@ describe('Pipeline editor branch switcher', () => {
   describe('on fetch error', () => {
     beforeEach(async () => {
       setAvailableBranchesMock(new Error());
-      createComponentWithApollo();
+      createComponentWithApollo({ availableBranches: [] });
       await waitForPromises();
     });
 
diff --git a/spec/frontend/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js b/spec/frontend/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js
index aae8656b4ad..93eb18c90cf 100644
--- a/spec/frontend/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js
+++ b/spec/frontend/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js
@@ -96,7 +96,7 @@ describe('Pipeline Status', () => {
       });
 
       it('should emit an error event when query fails', async () => {
-        expect(wrapper.emitted('showError')).toHaveLength(2);
+        expect(wrapper.emitted('showError')).toHaveLength(1);
         expect(wrapper.emitted('showError')[0]).toEqual([
           {
             type: PIPELINE_FAILURE,