diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts_new.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts_new.vue index c0219ab9ff2a756f10595167f8d39a4fbca2466a..3eceeb7086d237d1f9022e66c83a9836cb116162 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts_new.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts_new.vue @@ -48,10 +48,13 @@ export default { pipelineAnalytics: { query: getPipelineAnalytics, variables() { + // Use UTC time and take beginning of day + const today = new Date(new Date().setUTCHours(0, 0, 0, 0)); + return { fullPath: this.projectPath, - fromTime: getDateInPast(new Date(), this.dateRange), - toTime: new Date(), + fromTime: getDateInPast(today, this.dateRange), + toTime: today, }; }, update(data) { diff --git a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_new_spec.js b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_new_spec.js index 65a7973a3c1178b690dbdd4f33cccf5cca59bf4f..86fda6709a2fae5fd83328d8b2f1838bedea1558 100644 --- a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_new_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_new_spec.js @@ -5,7 +5,6 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import { getDateInPast } from '~/lib/utils/datetime_utility'; import PipelineChartsNew from '~/projects/pipelines/charts/components/pipeline_charts_new.vue'; import StatisticsList from '~/projects/pipelines/charts/components/statistics_list.vue'; import PipelineDurationChart from '~/projects/pipelines/charts/components/pipeline_duration_chart.vue'; @@ -21,7 +20,7 @@ jest.mock('~/alert'); const projectPath = 'gitlab-org/gitlab'; describe('~/projects/pipelines/charts/components/pipeline_charts_new.vue', () => { - useFakeDate(); + useFakeDate('2022-02-15T08:30'); // a date with a time let wrapper; let getPipelineAnalyticsHandler; @@ -66,12 +65,11 @@ describe('~/projects/pipelines/charts/components/pipeline_charts_new.vue', () => it('is "Last 7 days" by default', () => { expect(findGlCollapsibleListbox().props('selected')).toBe(7); - expect(getPipelineAnalyticsHandler).toHaveBeenCalledTimes(1); expect(getPipelineAnalyticsHandler).toHaveBeenLastCalledWith({ fullPath: projectPath, - fromTime: getDateInPast(new Date(), 7), - toTime: new Date(), + fromTime: new Date('2022-02-08'), + toTime: new Date('2022-02-15'), }); }); @@ -83,8 +81,8 @@ describe('~/projects/pipelines/charts/components/pipeline_charts_new.vue', () => expect(getPipelineAnalyticsHandler).toHaveBeenCalledTimes(2); expect(getPipelineAnalyticsHandler).toHaveBeenLastCalledWith({ fullPath: projectPath, - fromTime: getDateInPast(new Date(), 90), - toTime: new Date(), + fromTime: new Date('2021-11-17'), + toTime: new Date('2022-02-15'), }); }); });