1 files changed, 31 insertions, 42 deletions

diff --git a/spec/lib/gitlab/contributions_calendar_spec.rb b/spec/lib/gitlab/contributions_calendar_spec.rb
index 326e27fa716..d1dbd167d48 100644
--- a/spec/lib/gitlab/contributions_calendar_spec.rb
+++ b/spec/lib/gitlab/contributions_calendar_spec.rb
@@ -19,9 +19,9 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
     end
   end
 
-  let_it_be(:feature_project) do
+  let_it_be(:public_project_with_private_issues) do
     create(:project, :public, :issues_private) do |project|
-      create(:project_member, user: contributor, project: project).project
+      create(:project_member, user: contributor, project: project)
     end
   end
 
@@ -45,7 +45,12 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
   end
 
   def create_event(project, day, hour = 0, action = :created, target_symbol = :issue)
-    targets[project] ||= create(target_symbol, project: project, author: contributor)
+    targets[project] ||=
+      if target_symbol == :merge_request
+        create(:merge_request, source_project: project, author: contributor)
+      else
+        create(target_symbol, project: project, author: contributor)
+      end
 
     Event.create!(
       project: project,
@@ -58,7 +63,7 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
   end
 
   describe '#activity_dates', :aggregate_failures do
-    it "returns a hash of date => count" do
+    it 'returns a hash of date => count' do
       create_event(public_project, last_week)
       create_event(public_project, last_week)
       create_event(public_project, today)
@@ -114,6 +119,15 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
       expect(calendar(contributor).activity_dates[today]).to eq(2)
     end
 
+    it "counts merge request events" do
+      create_event(public_project, today, 0, :created, :merge_request)
+      create_event(public_project, today, 1, :closed, :merge_request)
+      create_event(public_project, today, 2, :approved, :merge_request)
+      create_event(public_project, today, 3, :merged, :merge_request)
+
+      expect(calendar(contributor).activity_dates[today]).to eq(4)
+    end
+
     context "when events fall under different dates depending on the system time zone" do
       before do
         create_event(public_project, today, 1)
@@ -189,10 +203,10 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
     it "only shows private events to authorized users" do
       e1 = create_event(public_project, today)
       e2 = create_event(private_project, today)
-      e3 = create_event(feature_project, today)
+      e3 = create_event(public_project_with_private_issues, today, 0, :created, :issue)
       create_event(public_project, last_week)
 
-      expect(calendar.events_by_date(today)).to contain_exactly(e1, e3)
+      expect(calendar.events_by_date(today)).to contain_exactly(e1)
       expect(calendar(contributor).events_by_date(today)).to contain_exactly(e1, e2, e3)
     end
 
@@ -202,6 +216,17 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
       expect(calendar.events_by_date(today)).to contain_exactly(e1)
     end
 
+    it 'includes merge request events' do
+      mr_created_event = create_event(public_project, today, 0, :created, :merge_request)
+      mr_closed_event = create_event(public_project, today, 1, :closed, :merge_request)
+      mr_approved_event = create_event(public_project, today, 2, :approved, :merge_request)
+      mr_merged_event = create_event(public_project, today, 3, :merged, :merge_request)
+
+      expect(calendar.events_by_date(today)).to contain_exactly(
+        mr_created_event, mr_closed_event, mr_approved_event, mr_merged_event
+      )
+    end
+
     context 'when the user cannot read cross project' do
       before do
         allow(Ability).to receive(:allowed?).and_call_original
@@ -215,40 +240,4 @@ RSpec.describe Gitlab::ContributionsCalendar, feature_category: :user_profile do
       end
     end
   end
-
-  describe '#starting_year' do
-    let(:travel_time) { Time.find_zone('UTC').local(2020, 12, 31, 19, 0, 0) }
-
-    context "when the contributor's timezone is not set" do
-      it "is the start of last year in the system timezone" do
-        expect(calendar.starting_year).to eq(2019)
-      end
-    end
-
-    context "when the contributor's timezone is set to Sydney" do
-      let(:contributor) { create(:user, { timezone: 'Sydney' }) }
-
-      it "is the start of last year in Sydney" do
-        expect(calendar.starting_year).to eq(2020)
-      end
-    end
-  end
-
-  describe '#starting_month' do
-    let(:travel_time) { Time.find_zone('UTC').local(2020, 12, 31, 19, 0, 0) }
-
-    context "when the contributor's timezone is not set" do
-      it "is the start of this month in the system timezone" do
-        expect(calendar.starting_month).to eq(12)
-      end
-    end
-
-    context "when the contributor's timezone is set to Sydney" do
-      let(:contributor) { create(:user, { timezone: 'Sydney' }) }
-
-      it "is the start of this month in Sydney" do
-        expect(calendar.starting_month).to eq(1)
-      end
-    end
-  end
 end