From e2bdce8defbbd5a11d50115e3d52498d90417ac2 Mon Sep 17 00:00:00 2001 From: Riccardo Padovani Date: Wed, 7 Mar 2018 10:16:38 +0000 Subject: Count discussions on issues and merge requests as contributions for the contributions calendar --- spec/lib/gitlab/contributions_calendar_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'spec/lib/gitlab/contributions_calendar_spec.rb') diff --git a/spec/lib/gitlab/contributions_calendar_spec.rb b/spec/lib/gitlab/contributions_calendar_spec.rb index 167876ca158..2c63f3b0455 100644 --- a/spec/lib/gitlab/contributions_calendar_spec.rb +++ b/spec/lib/gitlab/contributions_calendar_spec.rb @@ -77,6 +77,13 @@ describe Gitlab::ContributionsCalendar do expect(calendar(contributor).activity_dates[today]).to eq(1) end + it "counts the discussions on merge requests and issues" do + create_event(public_project, today, 0, Event::COMMENTED, :discussion_note_on_merge_request) + create_event(public_project, today, 2, Event::COMMENTED, :discussion_note_on_issue) + + expect(calendar(contributor).activity_dates[today]).to eq(2) + end + context "when events fall under different dates depending on the time zone" do before do create_event(public_project, today, 1) -- cgit v1.2.3