diff --git a/app/assets/javascripts/repository/components/header_area/open_mr_badge.vue b/app/assets/javascripts/repository/components/header_area/open_mr_badge.vue index efacb3a9282b117aced3c6c73210ee0ee0377e4e..f090c02d9258587660b9f993d82384034982fba6 100644 --- a/app/assets/javascripts/repository/components/header_area/open_mr_badge.vue +++ b/app/assets/javascripts/repository/components/header_area/open_mr_badge.vue @@ -11,7 +11,7 @@ import { visitUrl } from '~/lib/utils/url_utility'; import getOpenMrCountForBlobPath from '~/repository/queries/open_mr_count.query.graphql'; import getOpenMrsForBlobPath from '~/repository/queries/open_mrs.query.graphql'; import { nDaysBefore } from '~/lib/utils/datetime/date_calculation_utility'; -import { toYmd } from '~/analytics/shared/utils'; +import { formatDate } from '~/lib/utils/datetime/date_format_utility'; import { logError } from '~/lib/logger'; import * as Sentry from '~/sentry/sentry_browser_wrapper'; import MergeRequestListItem from './merge_request_list_item.vue'; @@ -56,7 +56,7 @@ export default { }, createdAfter() { const lookbackDate = nDaysBefore(new Date(), OPEN_MR_AGE_LIMIT_DAYS - 1, { utc: true }); - return toYmd(lookbackDate); + return formatDate(lookbackDate, 'yyyy-mm-dd HH:MM:ss Z', true); }, isLoading() { return this.$apollo.queries.loading; diff --git a/spec/frontend/repository/components/header_area/open_mr_badge_spec.js b/spec/frontend/repository/components/header_area/open_mr_badge_spec.js index 31705252a6ea48c7a65e0af642ededb646a58e5b..dcb493b2936fd95cfd1eb1010c5595a901333240 100644 --- a/spec/frontend/repository/components/header_area/open_mr_badge_spec.js +++ b/spec/frontend/repository/components/header_area/open_mr_badge_spec.js @@ -30,6 +30,8 @@ describe('OpenMrBadge', () => { blobPath: 'path/to/file.js', }; + useFakeDate('2020-04-15 09:00:00 GMT+2'); + function createComponent( props = {}, mockResolver = openMRQueryResult, @@ -81,8 +83,6 @@ describe('OpenMrBadge', () => { }); describe('computed properties', () => { - useFakeDate(); - beforeEach(() => { createComponent({}); }); @@ -90,7 +90,7 @@ describe('OpenMrBadge', () => { it('computes queryVariables correctly', () => { expect(openMrsCountQueryHandler).toHaveBeenCalledWith({ blobPath: 'path/to/file.js', - createdAfter: '2020-06-07', + createdAfter: '2020-03-17 07:00:00 UTC', projectPath: 'group/project', targetBranch: ['main'], }); @@ -136,7 +136,7 @@ describe('OpenMrBadge', () => { expect(openMrsQueryHandler).toHaveBeenCalledWith({ blobPath: 'path/to/file.js', - createdAfter: '2020-06-07', + createdAfter: '2020-03-17 07:00:00 UTC', projectPath: 'group/project', targetBranch: ['main'], });