Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 11 deletions

diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index d35c5398b20..ce79feae2e7 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -630,6 +630,16 @@ describe('Design management index page', () => {
       expect(mockMutate).not.toHaveBeenCalled();
     });
 
+    it('does not upload designs if designs wrapper is destroyed', () => {
+      findDesignsWrapper().trigger('mouseenter');
+
+      wrapper.destroy();
+
+      document.dispatchEvent(event);
+
+      expect(mockMutate).not.toHaveBeenCalled();
+    });
+
     describe('when designs wrapper is hovered', () => {
       let realDateNow;
       const today = () => new Date('2020-12-25');
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
index 59b42de2485..3aa0e99a858 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_a_spec.js.snap
+++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Learn GitLab Design A renders correctly 1`] = `
+exports[`Learn GitLab renders correctly 1`] = `
 <div>
   <div
     class="row"
@@ -136,7 +136,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Set up CI/CD"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -157,7 +157,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Start a free Ultimate trial"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -178,7 +178,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Add code owners"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -206,7 +206,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Add merge request approval"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -270,7 +270,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Create an issue"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -291,7 +291,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Submit a merge request"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -348,7 +348,7 @@ exports[`Learn GitLab Design A renders correctly 1`] = `
                 class="gl-link"
                 data-track-action="click_link"
                 data-track-label="Run a Security scan using CI/CD"
-                data-track-property="Growth::Conversion::Experiment::LearnGitLabA"
+                data-track-property="Growth::Conversion::Experiment::LearnGitLab"
                 href="http://example.com/"
                 rel="noopener noreferrer"
                 target="_blank"
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_a_spec.js b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
index ac997c1f237..f8099d7e95a 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_a_spec.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
@@ -1,13 +1,13 @@
 import { GlProgressBar } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
-import LearnGitlabA from '~/pages/projects/learn_gitlab/components/learn_gitlab_a.vue';
+import LearnGitlab from '~/pages/projects/learn_gitlab/components/learn_gitlab.vue';
 import { testActions, testSections } from './mock_data';
 
-describe('Learn GitLab Design A', () => {
+describe('Learn GitLab', () => {
   let wrapper;
 
   const createWrapper = () => {
-    wrapper = mount(LearnGitlabA, { propsData: { actions: testActions, sections: testSections } });
+    wrapper = mount(LearnGitlab, { propsData: { actions: testActions, sections: testSections } });
   };
 
   beforeEach(() => {