Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 3 deletions

diff --git a/spec/frontend/projects/commit/mock_data.js b/spec/frontend/projects/commit/mock_data.js
index 34e9c400af4..e398d46e69c 100644
--- a/spec/frontend/projects/commit/mock_data.js
+++ b/spec/frontend/projects/commit/mock_data.js
@@ -24,5 +24,9 @@ export default {
     openModal: '_open_modal_',
   },
   mockBranches: ['_branch_1', '_abc_', '_main_'],
-  mockProjects: ['_project_1', '_abc_', '_project_'],
+  mockProjects: [
+    { id: 1, name: '_project_1', refsUrl: '/_project_1/refs' },
+    { id: 2, name: '_abc_', refsUrl: '/_abc_/refs' },
+    { id: 3, name: '_project_', refsUrl: '/_project_/refs' },
+  ],
 };
diff --git a/spec/frontend/projects/commit/store/getters_spec.js b/spec/frontend/projects/commit/store/getters_spec.js
index 38c45af7aa0..f45f3114550 100644
--- a/spec/frontend/projects/commit/store/getters_spec.js
+++ b/spec/frontend/projects/commit/store/getters_spec.js
@@ -29,9 +29,15 @@ describe('Commit form modal getters', () => {
     });
 
     it('should provide a uniq list of projects', () => {
-      const projects = ['_project_', '_project_', '_some_other_project'];
+      const projects = [
+        { id: 1, name: '_project_', refsUrl: '/_project_/refs' },
+        { id: 1, name: '_project_', refsUrl: '/_project_/refs' },
+        { id: 3, name: '_some_other_project', refsUrl: '/_some_other_project/refs' },
+      ];
       const state = { projects };
 
+      expect(state.projects.length).toBe(3);
+      expect(getters.sortedProjects(state).length).toBe(2);
       expect(getters.sortedProjects(state)).toEqual(projects.slice(1));
     });
   });
diff --git a/spec/frontend/projects/merge_requests/components/report_abuse_dropdown_item_spec.js b/spec/frontend/projects/report_abuse/components/report_abuse_dropdown_item_spec.js
index 11f770fb05e..de0c889e8c9 100644
--- a/spec/frontend/projects/merge_requests/components/report_abuse_dropdown_item_spec.js
+++ b/spec/frontend/projects/report_abuse/components/report_abuse_dropdown_item_spec.js
@@ -3,7 +3,7 @@ import { GlDropdownItem } from '@gitlab/ui';
 import { MountingPortal } from 'portal-vue';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 
-import ReportAbuseDropdownItem from '~/projects/merge_requests/components/report_abuse_dropdown_item.vue';
+import ReportAbuseDropdownItem from '~/projects/report_abuse/components/report_abuse_dropdown_item.vue';
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
 
 describe('ReportAbuseDropdownItem', () => {