Merge branch 'revert-6ab87b38' into 'master'

Revert "Merge branch 'eliminate-tz-sensitivity-ci-analytics-charts' into 'master'"

See merge request gitlab-org/gitlab!50802

changelogs/unreleased/eliminate-tz-sensitivity-ci-analytics-charts.yml

----
-title: Fix empty pipeline analytics charts when time_zone is non-UTC
-merge_request: 50760
-author:
-type: fixed

lib/gitlab/ci/charts.rb

@@ -31,10 +31,9 @@ module Gitlab
 
           current = @from
           while current <= @to
-            label = current.strftime(@format)
-            @labels  << label
-            @total   << (totals_count[label] || 0)
-            @success << (success_count[label] || 0)
+            @labels  << current.strftime(@format)
+            @total   << (totals_count[current] || 0)
+            @success << (success_count[current] || 0)
 
             current += interval_step
           end
@@ -46,7 +45,6 @@ module Gitlab
           query
             .group("date_trunc('#{interval}', #{::Ci::Pipeline.table_name}.created_at)")
             .count(:created_at)
-            .transform_keys { |date| date.strftime(@format) }
         end
         # rubocop: enable CodeReuse/ActiveRecord
 

spec/lib/gitlab/ci/charts_spec.rb

@@ -47,10 +47,6 @@ RSpec.describe Gitlab::Ci::Charts do
 
     subject { chart.to }
 
-    before do
-      create(:ci_empty_pipeline, project: project, duration: 120)
-    end
-
     it 'includes the whole current day' do
       is_expected.to eq(Date.today.end_of_day)
     end
@@ -62,37 +58,6 @@ RSpec.describe Gitlab::Ci::Charts do
     it 'uses %d %B as labels format' do
       expect(chart.labels).to include(chart.from.strftime('%d %B'))
     end
-
-    it 'returns count of pipelines run each day in the current week' do
-      expect(chart.total).to contain_exactly(0, 0, 0, 0, 0, 0, 0, 1)
-    end
-  end
-
-  context 'weekchart_non_utc' do
-    today = Date.today
-    end_of_today = Time.use_zone(Time.find_zone('Asia/Dubai')) { today.end_of_day }
-
-    let(:project) { create(:project) }
-    let(:chart) do
-      allow(Date).to receive(:today).and_return(today)
-      allow(today).to receive(:end_of_day).and_return(end_of_today)
-      Gitlab::Ci::Charts::WeekChart.new(project)
-    end
-
-    subject { chart.total }
-
-    before do
-      create(:ci_empty_pipeline, project: project, duration: 120)
-    end
-
-    it 'uses a non-utc time zone for range times' do
-      expect(chart.to.zone).to eq(end_of_today.zone)
-      expect(chart.from.zone).to eq(end_of_today.zone)
-    end
-
-    it 'returns count of pipelines run each day in the current week' do
-      is_expected.to contain_exactly(0, 0, 0, 0, 0, 0, 0, 1)
-    end
   end
 
   context 'pipeline_times' do