Merge branch 'add-timezone-in-reviewer-roulette' into 'master'

Add timezone information to the reviewer roulette

See merge request gitlab-org/gitlab!40285

danger/roulette/Dangerfile

@@ -56,7 +56,7 @@ def note_for_spin_role(spin, role)
     return OPTIONAL_REVIEW_TEMPLATE % { role: role.capitalize, category: helper.label_for_category(spin.category) }
   end
 
-  spin.public_send(role)&.markdown_name(timezone_experiment: spin.timezone_experiment, author: roulette.team_mr_author) # rubocop:disable GitlabSecurity/PublicSend
+  spin.public_send(role)&.markdown_name(author: roulette.team_mr_author) # rubocop:disable GitlabSecurity/PublicSend
 end
 
 def markdown_row_for_spins(category, spins_array)

lib/gitlab/danger/teammate.rb

@@ -45,9 +45,7 @@ module Gitlab
         has_capability?(project, category, :maintainer, labels)
       end
 
-      def markdown_name(timezone_experiment: false, author: nil)
-        return @markdown_name unless timezone_experiment
-
+      def markdown_name(author: nil)
         "#{@markdown_name} (#{utc_offset_text(author)})"
       end
 

spec/lib/gitlab/danger/teammate_spec.rb

@@ -170,47 +170,38 @@ RSpec.describe Gitlab::Danger::Teammate do
   end
 
   describe '#markdown_name' do
-    context 'when timezone_experiment == false' do
-      it 'returns markdown name as-is' do
-        expect(subject.markdown_name).to eq(options['markdown_name'])
-        expect(subject.markdown_name(timezone_experiment: false)).to eq(options['markdown_name'])
-      end
+    it 'returns markdown name with timezone info' do
+      expect(subject.markdown_name).to eq("#{options['markdown_name']} (UTC+2)")
     end
 
-    context 'when timezone_experiment == true' do
-      it 'returns markdown name with timezone info' do
-        expect(subject.markdown_name(timezone_experiment: true)).to eq("#{options['markdown_name']} (UTC+2)")
-      end
-
-      context 'when offset is 1.5' do
-        let(:tz_offset_hours) { 1.5 }
+    context 'when offset is 1.5' do
+      let(:tz_offset_hours) { 1.5 }
 
-        it 'returns markdown name with timezone info, not truncated' do
-          expect(subject.markdown_name(timezone_experiment: true)).to eq("#{options['markdown_name']} (UTC+1.5)")
-        end
+      it 'returns markdown name with timezone info, not truncated' do
+        expect(subject.markdown_name).to eq("#{options['markdown_name']} (UTC+1.5)")
       end
+    end
 
-      context 'when author is given' do
-        where(:tz_offset_hours, :author_offset, :diff_text) do
-          -12 | -10 | "2 hours behind `@mario`"
-          -10 | -12 | "2 hours ahead of `@mario`"
-          -10 | 2 | "12 hours behind `@mario`"
-          2 | 4 | "2 hours behind `@mario`"
-          4 | 2 | "2 hours ahead of `@mario`"
-          2 | 3 | "1 hour behind `@mario`"
-          3 | 2 | "1 hour ahead of `@mario`"
-          2 | 2 | "same timezone as `@mario`"
-        end
+    context 'when author is given' do
+      where(:tz_offset_hours, :author_offset, :diff_text) do
+        -12 | -10 | "2 hours behind `@mario`"
+        -10 | -12 | "2 hours ahead of `@mario`"
+        -10 | 2 | "12 hours behind `@mario`"
+        2 | 4 | "2 hours behind `@mario`"
+        4 | 2 | "2 hours ahead of `@mario`"
+        2 | 3 | "1 hour behind `@mario`"
+        3 | 2 | "1 hour ahead of `@mario`"
+        2 | 2 | "same timezone as `@mario`"
+      end
 
-        with_them do
-          it 'returns markdown name with timezone info' do
-            author = described_class.new(options.merge('username' => 'mario', 'tz_offset_hours' => author_offset))
+      with_them do
+        it 'returns markdown name with timezone info' do
+          author = described_class.new(options.merge('username' => 'mario', 'tz_offset_hours' => author_offset))
 
-            floored_offset_hours = subject.__send__(:floored_offset_hours)
-            utc_offset = floored_offset_hours >= 0 ? "+#{floored_offset_hours}" : floored_offset_hours
+          floored_offset_hours = subject.__send__(:floored_offset_hours)
+          utc_offset = floored_offset_hours >= 0 ? "+#{floored_offset_hours}" : floored_offset_hours
 
-            expect(subject.markdown_name(timezone_experiment: true, author: author)).to eq("#{options['markdown_name']} (UTC#{utc_offset}, #{diff_text})")
-          end
+          expect(subject.markdown_name(author: author)).to eq("#{options['markdown_name']} (UTC#{utc_offset}, #{diff_text})")
         end
       end
     end