Add latest changes from gitlab-org/gitlab@master

2 files changed, 55 insertions, 11 deletions

diff --git a/spec/frontend/security_configuration/components/training_provider_list_spec.js b/spec/frontend/security_configuration/components/training_provider_list_spec.js
index 4d92f0cca22..688986af25b 100644
--- a/spec/frontend/security_configuration/components/training_provider_list_spec.js
+++ b/spec/frontend/security_configuration/components/training_provider_list_spec.js
@@ -12,6 +12,7 @@ import {
   TRACK_PROVIDER_LEARN_MORE_CLICK_LABEL,
 } from '~/security_configuration/constants';
 import TrainingProviderList from '~/security_configuration/components/training_provider_list.vue';
+import { updateSecurityTrainingOptimisticResponse } from '~/security_configuration/graphql/utils/optimistic_response';
 import securityTrainingProvidersQuery from '~/security_configuration/graphql/security_training_providers.query.graphql';
 import configureSecurityTrainingProvidersMutation from '~/security_configuration/graphql/configure_security_training_providers.mutation.graphql';
 import dismissUserCalloutMutation from '~/graphql_shared/mutations/dismiss_user_callout.mutation.graphql';
@@ -159,17 +160,6 @@ describe('TrainingProviderList component', () => {
         await toggleFirstProvider();
       });
 
-      it.each`
-        loading  | wait     | desc
-        ${true}  | ${false} | ${'enables loading of GlToggle when mutation is called'}
-        ${false} | ${true}  | ${'disables loading of GlToggle when mutation is complete'}
-      `('$desc', async ({ loading, wait }) => {
-        if (wait) {
-          await waitForMutationToBeLoaded();
-        }
-        expect(findFirstToggle().props('isLoading')).toBe(loading);
-      });
-
       it('calls mutation when toggle is changed', () => {
         expect(apolloProvider.defaultClient.mutate).toHaveBeenCalledWith(
           expect.objectContaining({
@@ -186,6 +176,20 @@ describe('TrainingProviderList component', () => {
         );
       });
 
+      it('returns an optimistic response when calling the mutation', () => {
+        const optimisticResponse = updateSecurityTrainingOptimisticResponse({
+          id: securityTrainingProviders[0].id,
+          isEnabled: true,
+          isPrimary: false,
+        });
+
+        expect(apolloProvider.defaultClient.mutate).toHaveBeenCalledWith(
+          expect.objectContaining({
+            optimisticResponse,
+          }),
+        );
+      });
+
       it('dismisses the callout when the feature gets first enabled', async () => {
         // wait for configuration update mutation to complete
         await waitForMutationToBeLoaded();
diff --git a/spec/frontend/vue_shared/components/web_ide_link_spec.js b/spec/frontend/vue_shared/components/web_ide_link_spec.js
index 5589cbfd08f..e79935f8fa6 100644
--- a/spec/frontend/vue_shared/components/web_ide_link_spec.js
+++ b/spec/frontend/vue_shared/components/web_ide_link_spec.js
@@ -12,6 +12,7 @@ import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_help
 const TEST_EDIT_URL = '/gitlab-test/test/-/edit/main/';
 const TEST_WEB_IDE_URL = '/-/ide/project/gitlab-test/test/edit/main/-/';
 const TEST_GITPOD_URL = 'https://gitpod.test/';
+const TEST_PIPELINE_EDITOR_URL = '/-/ci/editor?branch_name="main"';
 const TEST_USER_PREFERENCES_GITPOD_PATH = '/-/profile/preferences#user_gitpod_enabled';
 const TEST_USER_PROFILE_ENABLE_GITPOD_PATH = '/-/profile?user%5Bgitpod_enabled%5D=true';
 const forkPath = '/some/fork/path';
@@ -66,6 +67,16 @@ const ACTION_GITPOD_ENABLE = {
   href: undefined,
   handle: expect.any(Function),
 };
+const ACTION_PIPELINE_EDITOR = {
+  href: TEST_PIPELINE_EDITOR_URL,
+  key: 'pipeline_editor',
+  secondaryText: 'Edit, lint, and visualize your pipeline.',
+  tooltip: 'Edit, lint, and visualize your pipeline.',
+  text: 'Edit in pipeline editor',
+  attrs: {
+    'data-qa-selector': 'pipeline_editor_button',
+  },
+};
 
 describe('Web IDE link component', () => {
   let wrapper;
@@ -76,6 +87,7 @@ describe('Web IDE link component', () => {
         editUrl: TEST_EDIT_URL,
         webIdeUrl: TEST_WEB_IDE_URL,
         gitpodUrl: TEST_GITPOD_URL,
+        pipelineEditorUrl: TEST_PIPELINE_EDITOR_URL,
         forkPath,
         ...props,
       },
@@ -107,6 +119,10 @@ describe('Web IDE link component', () => {
       expectedActions: [ACTION_WEB_IDE, ACTION_EDIT],
     },
     {
+      props: { showPipelineEditorButton: true },
+      expectedActions: [ACTION_PIPELINE_EDITOR, ACTION_WEB_IDE, ACTION_EDIT],
+    },
+    {
       props: { webIdeText: 'Test Web IDE' },
       expectedActions: [{ ...ACTION_WEB_IDE_EDIT_FORK, text: 'Test Web IDE' }, ACTION_EDIT],
     },
@@ -193,12 +209,34 @@ describe('Web IDE link component', () => {
     expect(findActionsButton().props('actions')).toEqual(expectedActions);
   });
 
+  describe('when pipeline editor action is available', () => {
+    beforeEach(() => {
+      createComponent({
+        showEditButton: false,
+        showWebIdeButton: true,
+        showGitpodButton: true,
+        showPipelineEditorButton: true,
+        userPreferencesGitpodPath: TEST_USER_PREFERENCES_GITPOD_PATH,
+        userProfileEnableGitpodPath: TEST_USER_PROFILE_ENABLE_GITPOD_PATH,
+        gitpodEnabled: true,
+      });
+    });
+
+    it('selected Pipeline Editor by default', () => {
+      expect(findActionsButton().props()).toMatchObject({
+        actions: [ACTION_PIPELINE_EDITOR, ACTION_WEB_IDE, ACTION_GITPOD],
+        selectedKey: ACTION_PIPELINE_EDITOR.key,
+      });
+    });
+  });
+
   describe('with multiple actions', () => {
     beforeEach(() => {
       createComponent({
         showEditButton: false,
         showWebIdeButton: true,
         showGitpodButton: true,
+        showPipelineEditorButton: false,
         userPreferencesGitpodPath: TEST_USER_PREFERENCES_GITPOD_PATH,
         userProfileEnableGitpodPath: TEST_USER_PROFILE_ENABLE_GITPOD_PATH,
         gitpodEnabled: true,
@@ -240,6 +278,7 @@ describe('Web IDE link component', () => {
         props: {
           showWebIdeButton: true,
           showEditButton: false,
+          showPipelineEditorButton: false,
           forkPath,
           forkModalId: 'edit-modal',
         },
@@ -249,6 +288,7 @@ describe('Web IDE link component', () => {
         props: {
           showWebIdeButton: false,
           showEditButton: true,
+          showPipelineEditorButton: false,
           forkPath,
           forkModalId: 'webide-modal',
         },