Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/frontend/ide/services/index_spec.js b/spec/frontend/ide/services/index_spec.js
index eacf1244d55..d250eb7f6ad 100644
--- a/spec/frontend/ide/services/index_spec.js
+++ b/spec/frontend/ide/services/index_spec.js
@@ -219,15 +219,21 @@ describe('IDE services', () => {
   describe('getProjectData', () => {
     it('combines gql and API requests', () => {
       const gqlProjectData = {
+        id: 'gid://gitlab/Project/1',
         userPermissions: {
           bogus: true,
         },
       };
+      const expectedResponse = {
+        ...projectData,
+        ...gqlProjectData,
+        id: 1,
+      };
       Api.project.mockReturnValue(Promise.resolve({ data: { ...projectData } }));
       query.mockReturnValue(Promise.resolve({ data: { project: gqlProjectData } }));
 
       return services.getProjectData(TEST_NAMESPACE, TEST_PROJECT).then((response) => {
-        expect(response).toEqual({ data: { ...projectData, ...gqlProjectData } });
+        expect(response).toEqual({ data: expectedResponse });
         expect(Api.project).toHaveBeenCalledWith(TEST_PROJECT_ID);
         expect(query).toHaveBeenCalledWith({
           query: getIdeProject,