Commit 95016507 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'master' into 'master'

CI charts now include the current day

Closes #42921

See merge request gitlab-org/gitlab-ce!17032
parents 0649a1f8 44177cea
---
title: CI charts now include the current day
merge_request: 17032
author: Dakkaron
type: changed
......@@ -68,10 +68,11 @@ module Gitlab
class YearChart < Chart
include MonthlyInterval
attr_reader :to, :from
def initialize(*)
@to = Date.today.end_of_month
@from = @to.years_ago(1).beginning_of_month
@to = Date.today.end_of_month.end_of_day
@from = @to.years_ago(1).beginning_of_month.beginning_of_day
@format = '%d %B %Y'
super
......@@ -80,10 +81,11 @@ module Gitlab
class MonthChart < Chart
include DailyInterval
attr_reader :to, :from
def initialize(*)
@to = Date.today
@from = @to - 30.days
@to = Date.today.end_of_day
@from = 1.month.ago.beginning_of_day
@format = '%d %B'
super
......@@ -92,10 +94,11 @@ module Gitlab
class WeekChart < Chart
include DailyInterval
attr_reader :to, :from
def initialize(*)
@to = Date.today
@from = @to - 7.days
@to = Date.today.end_of_day
@from = 1.week.ago.beginning_of_day
@format = '%d %B'
super
......
require 'spec_helper'
describe Gitlab::Ci::Charts do
context "yearchart" do
let(:project) { create(:project) }
let(:chart) { Gitlab::Ci::Charts::YearChart.new(project) }
subject { chart.to }
it 'goes until the end of the current month (including the whole last day of the month)' do
is_expected.to eq(Date.today.end_of_month.end_of_day)
end
it 'starts at the beginning of the current year' do
expect(chart.from).to eq(chart.to.years_ago(1).beginning_of_month.beginning_of_day)
end
end
context "monthchart" do
let(:project) { create(:project) }
let(:chart) { Gitlab::Ci::Charts::MonthChart.new(project) }
subject { chart.to }
it 'includes the whole current day' do
is_expected.to eq(Date.today.end_of_day)
end
it 'starts one month ago' do
expect(chart.from).to eq(1.month.ago.beginning_of_day)
end
end
context "weekchart" do
let(:project) { create(:project) }
let(:chart) { Gitlab::Ci::Charts::WeekChart.new(project) }
subject { chart.to }
it 'includes the whole current day' do
is_expected.to eq(Date.today.end_of_day)
end
it 'starts one week ago' do
expect(chart.from).to eq(1.week.ago.beginning_of_day)
end
end
context "pipeline_times" do
let(:project) { create(:project) }
let(:chart) { Gitlab::Ci::Charts::PipelineTime.new(project) }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment