Include private contributions in user contribution graph

6 files changed, 31 insertions, 47 deletions

diff --git a/spec/bin/changelog_spec.rb b/spec/bin/changelog_spec.rb
index 9dc4edf97d1..c59add88a82 100644
--- a/spec/bin/changelog_spec.rb
+++ b/spec/bin/changelog_spec.rb
@@ -95,6 +95,7 @@ describe 'bin/changelog' do
 
         it 'shows error message and exits the program' do
           allow($stdin).to receive(:getc).and_return(type)
+
           expect do
             expect { described_class.read_type }.to raise_error(
               ChangelogHelpers::Abort,
diff --git a/spec/finders/contributed_projects_finder_spec.rb b/spec/finders/contributed_projects_finder_spec.rb
index 9155a8d6fe9..81fb4e3561c 100644
--- a/spec/finders/contributed_projects_finder_spec.rb
+++ b/spec/finders/contributed_projects_finder_spec.rb
@@ -8,6 +8,7 @@ describe ContributedProjectsFinder do
 
   let!(:public_project) { create(:project, :public) }
   let!(:private_project) { create(:project, :private) }
+  let!(:internal_project) { create(:project, :internal) }
 
   before do
     private_project.add_maintainer(source_user)
@@ -16,17 +17,18 @@ describe ContributedProjectsFinder do
 
     create(:push_event, project: public_project, author: source_user)
     create(:push_event, project: private_project, author: source_user)
+    create(:push_event, project: internal_project, author: source_user)
   end
 
-  describe 'without a current user' do
+  describe 'activity without a current user' do
     subject { finder.execute }
 
-    it { is_expected.to eq([public_project]) }
+    it { is_expected.to match_array([public_project]) }
   end
 
-  describe 'with a current user' do
+  describe 'activity with a current user' do
     subject { finder.execute(current_user) }
 
-    it { is_expected.to eq([private_project, public_project]) }
+    it { is_expected.to match_array([private_project, internal_project, public_project]) }
   end
 end
diff --git a/spec/finders/user_recent_events_finder_spec.rb b/spec/finders/user_recent_events_finder_spec.rb
index 58470f4c84d..c5fcd68eb4c 100644
--- a/spec/finders/user_recent_events_finder_spec.rb
+++ b/spec/finders/user_recent_events_finder_spec.rb
@@ -13,49 +13,25 @@ describe UserRecentEventsFinder do
   subject(:finder) { described_class.new(current_user, project_owner) }
 
   describe '#execute' do
-    context 'current user does not have access to projects' do
-      it 'returns public and internal events' do
-        records = finder.execute
-
-        expect(records).to include(public_event, internal_event)
-        expect(records).not_to include(private_event)
+    context 'when profile is public' do
+      it 'returns all the events' do
+        expect(finder.execute).to include(private_event, internal_event, public_event)
       end
     end
 
-    context 'when current user has access to the projects' do
-      before do
-        private_project.add_developer(current_user)
-        internal_project.add_developer(current_user)
-        public_project.add_developer(current_user)
-      end
-
-      context 'when profile is public' do
-        it 'returns all the events' do
-          expect(finder.execute).to include(private_event, internal_event, public_event)
-        end
-      end
-
-      context 'when profile is private' do
-        it 'returns no event' do
-          allow(Ability).to receive(:allowed?).and_call_original
-          allow(Ability).to receive(:allowed?).with(current_user, :read_user_profile, project_owner).and_return(false)
-          expect(finder.execute).to be_empty
-        end
-      end
+    context 'when profile is private' do
+      it 'returns no event' do
+        allow(Ability).to receive(:allowed?).and_call_original
+        allow(Ability).to receive(:allowed?).with(current_user, :read_user_profile, project_owner).and_return(false)
 
-      it 'does not include the events if the user cannot read cross project' do
-        expect(Ability).to receive(:allowed?).and_call_original
-        expect(Ability).to receive(:allowed?).with(current_user, :read_cross_project) { false }
         expect(finder.execute).to be_empty
       end
     end
 
-    context 'when current user is anonymous' do
-      let(:current_user) { nil }
-
-      it 'returns public events only' do
-        expect(finder.execute).to eq([public_event])
-      end
+    it 'does not include the events if the user cannot read cross project' do
+      expect(Ability).to receive(:allowed?).and_call_original
+      expect(Ability).to receive(:allowed?).with(current_user, :read_cross_project) { false }
+      expect(finder.execute).to be_empty
     end
   end
 end
diff --git a/spec/lib/api/helpers/pagination_spec.rb b/spec/lib/api/helpers/pagination_spec.rb
index c73c6023b60..0a7682d906b 100644
--- a/spec/lib/api/helpers/pagination_spec.rb
+++ b/spec/lib/api/helpers/pagination_spec.rb
@@ -189,9 +189,9 @@ describe API::Helpers::Pagination do
           it 'it returns the right link to the next page' do
             allow(subject).to receive(:params)
               .and_return({ pagination: 'keyset', ks_prev_id: projects[3].id, ks_prev_name: projects[3].name, per_page: 2 })
+
             expect_header('X-Per-Page', '2')
             expect_header('X-Next-Page', "#{value}?ks_prev_id=#{projects[6].id}&ks_prev_name=#{projects[6].name}&pagination=keyset&per_page=2")
-
             expect_header('Link', anything) do |_key, val|
               expect(val).to include('rel="next"')
             end
diff --git a/spec/lib/forever_spec.rb b/spec/lib/forever_spec.rb
index cf40c467c72..494c0561975 100644
--- a/spec/lib/forever_spec.rb
+++ b/spec/lib/forever_spec.rb
@@ -7,6 +7,7 @@ describe Forever do
     context 'when using PostgreSQL' do
       it 'should return Postgresql future date' do
         allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
+
         expect(subject).to eq(described_class::POSTGRESQL_DATE)
       end
     end
@@ -14,6 +15,7 @@ describe Forever do
     context 'when using MySQL' do
       it 'should return MySQL future date' do
         allow(Gitlab::Database).to receive(:postgresql?).and_return(false)
+
         expect(subject).to eq(described_class::MYSQL_DATE)
       end
     end
diff --git a/spec/lib/gitlab/contributions_calendar_spec.rb b/spec/lib/gitlab/contributions_calendar_spec.rb
index 2c63f3b0455..6d29044ffd5 100644
--- a/spec/lib/gitlab/contributions_calendar_spec.rb
+++ b/spec/lib/gitlab/contributions_calendar_spec.rb
@@ -62,13 +62,16 @@ describe Gitlab::ContributionsCalendar do
       expect(calendar.activity_dates).to eq(last_week => 2, today => 1)
     end
 
-    it "only shows private events to authorized users" do
-      create_event(private_project, today)
-      create_event(feature_project, today)
+    context "when the user has opted-in for private contributions" do
+      it "shows private and public events to all users" do
+        user.update_column(:include_private_contributions, true)
+        create_event(private_project, today)
+        create_event(public_project, today)
 
-      expect(calendar.activity_dates[today]).to eq(0)
-      expect(calendar(user).activity_dates[today]).to eq(0)
-      expect(calendar(contributor).activity_dates[today]).to eq(2)
+        expect(calendar.activity_dates[today]).to eq(1)
+        expect(calendar(user).activity_dates[today]).to eq(1)
+        expect(calendar(contributor).activity_dates[today]).to eq(2)
+      end
     end
 
     it "counts the diff notes on merge request" do
@@ -128,7 +131,7 @@ describe Gitlab::ContributionsCalendar do
       e3 = create_event(feature_project, today)
       create_event(public_project, last_week)
 
-      expect(calendar.events_by_date(today)).to contain_exactly(e1)
+      expect(calendar.events_by_date(today)).to contain_exactly(e1, e3)
       expect(calendar(contributor).events_by_date(today)).to contain_exactly(e1, e2, e3)
     end