Add latest changes from gitlab-org/gitlab@master

3 files changed, 38 insertions, 20 deletions

diff --git a/spec/frontend/releases/components/app_edit_new_spec.js b/spec/frontend/releases/components/app_edit_new_spec.js
index 80be27c92ff..a32001ed72b 100644
--- a/spec/frontend/releases/components/app_edit_new_spec.js
+++ b/spec/frontend/releases/components/app_edit_new_spec.js
@@ -1,21 +1,23 @@
-import { mount } from '@vue/test-utils';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import { merge } from 'lodash';
 import Vuex from 'vuex';
 import { nextTick } from 'vue';
-import { GlFormCheckbox } from '@gitlab/ui';
-import originalRelease from 'test_fixtures/api/releases/release.json';
+import { GlDatepicker, GlFormCheckbox } from '@gitlab/ui';
+import originalOneReleaseForEditingQueryResponse from 'test_fixtures/graphql/releases/graphql/queries/one_release_for_editing.query.graphql.json';
+import { convertOneReleaseGraphQLResponse } from '~/releases/util';
+import { mountExtended } from 'helpers/vue_test_utils_helper';
 import setWindowLocation from 'helpers/set_window_location_helper';
 import { TEST_HOST } from 'helpers/test_constants';
-import * as commonUtils from '~/lib/utils/common_utils';
 import ReleaseEditNewApp from '~/releases/components/app_edit_new.vue';
 import AssetLinksForm from '~/releases/components/asset_links_form.vue';
 import { BACK_URL_PARAM } from '~/releases/constants';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 
+const originalRelease = originalOneReleaseForEditingQueryResponse.data.project.release;
 const originalMilestones = originalRelease.milestones;
 const releasesPagePath = 'path/to/releases/page';
+const upcomingReleaseDocsPath = 'path/to/upcoming/release/docs';
 
 describe('Release edit/new component', () => {
   let wrapper;
@@ -33,6 +35,7 @@ describe('Release edit/new component', () => {
       projectId: '8',
       groupId: '42',
       groupMilestonesAvailable: true,
+      upcomingReleaseDocsPath,
     };
 
     actions = {
@@ -68,7 +71,7 @@ describe('Release edit/new component', () => {
       ),
     );
 
-    wrapper = mount(ReleaseEditNewApp, {
+    wrapper = mountExtended(ReleaseEditNewApp, {
       store,
       provide: {
         glFeatures: featureFlags,
@@ -88,7 +91,7 @@ describe('Release edit/new component', () => {
 
     mock.onGet('/api/v4/projects/8/milestones').reply(200, originalMilestones);
 
-    release = commonUtils.convertObjectPropsToCamelCase(originalRelease, { deep: true });
+    release = convertOneReleaseGraphQLResponse(originalOneReleaseForEditingQueryResponse).data;
   });
 
   afterEach(() => {
@@ -128,6 +131,18 @@ describe('Release edit/new component', () => {
       expect(wrapper.find('#release-title').element.value).toBe(release.name);
     });
 
+    it('renders the released at date in the "Released at" datepicker', () => {
+      expect(wrapper.findComponent(GlDatepicker).props('value')).toBe(release.releasedAt);
+    });
+
+    it('links to the documentation on upcoming releases in the "Released at" description', () => {
+      const link = wrapper.findByRole('link', { name: 'Upcoming Release' });
+
+      expect(link.exists()).toBe(true);
+
+      expect(link.attributes('href')).toBe(upcomingReleaseDocsPath);
+    });
+
     it('renders the release notes in the "Release notes" textarea', () => {
       expect(wrapper.find('#release-notes').element.value).toBe(release.description);
     });
diff --git a/spec/frontend/releases/components/release_block_footer_spec.js b/spec/frontend/releases/components/release_block_footer_spec.js
index b095e9e1d78..848e802df4b 100644
--- a/spec/frontend/releases/components/release_block_footer_spec.js
+++ b/spec/frontend/releases/components/release_block_footer_spec.js
@@ -2,14 +2,16 @@ import { GlLink, GlIcon } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import { cloneDeep } from 'lodash';
 import { nextTick } from 'vue';
-import originalRelease from 'test_fixtures/api/releases/release.json';
+import originalOneReleaseQueryResponse from 'test_fixtures/graphql/releases/graphql/queries/one_release.query.graphql.json';
+import { convertOneReleaseGraphQLResponse } from '~/releases/util';
 import { trimText } from 'helpers/text_helper';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import ReleaseBlockFooter from '~/releases/components/release_block_footer.vue';
 
 // TODO: Encapsulate date helpers https://gitlab.com/gitlab-org/gitlab/-/issues/320883
 const MONTHS_IN_MS = 1000 * 60 * 60 * 24 * 31;
-const mockFutureDate = new Date(new Date().getTime() + MONTHS_IN_MS).toISOString();
+const mockFutureDate = new Date(new Date().getTime() + MONTHS_IN_MS);
+
+const originalRelease = convertOneReleaseGraphQLResponse(originalOneReleaseQueryResponse).data;
 
 describe('Release block footer', () => {
   let wrapper;
@@ -18,7 +20,7 @@ describe('Release block footer', () => {
   const factory = async (props = {}) => {
     wrapper = mount(ReleaseBlockFooter, {
       propsData: {
-        ...convertObjectPropsToCamelCase(release, { deep: true }),
+        ...originalRelease,
         ...props,
       },
     });
@@ -55,8 +57,8 @@ describe('Release block footer', () => {
       const commitLink = commitInfoSectionLink();
 
       expect(commitLink.exists()).toBe(true);
-      expect(commitLink.text()).toBe(release.commit.short_id);
-      expect(commitLink.attributes('href')).toBe(release.commit_path);
+      expect(commitLink.text()).toBe(release.commit.shortId);
+      expect(commitLink.attributes('href')).toBe(release.commitPath);
     });
 
     it('renders the tag icon', () => {
@@ -70,8 +72,8 @@ describe('Release block footer', () => {
       const commitLink = tagInfoSection().find(GlLink);
 
       expect(commitLink.exists()).toBe(true);
-      expect(commitLink.text()).toBe(release.tag_name);
-      expect(commitLink.attributes('href')).toBe(release.tag_path);
+      expect(commitLink.text()).toBe(release.tagName);
+      expect(commitLink.attributes('href')).toBe(release.tagPath);
     });
 
     it('renders the author and creation time info', () => {
@@ -114,14 +116,14 @@ describe('Release block footer', () => {
       const avatarImg = authorDateInfoSection().find('img');
 
       expect(avatarImg.exists()).toBe(true);
-      expect(avatarImg.attributes('src')).toBe(release.author.avatar_url);
+      expect(avatarImg.attributes('src')).toBe(release.author.avatarUrl);
     });
 
     it("renders a link to the author's profile", () => {
       const authorLink = authorDateInfoSection().find(GlLink);
 
       expect(authorLink.exists()).toBe(true);
-      expect(authorLink.attributes('href')).toBe(release.author.web_url);
+      expect(authorLink.attributes('href')).toBe(release.author.webUrl);
     });
   });
 
@@ -138,7 +140,7 @@ describe('Release block footer', () => {
 
     it('renders the commit SHA as plain text (instead of a link)', () => {
       expect(commitInfoSectionLink().exists()).toBe(false);
-      expect(commitInfoSection().text()).toBe(release.commit.short_id);
+      expect(commitInfoSection().text()).toBe(release.commit.shortId);
     });
   });
 
@@ -155,7 +157,7 @@ describe('Release block footer', () => {
 
     it('renders the tag name as plain text (instead of a link)', () => {
       expect(tagInfoSectionLink().exists()).toBe(false);
-      expect(tagInfoSection().text()).toBe(release.tag_name);
+      expect(tagInfoSection().text()).toBe(release.tagName);
     });
   });
 
diff --git a/spec/frontend/releases/components/release_block_spec.js b/spec/frontend/releases/components/release_block_spec.js
index c4910ae9b2f..17e2af687a6 100644
--- a/spec/frontend/releases/components/release_block_spec.js
+++ b/spec/frontend/releases/components/release_block_spec.js
@@ -1,7 +1,8 @@
 import { mount } from '@vue/test-utils';
 import $ from 'jquery';
 import { nextTick } from 'vue';
-import originalRelease from 'test_fixtures/api/releases/release.json';
+import originalOneReleaseQueryResponse from 'test_fixtures/graphql/releases/graphql/queries/one_release.query.graphql.json';
+import { convertOneReleaseGraphQLResponse } from '~/releases/util';
 import * as commonUtils from '~/lib/utils/common_utils';
 import * as urlUtility from '~/lib/utils/url_utility';
 import EvidenceBlock from '~/releases/components/evidence_block.vue';
@@ -34,7 +35,7 @@ describe('Release block', () => {
 
   beforeEach(() => {
     jest.spyOn($.fn, 'renderGFM');
-    release = commonUtils.convertObjectPropsToCamelCase(originalRelease, { deep: true });
+    release = convertOneReleaseGraphQLResponse(originalOneReleaseQueryResponse).data;
   });
 
   afterEach(() => {